Browse Source

发布周生产计划同步更新工单状态

Murphy 2 years ago
parent
commit
1dcf417e53

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

@@ -1867,8 +1867,9 @@ namespace Business.Replenishment
         {
             DateTime nextWeekMonday = getPreWeekStartTime().AddDays(14);
             DateTime next2WeekMonday = getPreWeekStartTime().AddDays(28);
-            var weekPlan = _replenishmentWeekPlan.GetListAsync(a => a.PlanStartDate >= nextWeekMonday && a.PlanStartDate < next2WeekMonday).Result.OrderBy(a=>a.Priority).ToList();
+            var weekPlan = _replenishmentWeekPlan.GetListAsync(a => a.PlanStartDate >= nextWeekMonday && a.PlanStartDate < next2WeekMonday && a.IsReplenishmentModel=="N").Result.OrderBy(a=>a.Priority).ToList();
             List<WorkOrdMaster> workMasters = _workOrdMaster.Select(a => weekPlan.Select(s=>s.ItemNumber).Contains(a.ItemNum) && weekPlan.Select(p=>p.ProductionOrder).Contains(a.WorkOrd) && a.Domain == input.factory_id.ToString());
+            List<mes_morder> mes_Morders = _mysql_mes_morder.GetListAsync(a => workMasters.Select(b => b.WorkOrd).ToList().Contains(a.morder_no) && a.factory_id == input.factory_id).Result;
             decimal priority = 1;
             for(int i=0;i<weekPlan.Count;i++)
             {
@@ -1882,9 +1883,14 @@ namespace Business.Replenishment
                         b.Status = "P";
                     }
                 });
+                mes_Morders.ForEach(c =>
+                {
+                    c.morder_state = MorderEnum.Initial_state;
+                });
                 priority++;
             }
             _workOrdMaster.Update(workMasters);
+            await _mysql_mes_morder.UpdateManyAsync(mes_Morders);
             await _replenishmentWeekPlan.UpdateManyAsync(weekPlan);
             return "OK";
         }

+ 4 - 0
MicroServices/Business/QuartzSettings/logs/logs.txt

@@ -813,3 +813,7 @@
 {"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2023-10-05T19:03:05.8676435+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
 {"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2023-10-05T19:03:05.8759565+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
 {"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2023-10-05T19:03:05.8781915+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2023-10-09T16:44:07.4723891+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2023-10-09T16:44:07.5270449+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2023-10-09T16:44:07.531439+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2023-10-09T16:44:07.5335201+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}