Browse Source

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

tangdi 2 years ago
parent
commit
cf2bd1ed93

+ 1 - 1
MicroServices/Business/Business.Application/ReplenishmentManagement/ReplenishmentAppService.cs

@@ -4389,7 +4389,7 @@ namespace Business.Replenishment
         //所有未下达的工单按照日期排序计算优先级
         public void CalcPriority(string domain)
         {
-            var works = _workOrdMaster.Select(a =>(string.IsNullOrEmpty(a.Status) || a.Status.ToUpper()=="P") && a.Domain == domain && a.IsActive);
+            var works = _workOrdMaster.Select(a =>(string.IsNullOrEmpty(a.Status) || a.Status.ToUpper()=="P") && a.Typed.ToUpper() != "PW" && a.Domain == domain && a.IsActive);
             works = works.OrderBy(a => a.OrdDate).ToList();
             decimal Priority = 1.0m;
             for (int i = 0; i < works.Count; i++)