From 3e9e9c881a35ef6c5480ee3795672404cb2e5df2 Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Mon, 12 Aug 2024 17:25:25 +0800 Subject: [PATCH] bug --- .../PrdRawMaterialBarcodeService.cs | 1 + .../WmsMaterialTransferService.cs | 15 ++++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdRawMaterialBarcodeService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdRawMaterialBarcodeService.cs index 98f695a1..fc9bfcce 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdRawMaterialBarcodeService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdRawMaterialBarcodeService.cs @@ -568,6 +568,7 @@ namespace Tnb.ProductionMgr .SetColumns(x => x.start_time == null) .SetColumns(x => x.end_time == null) .SetColumns(x => x.is_update == 0) + .SetColumns(x => x.equip_ids == null) .SetColumns(x=>x.piping_status == 0) .SetColumns(x=>x.absorb_material_finish==0) .Where(x => x.id == item.id) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs index 14dc182d..73910982 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs @@ -1016,18 +1016,19 @@ namespace Tnb.WarehouseMgr Logger.LogInformation("【WmsMaterialTransferService ModifyAsync】同步其它出库单到erp..."); List dList = await _db.Queryable().Where(x => x.bill_id == wmsMaterialTransferd.bill_id).OrderBy(x => x.id).ToListAsync(); - // DictionaryDataEntity unitData = await _db.Queryable() - // .LeftJoin((x, y) => x.Id == y.DictionaryTypeId) - // .Where((x, y) => x.EnCode == DictConst.MeasurementUnit && y.EnCode == wmsMaterialTransferd.unit_id) - // .Select((x, y) => y) - // .FirstAsync(); + DictionaryDataEntity unitData = await _db.Queryable() + .LeftJoin((x, y) => x.Id == y.DictionaryTypeId) + .Where((x, y) => x.EnCode == DictConst.MeasurementUnit && y.EnCode == wmsMaterialTransferd.unit_id) + .Select((x, y) => y) + .FirstAsync(); + string unitId = unitData?.Id ?? ""; List ids = new List(); ids.Add(wmsMaterialTransfer.create_id); ids.Add(WmsWareHouseConst.AdministratorOrgId); ids.Add(wmsMaterialTransfer.warehouse_outstock); ids.Add(wmsMaterialTransfer.warehouse_instock); ids.Add(wmsMaterialTransferd.material_id); - ids.Add(wmsMaterialTransferd.unit_id); + ids.Add(unitId); List erpExtendFields = await _db.Queryable().Where(x => ids.Contains(x.table_id)).ToListAsync(); ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (wmsMaterialTransfer.org_id ?? WmsWareHouseConst.AdministratorOrgId)); @@ -1067,7 +1068,7 @@ namespace Tnb.WarehouseMgr ["crowno"] = wmsMaterialTransferd.lineno, ["csourcebillbid"] = wmsMaterialTransferd.erp_line_pk, ["csourcebillhid"] = wmsMaterialTransfer.erp_pk, - ["cunitid"] = erpExtendFields.Find(x => x.table_id == wmsMaterialTransferd.unit_id)?.cunitid ?? "", + ["cunitid"] = erpExtendFields.Find(x => x.table_id == unitId)?.cunitid ?? "", ["cvendorid"] = "", ["cvendorvid"] = "", ["dbizdate"] = nowStr,