补货模型测试问题修改

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

@@ -1039,22 +1039,10 @@ namespace Business.Replenishment
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        public async Task<string> PlanOrderResourceCheck(string companyid)
+        public async Task<string> PlanOrderResourceCheck(List<mes_morder> Mes_Morders,InputDto input)
         {
-            /*List<string> workOrds = workOrd.Split(",").ToList();
-            if (workOrds.Count == 0)
-            {
-                return "";
-            }*/
-            if (string.IsNullOrEmpty(companyid))
-            {
-                return "当前任务公司编码为空，请检查。";
-            }
-
-            List<mes_morder> Mes_Morders = _mysql_mes_morder.GetListAsync(x => x.morder_type == "计划工单" && x.morder_state == "初始" && x.company_id == long.Parse(companyid)).Result;
-
             //先排除锁定期内的工单 //优先级排序
-            var sysSet = _generalizedCodeMaster.Select(s => s.FldName == "SystemConfig" && s.Val == "WorkOrderLockPeriod" && s.Domain == companyid).ToList();
+            var sysSet = _generalizedCodeMaster.Select(s => s.FldName == "SystemConfig" && s.Val == "WorkOrderLockPeriod" && s.Domain == input.company_id.ToString()).ToList();
             decimal lookDay = 0;
             if (sysSet.Any())
             {
@@ -2053,10 +2041,10 @@ namespace Business.Replenishment
                 mes_Morder.fmodel = ic_item.model;
                 mes_Morder.urgent = 1;
                 mes_Morder.moentry_startup_status = 0;
-                mes_Morder.tenant_id = param.company_id.GetValueOrDefault();
-                mes_Morder.factory_id = param.factoryId;
-                mes_Morder.company_id = param.company_id;
-                mes_Morder.org_id = param.org_id;
+                mes_Morder.tenant_id = input.tenant_id;
+                mes_Morder.factory_id = input.factory_id;
+                mes_Morder.company_id = input.company_id;
+                mes_Morder.org_id = input.org_id;
                 mes_Morder.product_code = ic_item.number;
                 mes_Morder.product_name = ic_item.name;
                 mes_Morder.morder_date = DateTime.Now.Date.AddDays(1);
@@ -2083,10 +2071,10 @@ namespace Business.Replenishment
                 mes_Moentry.morder_production_number = productList[i].Qty;
                 mes_Moentry.need_number = productList[i].Qty;
                 mes_Moentry.remaining_number = 0;
-                mes_Moentry.tenant_id = param.company_id.GetValueOrDefault();
-                mes_Moentry.factory_id = param.factoryId;
-                mes_Moentry.company_id = param.company_id;
-                mes_Moentry.org_id = param.org_id;
+                mes_Moentry.tenant_id = input.tenant_id;
+                mes_Moentry.factory_id = input.factory_id;
+                mes_Moentry.company_id = input.company_id;
+                mes_Moentry.org_id = input.org_id;
                 mes_Moentry.create_time = DateTime.Now;
 
                 moList.Add(mes_Morder);
@@ -2094,7 +2082,7 @@ namespace Business.Replenishment
             }
             await _mysql_mes_morder.InsertManyAsync(moList);
             await _mysql_mes_moentry.InsertManyAsync(moentryList);
-            await PlanOrderResourceCheck(input.factory_id.ToString());
+            await PlanOrderResourceCheck(moList,input);
             return "OK";
         }
 

MicroServices/Business/Business.Application/ResourceExamineManagement/MorderAppService.cs

@@ -219,6 +219,7 @@ namespace Business.ResourceExamineManagement
             mes_Moentry.morder_production_number = generateMorderDto.Quantity;
             mes_Moentry.need_number = generateMorderDto.Quantity;
             mes_Moentry.remaining_number = 0;
+            mes_Moentry.tenant_id = param.company_id.GetValueOrDefault();
             mes_Moentry.factory_id = param.factoryId;
             mes_Moentry.company_id = param.company_id;
             mes_Moentry.org_id = param.org_id;

MicroServices/Business/QuartzSettings/logs/logs.txt

@@ -222,3 +222,23 @@
 {"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2023-09-06T02:13:33.2863683+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
 {"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2023-09-06T02:13:33.2927126+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
 {"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2023-09-06T02:13:33.2952447+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2023-09-06T11:03:30.0253301+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2023-09-06T11:03:30.09754+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2023-09-06T11:03:30.100466+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2023-09-06T11:03:30.1026567+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2023-09-06T11:09:36.5214357+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2023-09-06T11:09:36.5835781+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2023-09-06T11:09:36.5890129+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2023-09-06T11:09:36.5912879+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2023-09-06T11:22:13.9437306+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2023-09-06T11:22:14.0062971+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2023-09-06T11:22:14.0120995+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2023-09-06T11:22:14.0145263+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2023-09-06T14:14:04.9811905+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2023-09-06T14:14:05.0411112+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2023-09-06T14:14:05.0468789+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2023-09-06T14:14:05.0493864+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2023-09-06T14:19:23.9815076+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2023-09-06T14:19:24.0360216+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2023-09-06T14:19:24.0399294+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2023-09-06T14:19:24.0421363+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}