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

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

@@ -6855,7 +6855,7 @@ namespace Business.Replenishment
                     continue;
                 }
                 //获取当前交货计划物料对应的可用采购单明细数据
-                var curPurDtls = purOrdDetails.Where(p => p.ItemNum == demandplans[i].itemnum).OrderBy(p => p.DueDate).ToList();
+                var curPurDtls = purOrdDetails.Where(p => p.ItemNum == demandplans[i].itemnum).OrderBy(p => p.CreateTime).ToList();
                 //当前采购明细对应的采购单
                 var curPurMsts = purOrdMasters.Where(p => curPurDtls.Select(m => m.PurOrd).Distinct().Contains(p.PurOrd)).ToList();
                 //当前采购明细对应的送货单
@@ -6981,6 +6981,7 @@ namespace Business.Replenishment
                     }
 
                     //采购单明细优先级：先PO，按照交货日期从早到晚占用；再DO，按照交货日期从早到晚占用
+                    //2024-03-05调整：按照采购订单创建日期从早到晚占用
                     pchPurDtls = CalcPurDetailPriority(pchPurDtls);
                     for (int k = 0; k < pchPurDtls.Count; k++)
                     {
@@ -7140,9 +7141,9 @@ namespace Business.Replenishment
         { 
             List<PurOrdDetail> newDetails = new List<PurOrdDetail>();
             //获取DO
-            var doLists = details.Where(p => p.PurOrd.StartsWith("DO")).OrderBy(p=>p.DueDate).ToList();
+            var doLists = details.Where(p => p.PurOrd.StartsWith("DO")).OrderBy(p=>p.CreateTime).ToList();
             //获取PO
-            var poLists = details.Where(p => !doLists.Select(m => m.PurOrd).Contains(p.PurOrd)).OrderBy(p => p.DueDate).ToList();
+            var poLists = details.Where(p => !doLists.Select(m => m.PurOrd).Contains(p.PurOrd)).OrderBy(p => p.CreateTime).ToList();
             for (int i = 0; i < poLists.Count; i++)
             {
                 newDetails.Add(poLists[i]);