From 933744b618175f4955ae91ef662e28b788386437 Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Wed, 26 Jun 2024 15:58:46 +0800 Subject: [PATCH] BUG --- ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs | 2 +- WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs index e58eb8e1..4fd86386 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs @@ -442,7 +442,7 @@ namespace Tnb.ProductionMgr num = item.codeqty, batch = item.code_batch, unit_id = item.unit_id, - carry_id = carry.id, + carry_id = item.member_carryid, barcode = item.barcode, is_all_feeding = 0, member_carry_id = item.member_carryid, diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs index 8d264fb1..7cf94af3 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs @@ -81,6 +81,7 @@ namespace Tnb.WarehouseMgr } Dictionary mCarryIdDic = await _db.Queryable().Where(it => it.carry_id == carry.id).ToDictionaryAsync(x => x.membercarry_id, x => x.membercarry_code); + Dictionary mCarryIdDic2 = await _db.Queryable().Where(it => it.carry_id == carry.id).ToDictionaryAsync(x => x.membercarry_code, x => x.membercarry_id); Expression> whereExp = carry.carrystd_id == WmsWareHouseConst.CARRY_LJSTD_ID && mCarryIdDic.Keys?.Count > 0 ? a => mCarryIdDic.Keys.Contains(a.carry_id) : a => a.carry_id == carry.id; @@ -115,6 +116,10 @@ namespace Tnb.WarehouseMgr } data = carry.Adapt(); data.wmsCarryCodes = carryCodes.Adapt>(); + foreach (CarryCodeQueryOutput carryCodeQueryOutput in data.wmsCarryCodes) + { + carryCodeQueryOutput.member_carryid = mCarryIdDic2.GetOrDefault(carryCodeQueryOutput.member_carrycode).ToString(); + } return data; } }