From 2c7fd13e6ba83d9dde8cc8d2b1ff7fe157c2b994 Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Thu, 5 Sep 2024 17:10:12 +0800 Subject: [PATCH] bug --- .../Tnb.ProductionMgr/PrdMoTaskService.cs | 18 +++++++++--------- .../Tnb.WarehouseMgr/WmsPrdInstockHService.cs | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs index 0cba0aad..1b3a0a55 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs @@ -2482,18 +2482,18 @@ namespace Tnb.ProductionMgr //来源erp需要调接口 if (prdMo.mo_source == "1") { - // List unitDatas = await db.Queryable() - // .LeftJoin((x, y) => x.Id == y.DictionaryTypeId) - // .Where((x, y) => x.EnCode == DictConst.MeasurementUnit && y.EnCode==report.unit_id) - // .Select((x, y) => y) - // .ToListAsync(); + List unitDatas = await db.Queryable() + .LeftJoin((x, y) => x.Id == y.DictionaryTypeId) + .Where((x, y) => x.EnCode == DictConst.MeasurementUnit && y.EnCode==report.unit_id) + .Select((x, y) => y) + .ToListAsync(); List erpExtendIds = new List(); erpExtendIds.Add(_userManager.UserId); erpExtendIds.Add(WmsWareHouseConst.AdministratorOrgId); erpExtendIds.Add(report.material_id); - erpExtendIds.Add(report.unit_id); - // erpExtendIds.AddRange(unitDatas.Select(x => x.Id).ToList()); + // erpExtendIds.Add(report.unit_id); + erpExtendIds.AddRange(unitDatas.Select(x => x.Id).ToList()); List erpExtendFields = await _db.Queryable().Where(x=>erpExtendIds.Contains(x.table_id)).ToListAsync(); string erpCreateId = erpExtendFields.Find(x=>x.table_id==_userManager.UserId)?.user_id ?? ""; @@ -2534,8 +2534,8 @@ namespace Tnb.ProductionMgr ["cbmoid"] = prdMo.erp_mo_pk, // ["cbunitid"] = erpExtendFields.Find(x=>x.table_id==report.unit_id)?.cunitid ?? "", // ["cbastunitid"] = erpExtendFields.Find(x=>x.table_id==report.unit_id)?.cunitid ?? "", - ["cbunitid"] = erpExtendFields.Find(x => x.table_id == report.unit_id)?.cunitid ?? "", - ["cbastunitid"] = erpExtendFields.Find(x => x.table_id == report.unit_id)?.cunitid ?? "", + ["cbunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x=>x.EnCode==report.unit_id)?.Id ?? ""))?.cunitid ?? "", + ["cbastunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x=>x.EnCode==report.unit_id)?.Id ?? ""))?.cunitid ?? "", ["nbplanwrnum"] = report.reported_qty, ["nbwrnum"] = report.reported_qty, ["tbendtime"] = nowStr, diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs index 31e6037d..86711bb4 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs @@ -358,12 +358,12 @@ namespace Tnb.WarehouseMgr List materialIds = Arrays.AsList(instock.material_id); List unitIds = allInstockDetails.Select(x => x.unit_id).Distinct().ToList(); - // List unitCodes = allInstockDetails.Select(x => x.unit_id).Distinct().ToList(); - // List unitDatas = await _db.Queryable() - // .LeftJoin((x, y) => x.Id == y.DictionaryTypeId) - // .Where((x, y) => x.EnCode == DictConst.MeasurementUnit && unitCodes.Contains(y.EnCode)) - // .Select((x, y) => y) - // .ToListAsync(); + List unitCodes = allInstockDetails.Select(x => x.unit_id).Distinct().ToList(); + List unitDatas = await _db.Queryable() + .LeftJoin((x, y) => x.Id == y.DictionaryTypeId) + .Where((x, y) => x.EnCode == DictConst.MeasurementUnit && unitCodes.Contains(y.EnCode)) + .Select((x, y) => y) + .ToListAsync(); List erpWarehouserelaHs = await _db.Queryable().Where(x=>x.id!=null).ToListAsync(); string userId = instock?.create_id ?? WmsWareHouseConst.AdministratorUserId; @@ -373,8 +373,8 @@ namespace Tnb.WarehouseMgr tableIds.Add(WmsWareHouseConst.AdministratorOrgId); tableIds.AddRange(materialIds); tableIds.Add(supplierId); - // tableIds.AddRange(unitDatas.Select(x => x.Id).ToList()); - tableIds.AddRange(unitIds); + tableIds.AddRange(unitDatas.Select(x => x.Id).ToList()); + // tableIds.AddRange(unitIds); List erpExtendFields = await _db.Queryable().Where(x => tableIds.Contains(x.table_id)).ToListAsync(); string erpCreateId = erpExtendFields.Find(x => x.table_id == userId)?.user_id ?? ""; @@ -422,7 +422,7 @@ namespace Tnb.WarehouseMgr ["crowno"] = (allInstockDetails.FindIndex(x => x.id == item.id) + 1) * 10, ["csourcebillhid"] = prdReport?.erp_pk_wr ?? "", ["csourcebillbid"] = prdReport?.erp_pk_wr_product ?? "", - ["cunitid"] = erpExtendFields.Find(x => x.table_id == item.unit_id)?.cunitid ?? "", + ["cunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x=>x.EnCode==item.unit_id)?.Id ?? ""))?.cunitid ?? "", ["cvendorid"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_id ?? "", ["cvendorvid"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_vid ?? "", ["dbizdate"] = instock.create_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),