From fe77280ff039ed2e8d806ae4f55b07f883ec10a1 Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 14 Jul 2023 11:07:53 +0800 Subject: [PATCH] 1 --- WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs | 1 - WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs index d94ee447..757f187a 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs @@ -393,7 +393,6 @@ namespace Tnb.WarehouseMgr var carryIds = carryAndLocIds.Select(x => x.carry_id).ToList(); await _db.Updateable().SetColumns(it => new WmsCarryH { location_id = null, location_code = null }).Where(it => carryIds.Contains(it.id)).ExecuteCommandAsync(); } - //var startLocationIds = await _db.Queryable().Where(it => input.disTaskIds.Contains(it.id)).Select(it => it.startlocation_id).ToListAsync(); //更新起始库位,状态改为空闲、锁定状态,未锁定 if (carryAndLocIds?.Count > 0) { diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs index e1b6088f..d1f52154 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs @@ -224,7 +224,6 @@ namespace Tnb.WarehouseMgr { foreach (var jo in jArr.Children()) { - var materialId = jo.Value(nameof(WmsInstockCode.material_id)); var materialCode = jo.Value(nameof(WmsInstockCode.material_code)); var codeBatch = jo.Value(nameof(WmsInstockCode.code_batch)); var b = items.Find(x => x.material_code == materialCode && x.code_batch == codeBatch); @@ -232,7 +231,7 @@ namespace Tnb.WarehouseMgr { var c = DeepCopyHelper.DeepCopy(b); c.id = SnowflakeIdHelper.NextId(); - c.bill_d_id = instockDetails.Find(x => x.material_code == materialCode && x.code_batch == codeBatch)?.id!; + c.bill_d_id = b.id; c.barcode = jo.Value(nameof(WmsInstockCode.barcode))!; c.codeqty = jo.Value(nameof(WmsInstockCode.codeqty)); instockCOdes.Add(c);