Merge branch 'dev' of http://123.60.180.165:4647/ZZYDOP/DOPCore into dev

MicroServices/Business/Business.Application/Quartz/ProductionScheduleAppService.cs

@@ -147,18 +147,23 @@ namespace Business.Quartz
         /// </summary>
         public async void DoExt()
         {
-            await DoProductShcedule();
+            List<WorkOrdMaster> workOrds = new List<WorkOrdMaster>();
+            await DoProductShcedule(workOrds);
         }
 
         /// <summary>
         /// 生产排产
         /// </summary>
-        public async Task DoProductShcedule()
+        /// <param name="workOrds">工单:定时任务执行时count=0;资源检查调用count>0</param>
+        /// <returns></returns>
+        public async Task DoProductShcedule(List<WorkOrdMaster> workOrds)
         {
-            //1、获取需要排产的工单:Status为空且IsActive==1
-            //List<WorkOrdMaster> workOrds = _workOrdMaster.Select(p => string.IsNullOrEmpty(p.Status) && p.IsActive).Result;
-            List<WorkOrdMaster> workOrds = _workOrdMaster.Select(p => p.WorkOrd == "Test0000003").Result;//测试代码
-            if (workOrds.Count == 0)
+            if (workOrds.Count() == 0)//定时任务调用时，需要获取工单数据
+            {
+                //1、获取需要排产的工单:Status为空且IsActive==1
+                workOrds = _workOrdMaster.Select(p => string.IsNullOrEmpty(p.Status) && p.IsActive).Result;
+            }
+            if (workOrds.Count() == 0)//没有工单需要排产
             {
                 return;
             }

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

@@ -2350,12 +2350,12 @@ namespace Business.ResourceExamineManagement
             await _businessDbContext.BulkInsertAsync(workOrdRoutings);
             await _businessDbContext.BulkInsertAsync(workOrdDetails);
 
-            //排产
-            await _productionScheduleAppService.DoProductShcedule();
+            //排产,工单肯定有值
+            await _productionScheduleAppService.DoProductShcedule(workOrds);
         }
 
         /// <summary>
-        /// 获取标准工艺路线数据--TODO:存在循环查询数据库问题，后续调整
+        /// 获取标准Bom数据--TODO:存在循环查询数据库问题，后续调整
         /// </summary>
         /// <param name="itenNums">产品物料编码</param>
         /// <returns></returns>