交货计划调整

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

@@ -5742,11 +5742,11 @@ namespace Business.ResourceExamineManagement
                 int adddays = weekday==0?1:8-weekday;
                 DateTime beginTime = Convert.ToDateTime(DateTime.Now.AddDays(adddays).ToString("yyyy-MM-dd 00:00:00.000"));
                 DateTime endTime = Convert.ToDateTime(DateTime.Now.AddDays(adddays+21+28+6).ToString("yyyy-MM-dd 23:59:59.999"));
-                var workords=_workOrdMaster.Select(a => a.OrdDate >= beginTime && a.OrdDate <= endTime && a.Domain == domain && a.Status!="C");
+                var workords=_workOrdMaster.Select(a => a.OrdDate >= beginTime && a.OrdDate <= endTime && a.Domain == domain && (string.IsNullOrEmpty(a.Status)|| a.Status.ToUpper()=="P"));
                 var workordList = workords.Select(x => x.WorkOrd).Distinct().ToList();
 
                 //存在提前开工的情况
-                var workordsPickBill = _workOrdMaster.Select(a => a.OrdDate < beginTime && (a.Status=="R"|| a.Status=="W") && a.Domain == domain);
+                var workordsPickBill = _workOrdMaster.Select(a =>(!string.IsNullOrEmpty(a.Status) && a.Status!="C" && a.Status!="P") && a.Domain == domain);
                 var workordListPickBill = workordsPickBill.Select(x => x.WorkOrd).Distinct().ToList();
                 if(workordList.Count>0)
                 {
@@ -5761,7 +5761,7 @@ namespace Business.ResourceExamineManagement
                 //需要测试工单没有做资源检查会不会报错
                 var examineIds = workExamineResult.Select(s => s.examineId).ToList();
                 var examines=_mysql_bom_child_examine.GetListAsync(a => examineIds.Contains(a.examine_id.Value) && (a.erp_cls==3 || a.erp_cls==2) && a.is_use && a.factory_id.ToString() == domain).Result;
-                var pickBills = _nbrDetail.Select(a => workordListPickBill.Contains(a.WorkOrd) && a.Type.ToUpper()=="SM" && (a.QtyOrd - a.QtyRec)>0 && a.Domain == domain);
+                var pickBills = _nbrDetail.Select(a => workordListPickBill.Contains(a.WorkOrd) && a.Type.ToUpper()=="SM" && (a.QtyOrd - a.QtyRec)>0 && a.Domain == domain && a.Status.ToUpper()!="C");
                 var dsList=_srm_polist_ds.Select(a => a.requestdate <= endTime && a.domain==domain && a.isactive==1);
                 var items = examines.Select(e => e.item_number).Distinct().ToList();
                 var itempickbills=pickBills.Select(s => s.ItemNum);