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

MicroServices/Business/Business.Application/ResourceExamineManagement/ProductionScheduleAppService.cs

@@ -304,25 +304,12 @@ namespace Business.ResourceExamineManagement
 
             //排产前校验
             List<ScheduleExceptionMaster> exceptions = BeforeScheduleCheck(workOrds, workOrdRoutings, prodLines,type);
+            //过滤校验未通过的工单
             if (exceptions.Any())
             {
-                using (TransactionScope scope = new TransactionScope())
-                {
-                    try
-                    {
-                        //记录排产异常数据
-                        _scheduleExceptionMaster.Insert(exceptions);
-                        scope.Complete();
-                    }
-                    catch (Exception ex)
-                    {
-                        new NLogHelper("ProductionScheduleAppService").WriteLog("DoProductSchedule", "保存排产异常数据失败：" + ex.Message, _currentTenant.Id.ToString());
-                        scope.Dispose();
-                    }
-                }
-                return "NO|请查看排产异常日志！";
+                zcWorkOrds = zcWorkOrds.Where(p => !exceptions.Select(m => m.WorkOrd).Contains(p.WorkOrd)).ToList();
+                tsWorkOrds = tsWorkOrds.Where(p => !exceptions.Select(m => m.WorkOrd).Contains(p.WorkOrd)).ToList();
             }
-            
             //3、排产
             //生产周期
             List<PeriodSequenceDet> periodSequenceDtls = new List<PeriodSequenceDet>();
@@ -475,6 +462,11 @@ namespace Business.ResourceExamineManagement
             {
                 try
                 {
+                    //记录排产异常数据
+                    if (exceptions.Any())
+                    {
+                        _scheduleExceptionMaster.Insert(exceptions);
+                    }
                     //更新工单计划开工时间、计划结束时间
                     _workOrdMaster.Update(workOrds);
                     if (mesMorder.Any())