Merge branch 'master' of http://123.60.180.165:4647/ZZYDOP/DOPCore

MicroServices/Business/Business.Application/ResourceExamineManagement/CalcBomViewAppService.cs

@@ -199,6 +199,11 @@ namespace Business.ResourceExamineManagement
                         bang_id = bangid,
 
                     };
+                    //工单添加工艺路径数据
+                    _morderAppService.techs = techs;//工艺路径
+                    _morderAppService.tech_Processes = tech_Processes;//工艺关联工序
+                    _morderAppService.process = process;//工序
+                    _morderAppService.tech_Proc_Workshops = tech_Proc_Workshops;//工艺工序关联工位
                     //生成主工单
                     mes_MorderDto = _morderAppService.GenerateMorder(generateMorderDto);
                 }

MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -187,16 +187,6 @@ namespace Business.ResourceExamineManagement
         /// </summary>
         private readonly SeorderentryDto param = new SeorderentryDto();
 
-        /// <summary>
-        /// 产能检查
-        /// </summary>
-        private readonly ProductExamineAppService _productExamineAppService;
-        /// <summary>
-        /// 工单App
-        /// </summary>
-        private readonly MorderAppService _morderAppService;
-
-
         /// <summary>
         /// 预处理
         /// </summary>
@@ -269,8 +259,6 @@ namespace Business.ResourceExamineManagement
             IRepository<srm_po_occupy, long> mysql_srm_po_occupy,
             IRepository<ic_item_pur, long> mysql_ic_item_pur,
             IRepository<ic_plan, long> mysql_ic_plan,
-            ProductExamineAppService productExamineAppService,
-            MorderAppService morderAppService,
             PretreatmentAppService pretreatmentAppService,
             CalcBomViewAppService calcbomviewAppService
             )
@@ -316,8 +304,6 @@ namespace Business.ResourceExamineManagement
             _mysql_srm_po_occupy = mysql_srm_po_occupy;
             _mysql_ic_item_pur = mysql_ic_item_pur;
             _mysql_ic_plan = mysql_ic_plan;
-            _productExamineAppService = productExamineAppService;
-            _morderAppService = morderAppService;
             _pretreatmentAppService = pretreatmentAppService;
             _CalcBomViewAppService = calcbomviewAppService;
         }
@@ -436,12 +422,6 @@ namespace Business.ResourceExamineManagement
             _CalcBomViewAppService.process = process;//工序
             _CalcBomViewAppService.tech_Proc_Workshops = tech_Proc_Workshops;//工艺工序关联工位
 
-            //工单添加工艺路径数据
-            _morderAppService.techs = techs;//工艺路径
-            _morderAppService.tech_Processes = tech_Processes;//工艺关联工序
-            _morderAppService.process = process;//工序
-            _morderAppService.tech_Proc_Workshops = tech_Proc_Workshops;//工艺工序关联工位
-
             foreach (var item in sentrys)
             {
                 //工单资源检查信息