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]);

MicroServices/Business/Business.Application/ResourceExamineManagement/CalcBomViewAppService.cs

@@ -357,19 +357,11 @@ namespace Business.ResourceExamineManagement
                                 mesorder.ooentry_stime = plan_date.GetValueOrDefault().AddDays(-srmprDto.totalLeadTime.GetValueOrDefault());
 
                                 //先计算末级数据的齐套时间。
-                                if (childList.Count > 0 && LongPeriod)//按业务要求，委外件不向下展开子料
+                                if (childList.Count > 0)//按业务要求，委外件向下展开子料
                                 {
                                     MatterTileDevelop(level1Dto, childList, returnlist, sklist, bangid, mesorder.ooentry_stime, sentrys, icitemlist);
-                                    
-                                    var itemTime = childList.Max(s => s.kitting_time).GetValueOrDefault().AddDays(srmprDto.totalLeadTime.GetValueOrDefault());//加上物料的采购提前期
-                                    if (LongPeriod)
-                                    {
-                                        level1Dto.kitting_time = itemTime;
-                                    }
-                                    else if (itemTime > level1Dto.kitting_time)
-                                    {
-                                        level1Dto.kitting_time = itemTime;
-                                    }
+
+                                    level1Dto.kitting_time = childList.Max(s => s.kitting_time).GetValueOrDefault().AddDays(srmprDto.totalLeadTime.GetValueOrDefault());//加上物料的采购提前期
                                     if (IsStraight)
                                     {
                                         mesorder.ooentry_stime = childList.Max(s => s.kitting_time).GetValueOrDefault().AddDays(1);
@@ -915,18 +907,10 @@ namespace Business.ResourceExamineManagement
                         if (item.erp_cls == 2 && wwCount > 0)
                         {
                             //先计算末级数据的齐套时间。
-                            if (cilList.Count > 0 && LongPeriod)//按业务要求，委外件不向下展开子料
+                            if (cilList.Count > 0)//按业务要求，委外件打开向下展开子料
                             {
                                 CalcIcitem(cilList, returnlist, bangid, sklist, wwPlan_data, icitemlist, sentrys, childidList);
-                                var itemTime = cilList.Max(s => s.kitting_time).GetValueOrDefault().AddDays((int)maxLeadTime);//加上物料的采购提前期
-                                if (LongPeriod)
-                                {
-                                    item.kitting_time = itemTime;
-                                }
-                                else if (itemTime > item.kitting_time)
-                                {
-                                    item.kitting_time = itemTime;
-                                }
+                                item.kitting_time = cilList.Max(s => s.kitting_time).GetValueOrDefault().AddDays((int)maxLeadTime);//加上物料的采购提前期
                             }
                             item.subcontracting_qty = wwCount;
                             item.subcontracting_list = new List<ooder>();
@@ -1532,18 +1516,10 @@ namespace Business.ResourceExamineManagement
                                 if (sct.erp_cls == 2 && wwCount > 0)
                                 {
                                     //先计算末级数据的齐套时间。
-                                    if (cilList.Count > 0 && LongPeriod)//按业务要求，委外件不向下展开子料
+                                    if (cilList.Count > 0)//按业务要求，委外件向下展开子料
                                     {
                                         CalcIcitem(cilList, returnlist, bangid, sklist, wwPlan_data, icitemlist, sentrys, childidList);
-                                        var itemTime = cilList.Max(s => s.kitting_time).GetValueOrDefault().AddDays((int)maxLeadTime);//加上物料的采购提前期
-                                        if (LongPeriod)
-                                        {
-                                            sct.kitting_time = itemTime;
-                                        }
-                                        else if (itemTime > sct.kitting_time)
-                                        {
-                                            sct.kitting_time = itemTime;
-                                        }
+                                        sct.kitting_time = cilList.Max(s => s.kitting_time).GetValueOrDefault().AddDays((int)maxLeadTime);//加上物料的采购提前期
                                     }
                                     sct.subcontracting_qty = wwCount;
                                     sct.subcontracting_list = new List<ooder>();