diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockCode.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockCode.cs index 8168b29f..78b1cde9 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockCode.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockCode.cs @@ -69,7 +69,7 @@ public partial class WmsInstockCode : BaseEntity /// /// 条码数量 /// - public int barcode_qty { get; set; } + public int codeqty { get; set; } /// /// 是否锁定 diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTempCode.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTempCode.cs index 70821dd2..d67d38c8 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTempCode.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTempCode.cs @@ -42,7 +42,7 @@ public partial class WmsTempCode : BaseEntity /// /// 条码数量 /// - public decimal? barcode_qty { get; set; } + public decimal? codeqty { get; set; } /// /// 单位ID diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs index 4a2da847..d26a486a 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs @@ -96,12 +96,12 @@ namespace Tnb.WarehouseMgr { if (index < codeNum) { - barCode.barcode_qty = minPacking; + barCode.codeqty = minPacking; } else { - if (mod > 0) barCode.barcode_qty = mod; - else barCode.barcode_qty = minPacking; + if (mod > 0) barCode.codeqty = mod; + else barCode.codeqty = minPacking; } } wmsTempCodes.Add(barCode); @@ -144,7 +144,7 @@ namespace Tnb.WarehouseMgr var code = $"{detail.material_code}{detail.code_batch}{no.ToString().PadLeft(4, '0')}"; barCode.barcode = code; barCode.code_batch = detail.code_batch; - barCode.barcode_qty = detail.pr_qty!.Value; + barCode.codeqty = detail.pr_qty!.Value; barCode.unit_id = detail.unit_id; barCode.is_lock = 0; barCode.is_end = "0"; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs index c0f03c6e..fa06b6d5 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs @@ -230,7 +230,7 @@ namespace Tnb.WarehouseMgr c.id = SnowflakeIdHelper.NextId(); c.bill_d_id = instockDetails.Find(x => x.material_code == materialCode && x.code_batch == codeBatch)?.id!; c.barcode = jo.Value(nameof(WmsInstockCode.barcode))!; - c.barcode_qty = jo.Value(nameof(WmsInstockCode.barcode_qty)); + c.codeqty = jo.Value(nameof(WmsInstockCode.codeqty)); instockCOdes.Add(c); } } @@ -275,7 +275,7 @@ namespace Tnb.WarehouseMgr var instockCodes = await _db.Queryable().Where(it => barCodes.Contains(it.barcode)).Select(it => new { id = it.bill_d_id, - barcode_qty = it.barcode_qty, + barcode_qty = it.codeqty, }).ToListAsync(); var dic = instockCodes.GroupBy(g => g.id).ToDictionary(x => x.Key, x => x.Select(d => d.barcode_qty).ToList()); var ids = instockCodes.Select(it => it.id).ToList();