周计划资源检查排除年度工单

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

@@ -3262,7 +3262,7 @@ namespace Business.Replenishment
 ;            List<mes_morder> moList = new List<mes_morder>();
             List<mes_moentry> moentryList = new List<mes_moentry>();
             var morder_noList = _serialNumberAppService.GetBillNo(input.factory_id.ToString(), "M5", weekplans.Count, "", 1);
-            
+
             foreach (var item in weekplans)
             {
                 mes_morder mes_Morder = new mes_morder();
@@ -3357,8 +3357,8 @@ namespace Business.Replenishment
                 _businessDbContext.BulkInsert(workOrdDetails);
             }
 
-            //2024/01/10:卫亮工单需求对齐采购需求,取所有未下达的工单做资源检查
-            var moListCheck=_mysql_mes_morder.GetListAsync(a=>(a.morder_state==MorderEnum.Initial_state|| string.IsNullOrEmpty(a.morder_state)) && a.factory_id == input.factory_id).Result;
+            //2024/01/10:卫亮工单需求对齐采购需求,取所有未下达的工单做资源检查(排除年度中间件工单)
+            var moListCheck=_mysql_mes_morder.GetListAsync(a=>(a.morder_state==MorderEnum.Initial_state|| string.IsNullOrEmpty(a.morder_state)) && a.factory_id == input.factory_id && string.IsNullOrEmpty(a.analogcalcversion)).Result;
             var moEntryListCheck = _mysql_mes_moentry.GetListAsync(a => moListCheck.Select(b=>b.morder_no).ToList().Contains(a.moentry_mono) && a.factory_id == input.factory_id).Result;
             
             await PlanOrderResourceCheck(moListCheck.OrderBy(a => a.moentry_sys_stime).ToList(), moEntryListCheck, bang_id, "",false,true);
@@ -3377,23 +3377,26 @@ namespace Business.Replenishment
                 var HeatSealing = routingOp.Where(x => x.Ufld1 == "热封" && x.MilestoneOp).FirstOrDefault();
                 //包装标准工时
                 var Packaging = routingOp.Where(x => x.Descr == "包装" && x.MilestoneOp).FirstOrDefault();
-                if (moItem != null && moItem.kitting_times < a.PlanStartDate)
-                {
-                    a.ItemStatus = "齐套";
-                    a.PlanKittingDate = moItem.kitting_times;
-                    a.AssembleHours = Assembly == null ? 0 : Assembly.RunTime * a.Qty;
-                    a.HeatSealHours = HeatSealing == null ? 0 : HeatSealing.RunTime * a.Qty;
-                    a.PackageHours = Packaging == null ? 0 : Packaging.RunTime * a.Qty;
-                    a.TotalHours = a.AssembleHours + a.HeatSealHours + a.PackageHours;
-                }
-                else
+                if (moItem != null)
                 {
-                    a.ItemStatus = "欠料";
-                    a.PlanKittingDate = moItem.kitting_times;
-                    a.AssembleHours = Assembly == null ? 0 : Assembly.RunTime * a.Qty;
-                    a.HeatSealHours = HeatSealing == null ? 0 : HeatSealing.RunTime * a.Qty;
-                    a.PackageHours = Packaging == null ? 0 : Packaging.RunTime * a.Qty;
-                    a.TotalHours = a.AssembleHours + a.HeatSealHours + a.PackageHours;
+                    if (moItem.kitting_times < a.PlanStartDate)
+                    {
+                        a.ItemStatus = "齐套";
+                        a.PlanKittingDate = moItem.kitting_times;
+                        a.AssembleHours = Assembly == null ? 0 : Assembly.RunTime * a.Qty;
+                        a.HeatSealHours = HeatSealing == null ? 0 : HeatSealing.RunTime * a.Qty;
+                        a.PackageHours = Packaging == null ? 0 : Packaging.RunTime * a.Qty;
+                        a.TotalHours = a.AssembleHours + a.HeatSealHours + a.PackageHours;
+                    }
+                    else
+                    {
+                        a.ItemStatus = "欠料";
+                        a.PlanKittingDate = moItem.kitting_times;
+                        a.AssembleHours = Assembly == null ? 0 : Assembly.RunTime * a.Qty;
+                        a.HeatSealHours = HeatSealing == null ? 0 : HeatSealing.RunTime * a.Qty;
+                        a.PackageHours = Packaging == null ? 0 : Packaging.RunTime * a.Qty;
+                        a.TotalHours = a.AssembleHours + a.HeatSealHours + a.PackageHours;
+                    }
                 }
             });
             await _businessDbContext.BulkUpdateAsync(weekplanList);