소스 검색

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

tangdi 2 년 전
부모
커밋
3cb54ba9b8
1개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 2
      MicroServices/Business/Business.Application/ResourceExamineManagement/ProductionScheduleAppService.cs

+ 2 - 2
MicroServices/Business/Business.Application/ResourceExamineManagement/ProductionScheduleAppService.cs

@@ -474,7 +474,7 @@ namespace Business.ResourceExamineManagement
                         await _mysql_mes_morder.UpdateManyAsync(mesMorder);
                     }
                     //删除当前日期下一天开始的工单排产记录
-                    _periodSequenceDet.Delete(p=>p.PlanDate >scheTime.Date && p.Domain == domain);
+                    _periodSequenceDet.Delete(p=>p.PlanDate >scheTime.Date && p.Domain == domain && p.OrdQty != 0);
                     _scheduleResultOpMaster.Delete(p=>p.WorkDate > scheTime.Date && p.Domain == domain);
 
                     //添加工单工序准备开始时间记录
@@ -493,7 +493,7 @@ namespace Business.ResourceExamineManagement
                     var tdSeqDtls = periodSequenceDtls.Where(p => p.PlanDate == scheTime.Date).ToList();
                     var tdSchMsts = scheduleMasters.Where(p => p.WorkDate == scheTime.Date).ToList();
                     //删除数据库中的已存在的当天日计划
-                    _periodSequenceDet.Delete(p=>p.Domain == domain && tdSeqDtls.Select(m => m.Op).Contains(p.Op) && tdSeqDtls.Select(m => m.WorkOrds).Contains(p.WorkOrds) && p.PlanDate == scheTime.Date);
+                    _periodSequenceDet.Delete(p=>p.Domain == domain && tdSeqDtls.Select(m => m.Op).Contains(p.Op) && tdSeqDtls.Select(m => m.WorkOrds).Contains(p.WorkOrds) && p.PlanDate == scheTime.Date && p.OrdQty != 0);
                     _scheduleResultOpMaster.Delete(p=>p.Domain == domain && tdSchMsts.Select(m => m.Op).Contains(p.Op) && tdSchMsts.Select(m => m.WorkOrd).Contains(p.WorkOrd) && p.WorkDate == scheTime.Date);
                     //更新当天日计划的计划数量,排产数量
                     foreach (var item in periodSequenceDtls)