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

MicroServices/Business/Business.Application/ReplenishmentManagement/ReplenishmentAppService.cs

@@ -3378,7 +3378,7 @@ namespace Business.Replenishment
                             shdzbCount++;
                             isDel = false;
                         }
-                        if (podslist.Exists(x => x.ponumber == mst.PurOrd && x.itemnum == dtl.ItemNum && x.poline == dtl.Line && (x.status.ToUpper() != "C" || (x.status.ToUpper() == "C" && x.sentqty > 0))))//非关闭或已关闭但是有已交数量  则有交货单
+                        if (podslist.Exists(x => x.ponumber == mst.PurOrd && x.itemnum == dtl.ItemNum && x.poline == dtl.Line && ((x.status.ToUpper() != "C" && x.schedqty > 0) || (x.status.ToUpper() == "C" && x.sentqty > 0))))//非关闭但是有需求数量或已关闭但是有已交数量  则有交货单
                         {
                             dsCount++;
                             isDel = false;

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

@@ -4689,7 +4689,7 @@ namespace Business.ResourceExamineManagement
             workOrdMasters = workOrdMasters.Where(p => !noNbrlist.Contains(p.WorkOrd)).ToList();
             if (workOrdMasters.Count == 0)
             {
-                return "当前选择的工单包含已领料或未排产。";
+                return "当前选择的工单包含未排产。";
             }
 
             //增加判断当前工单是否进行过齐套检查，并且是仓库齐套