Murphy 2 жил өмнө
parent
commit
60e1dc7287

+ 2 - 3
MicroServices/Business/Business.Application/ReplenishmentManagement/ReplenishmentAppService.cs

@@ -543,8 +543,8 @@ namespace Business.Replenishment
                 {
                     await _replenishmentAnnualProduction.HardDeleteAsync(a => a.Year == input.year && a.factory_id == input.factory_id);
                     await _replenishmentAnnualProduction.InsertManyAsync(annualProductionOutlines);
-                    //await CalcLongPeriodItemPR(input);
-                    //await CalcROP(input);
+                    await CalcLongPeriodItemPR(input);
+                    await CalcROP(input);
                     await SaveProductionMasterPlan(input, annualProductionOutlines);
                     await unitOfWork.CompleteAsync();
                 }
@@ -1820,7 +1820,6 @@ namespace Business.Replenishment
                 workOrd.IsActive = true;
                 workOrd.IsConfirm = true;
                 workOrd.CreateTime = DateTime.Now;
-                workOrd.Batch = item.morder_no;
                 workOrd.Typed = "";
                 workOrds.Add(workOrd);
 

+ 0 - 1
MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -4006,7 +4006,6 @@ namespace Business.ResourceExamineManagement
                 workOrd.IsActive = true;
                 workOrd.IsConfirm = true;
                 workOrd.CreateTime = DateTime.Now;
-                workOrd.Batch = item.morder_no;
                 workOrd.Typed = "";
                 workOrds.Add(workOrd);
 

+ 0 - 6
MicroServices/Business/Business.Domain/StructuredDB/Production/WorkOrdMaster.cs

@@ -111,12 +111,6 @@ namespace Business.Domain
         [Comment("创建时间")]
         public DateTime? CreateTime { get; set; }
 
-        /// <summary>
-        /// ERP工单号
-        /// </summary>
-        [Comment("ERP工单号")]
-        public string Batch { get; set; }
-
         /// <summary>
         /// 类型:正常工单-空或者Null;反之则为特殊工单
         /// </summary>

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

@@ -789,3 +789,11 @@
 {"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2023-09-23T21:37:11.2959884+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
 {"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2023-09-23T21:37:11.2989433+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
 {"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2023-09-23T21:37:11.3007093+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2023-09-23T23:04:23.9798289+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2023-09-23T23:04:24.0554123+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2023-09-23T23:04:24.05854+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2023-09-23T23:04:24.0688994+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2023-09-23T23:10:40.6145795+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2023-09-23T23:10:40.689808+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2023-09-23T23:10:40.6950497+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2023-09-23T23:10:40.7061992+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}