heteng пре 3 година
родитељ
комит
78da08ab34

+ 18 - 10
MicroServices/Business/Business.Application/ResourceExamineManagement/CalcBomViewAppService.cs

@@ -85,20 +85,10 @@ namespace Business.ResourceExamineManagement
             PurchaseOrderAppService purchaseOrderAppService)
         {
             _morderAppService = morderAppService;
-            _morderAppService.process = process;
-            _morderAppService.techs = techs;
-            _morderAppService.tech_Processes = tech_Processes;
-            _morderAppService.tech_Proc_Workshops = tech_Proc_Workshops;
-
             _productExamineAppService = productExamineAppService;
-            _productExamineAppService.process = process;
-            _productExamineAppService.techs = techs;
-            _productExamineAppService.tech_Processes = tech_Processes;
-            _productExamineAppService.tech_Proc_Workshops = tech_Proc_Workshops;
             _purchaseOrderAppService = purchaseOrderAppService;
         }
 
-
         /// <summary>
         /// 计算物料库存量
         /// </summary>
@@ -222,6 +212,10 @@ namespace Business.ResourceExamineManagement
 
                     };
                     //生成主工单
+                    _morderAppService.process = process;
+                    _morderAppService.techs = techs;
+                    _morderAppService.tech_Processes = tech_Processes;
+                    _morderAppService.tech_Proc_Workshops = tech_Proc_Workshops;
                     mes_MorderDto = _morderAppService.GenerateMorder(generateMorderDto);
                 }
             }
@@ -255,6 +249,10 @@ namespace Business.ResourceExamineManagement
                             version = level1Dto.version,
                             packages = (int)mes_Morders.morder_production_number.Value
                         };
+                        _productExamineAppService.process = process;
+                        _productExamineAppService.techs = techs;
+                        _productExamineAppService.tech_Processes = tech_Processes;
+                        _productExamineAppService.tech_Proc_Workshops = tech_Proc_Workshops;
 
                         var plan = planList.Find(x => x.icitem_id == level1Dto.item_id);
                         var ProductiveDate = _productExamineAppService.ProductiveExamine(prodExamine);
@@ -487,6 +485,11 @@ namespace Business.ResourceExamineManagement
                             version = item.version,
                             packages = (int)item.lack_qty
                         };
+                        _productExamineAppService.process = process;
+                        _productExamineAppService.techs = techs;
+                        _productExamineAppService.tech_Processes = tech_Processes;
+                        _productExamineAppService.tech_Proc_Workshops = tech_Proc_Workshops;
+
                         item.make_qty = item.lack_qty;
                         //todo:增加生成子工单后,这里需要加上生成的子工单的明细。
                         item.make_list = new List<moorder>();
@@ -871,6 +874,11 @@ namespace Business.ResourceExamineManagement
                                 version = sct.version,
                                 packages = (int)sct.lack_qty
                             };
+                            _productExamineAppService.process = process;
+                            _productExamineAppService.techs = techs;
+                            _productExamineAppService.tech_Processes = tech_Processes;
+                            _productExamineAppService.tech_Proc_Workshops = tech_Proc_Workshops;
+
                             var minute = _productExamineAppService.ProductiveExamine(prodExamine);
                             //系统建议完工日期为 开工日期+产能检查时间=完工日期
                             var Day = minute / (60 * 10); //返回的分钟除以十个小时得出工作天数;

+ 5 - 5
MicroServices/Business/Business.Application/ResourceExamineManagement/MorderAppService.cs

@@ -107,11 +107,6 @@ namespace Business.ResourceExamineManagement
             _mysql_crm_seorder = mysql_crm_seorder;
             _mysql_crm_seorderentry = mysql_crm_seorderentry;
             _productExamineAppService = productExamineAppService;
-            _productExamineAppService.process = process;
-            _productExamineAppService.techs = techs;
-            _productExamineAppService.tech_Processes = tech_Processes;
-            _productExamineAppService.tech_Proc_Workshops = tech_Proc_Workshops;
-
         }
         #endregion
 
@@ -158,6 +153,11 @@ namespace Business.ResourceExamineManagement
                         version = generateMorderDto.version,
                         packages = (int)generateMorderDto.Quantity.GetValueOrDefault()
                     };
+                    _productExamineAppService.process = process;
+                    _productExamineAppService.techs = techs;
+                    _productExamineAppService.tech_Processes = tech_Processes;
+                    _productExamineAppService.tech_Proc_Workshops = tech_Proc_Workshops;
+
                     var ProductiveDate = _productExamineAppService.ProductiveExamine(prodExamine);
                     //系统建议完工日期为 开工日期+产能检查时间=完工日期
                     var Day = ProductiveDate / (60 * 10); //返回的分钟除以十个小时得出工作天数;

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

@@ -323,7 +323,6 @@ namespace Business.ResourceExamineManagement
             param.tenantId = input.tenantId;
             param.factoryId = input.factoryId;
 
-
             //资源检查结果
             PschedDto rtn = new PschedDto();
             rtn.sorderid = input.sorderId;