Browse Source

周计划生成工单调整:修复全局变量没有赋值问题

heteng 2 years ago
parent
commit
74405e102e

+ 3 - 1
MicroServices/Business/Business.Application/ReplenishmentManagement/ReplenishmentAppService.cs

@@ -3998,11 +3998,13 @@ namespace Business.Replenishment
             WorkOrdMaster workOrd;
             //工单工艺路线表
             WorkOrdRouting woRouting;
+            //处理全局变量
+            param.factoryId = morders[0].factory_id.GetValueOrDefault();
             List<string> orderCode = morders.Select(c => c.product_code).ToList();
             //成品虚拟件对应关系
             var productOpList = _productStructureOp.Select(x => orderCode.Contains(x.ProductItem) && x.Domain == param.factoryId.ToString());
             //获取物料主数据
-            List<ItemMaster> itemMasters = _itemMaster.Select(p => p.Domain == param.factoryId.ToString()).ToList();
+            List<ItemMaster> itemMasters = _itemMaster.Select(p => orderCode.Contains(p.ItemNum) && p.Domain == param.factoryId.ToString()).ToList();
             foreach (var item in morders)
             {
                 var moItem = exmResult.Find(b => b.morder_no ==item.morder_no);

+ 1 - 1
MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -4568,7 +4568,7 @@ namespace Business.ResourceExamineManagement
             //成品虚拟件对应关系
             var productOpList = _productStructureOp.Select(x => orderCode.Contains(x.ProductItem) && x.Domain == param.factoryId.ToString());
             //获取物料主数据
-            List<ItemMaster> itemMasters = _itemMaster.Select(p => p.Domain == param.factoryId.ToString()).ToList();
+            List<ItemMaster> itemMasters = _itemMaster.Select(p => orderCode.Contains(p.ItemNum) && p.Domain == param.factoryId.ToString()).ToList();
             var dbworklist = _workOrdMaster.Select(x => (string.IsNullOrEmpty(x.Status) || x.Status == "p" || x.Status == "P") && (string.IsNullOrEmpty(x.Typed) || (!string.IsNullOrEmpty(x.Typed) && x.Typed.ToUpper() != "PW" && x.BusinessID > 0))).ToList();
             decimal Priority = 0;
             if (dbworklist.Any())