排产

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

@@ -3368,7 +3368,7 @@ namespace Business.Replenishment
             foreach (var key in subProductItem.Keys)
             {
                 var itemQty = subProductItem[key];
-                var ParentNeedCount= subProductItem[key];
+                var ParentNeedCount = subProductItem[key];
                 var middle = middleItemList.Find(m => m.ItemNum == key);
                 var curStokc = icitemStokc.Find(s => s.icitem_number == key);
                 var curInProdcut = InProdcutQty.Find(s => s.ItemNumber == key);
@@ -3418,7 +3418,7 @@ namespace Business.Replenishment
                     }
                     else
                     {
-                        itemQty = Math.Ceiling(itemQty.GetValueOrDefault() -(curStokcQty + curInProdcutQty)+ middle.SafetyStk);
+                        itemQty = Math.Ceiling(itemQty.GetValueOrDefault() - (curStokcQty + curInProdcutQty) + middle.SafetyStk);
                     }
                 }
                 if (itemQty > 0)
@@ -3849,33 +3849,7 @@ namespace Business.Replenishment
                     mes_Morders.AddRange(mes_Morders_sub);
                 }
             }
-            else
-            {
-                //非补货计划关联的工单发布
-                mes_Morders = _mysql_mes_morder.GetListAsync(a => idList.Contains(a.Id) && a.factory_id.ToString() == factoryid).Result;
-                if (mes_Morders != null && mes_Morders.Count > 0)
-                {
-                    List<mes_morder> mes_Morders_sub = _mysql_mes_morder.GetListAsync(a => mes_Morders.Select(p => p.Id).ToList().Contains(a.parent_id.GetValueOrDefault()) && a.factory_id.ToString() == factoryid).Result;
-                    if (mes_Morders_sub != null && mes_Morders_sub.Count > 0)
-                    {
-                        mes_Morders.AddRange(mes_Morders_sub);
-                    }
-                }
-            }
             List<WorkOrdMaster> workMasters = _workOrdMaster.Select(a => mes_Morders.Select(m => m.morder_no).ToList().Contains(a.WorkOrd) && a.Domain == factoryid);
-            if (weekPlan.Count == 0)
-            {
-                workMasters.ForEach(b =>
-                {
-                    b.Status = "p";
-                });
-                mes_Morders.ForEach(c =>
-                {
-                    c.morder_state = MorderEnum.Initial_state;
-                });
-            }
-            else
-            {
                 for (int i = 0; i < weekPlan.Count; i++)
                 {
                     weekPlan[i].ProductionStatus = "已发布";
@@ -3891,7 +3865,6 @@ namespace Business.Replenishment
                         c.morder_state = MorderEnum.Initial_state;
                     });
                 }
-            }
             //发布计划订单产生的工单
             List<mes_morder> planMo = _mysql_mes_morder.GetListAsync(a => idList.Contains(a.Id) && string.IsNullOrEmpty(a.morder_state) && a.factory_id.ToString() == factoryid).Result;
             if (planMo != null)

MicroServices/Business/Business.Application/ResourceExamineManagement/ProductionScheduleAppService.cs

@@ -530,8 +530,8 @@ namespace Business.ResourceExamineManagement
                         _scheduleResultOpMaster.Delete(p => sczWorkords.Contains(p.WorkOrd) && p.WorkDate > scheTime.Date && p.Domain == domain);
 
                         //保存下一天的日计划数据
-                        _periodSequenceDet.Insert(periodSequenceDtls.Where(p => sczWorkords.Contains(p.WorkOrds) && p.PlanDate > scheTime.Date).ToList());
-                        _scheduleResultOpMaster.Insert(scheduleMasters.Where(p => sczWorkords.Contains(p.WorkOrd) && p.WorkDate > scheTime.Date).ToList());
+                        _periodSequenceDet.Insert(periodSequenceDtls.Where(p => sczWorkords.Contains(p.WorkOrds) && p.PlanDate >= scheTime.Date).ToList());
+                        _scheduleResultOpMaster.Insert(scheduleMasters.Where(p => sczWorkords.Contains(p.WorkOrd) && p.WorkDate >= scheTime.Date).ToList());
 
                     }
                     //未投产的工单，当前日期及以后的排产记录全部删除
@@ -705,10 +705,6 @@ namespace Business.ResourceExamineManagement
         /// <param name="allResults">产线占用记录</param>
         public void LineSchedule(WorkOrdMaster workOrd, List<WorkOrdRouting> workOrdRoutings, List<ProdLineDetail> prodLines,List<PeriodSequenceDet> periodsDet, List<ScheduleResultOpMaster> scheduleResults, List<ScheduleResultOpMaster> allResults)
         {
-            if (workOrd.WorkOrd == "M500077443")
-            {
-                var isy = 1;
-            }
             //生产周期
             List<PeriodSequenceDet> curSequences = new List<PeriodSequenceDet>();
             //排产明细

MicroServices/Business/Business.Host/appsettings.json

@@ -15,17 +15,17 @@
     //"DOPExt": "Server=123.60.181.157;Database=DOPEXT;uid=sa;pwd=5h3n9)uN;Trusted_Connection=false;TrustServerCertificate=True",
     //"MongoDB": "mongodb://zzydop:h1Q$us3r@123.60.181.157/dopbase",
 
-    "Default": "Server=172.16.8.154;Database=dopbiz;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
-    "DOPLog": "Server=172.16.8.154;Database=dopbiz;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
-    "DOPBang": "Server=172.16.8.154;Database=dopbiz;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
-    "DOPExt": "Server=172.16.8.154;Database=DOPEXT;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
-    "MongoDB": "mongodb://zzydop:zzyd0pB()@172.16.8.154/dopbase",
+    //"Default": "Server=172.16.8.154;Database=dopbiz;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
+    //"DOPLog": "Server=172.16.8.154;Database=dopbiz;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
+    //"DOPBang": "Server=172.16.8.154;Database=dopbiz;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
+    //"DOPExt": "Server=172.16.8.154;Database=DOPEXT;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
+    //"MongoDB": "mongodb://zzydop:zzyd0pB()@172.16.8.154/dopbase",
 
-    //"Default": "Server=172.16.8.158;Database=dopbiz;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
-    //"DOPLog": "Server=172.16.8.158;Database=dopbiz;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
-    //"DOPBang": "Server=172.16.8.158;Database=dopbiz;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
-    //"DOPExt": "Server=172.16.8.158;Database=DOPEXT;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
-    //"MongoDB": "mongodb://zzydop:zzyd0pB()@172.16.8.158/dopbase",
+    "Default": "Server=172.16.8.158;Database=dopbiz;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
+    "DOPLog": "Server=172.16.8.158;Database=dopbiz;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
+    "DOPBang": "Server=172.16.8.158;Database=dopbiz;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
+    "DOPExt": "Server=172.16.8.158;Database=DOPEXT;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
+    "MongoDB": "mongodb://zzydop:zzyd0pB()@172.16.8.158/dopbase",
     "Factory_id": "8010",
     "Company_id": "1000"
   },

MicroServices/Business/QuartzSettings/logs/logs.txt

@@ -2460,3 +2460,45 @@
 {"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-03-18T16:20:51.7073205+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
 {"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-03-18T16:20:51.7115165+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
 {"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-03-18T16:20:51.7132087+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2025-03-19T14:51:03.2126853+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2025-03-19T14:51:03.2500477+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2025-03-19T14:51:03.2529072+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-03-19T14:51:03.2543421+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-03-19T14:51:03.2604396+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-03-19T14:51:03.2623846+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2025-03-19T16:00:26.4806928+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2025-03-19T16:00:26.5145649+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2025-03-19T16:00:26.5175056+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-03-19T16:00:26.5190635+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-03-19T16:00:26.5226078+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-03-19T16:00:26.5244292+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2025-03-19T16:06:08.9084977+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2025-03-19T16:06:08.9396392+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2025-03-19T16:06:08.9425267+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-03-19T16:06:08.9441317+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-03-19T16:06:08.9483561+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-03-19T16:06:08.9507651+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2025-03-19T16:10:09.2543287+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2025-03-19T16:10:09.3151621+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2025-03-19T16:10:09.3207349+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-03-19T16:10:09.3225594+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-03-19T16:10:09.3284754+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-03-19T16:10:09.3303947+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2025-03-19T16:12:00.639285+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2025-03-19T16:12:00.6965166+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2025-03-19T16:12:00.7019907+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-03-19T16:12:00.7040665+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-03-19T16:12:00.7059697+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-03-19T16:12:00.7129571+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2025-03-20T09:39:27.969108+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2025-03-20T09:39:28.020038+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2025-03-20T09:39:28.0249572+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-03-20T09:39:28.0268132+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-03-20T09:39:28.0344595+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-03-20T09:39:28.0372802+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2025-03-20T09:42:06.6041249+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2025-03-20T09:42:06.6562506+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2025-03-20T09:42:06.6595514+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-03-20T09:42:06.6612749+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-03-20T09:42:06.6656784+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-03-20T09:42:06.6678651+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}