Pengxy hai 9 meses
pai
achega
4c794b6efe

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

@@ -4697,9 +4697,9 @@ namespace Business.Replenishment
                 {
                     //更新数据到工单表中
                     var sql = $"update WorkOrdMaster set {prioritylist[i].Value}=b.{prioritylist[i].SourceColumn} from WorkOrdMaster a,{prioritylist[i].SourceTable} b where a.{prioritylist[i].ValueID}=b.{prioritylist[i].SourceID}";
-                    if (prioritylist[i].SourceColumn == "Class")
+                    if (prioritylist[i].SourceType != prioritylist[i].ValueType)
                     {
-                        sql = $"update WorkOrdMaster set {prioritylist[i].Value}=cast(iif(b.{prioritylist[i].SourceColumn}='','0',b.{prioritylist[i].SourceColumn}) as DECIMAL(18,8)) from WorkOrdMaster a,{prioritylist[i].SourceTable} b where a.{prioritylist[i].ValueID}=b.{prioritylist[i].SourceID}";
+                        sql = $"update WorkOrdMaster set {prioritylist[i].Value}=cast(iif(b.{prioritylist[i].SourceColumn}='','0',b.{prioritylist[i].SourceColumn}) as {prioritylist[i].ValueType}) from WorkOrdMaster a,{prioritylist[i].SourceTable} b where a.{prioritylist[i].ValueID}=b.{prioritylist[i].SourceID}";
                     }
                     _businessDbContext.Database.ExecuteSqlRaw(sql);
                 }

+ 12 - 0
MicroServices/Business/Business.Domain/StructuredDB/Production/PriorityCode.cs

@@ -70,6 +70,18 @@ namespace Business.Domain
         public string ValueID { get; set; }
 
         /// <summary>
+        /// 来源表字段类型
+        /// </summary>
+        [Comment("来源表关联字段")]
+        public string SourceType { get; set; }
+
+        /// <summary>
+        /// 工单表字段类型
+        /// </summary>
+        [Comment("工单表关联字段")]
+        public string ValueType { get; set; }
+
+        /// <summary>
         /// 是否有效:1-有效;0-无效
         /// </summary>
         [Comment("是否有效")]

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

@@ -4090,3 +4090,9 @@
 {"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-06-26T16:22:01.7754136+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
 {"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-06-26T16:22:01.7791384+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
 {"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-06-26T16:22:01.7809323+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2025-06-27T10:03:41.3548784+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2025-06-27T10:03:41.3870797+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2025-06-27T10:03:41.3897362+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-06-27T10:03:41.3913261+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-06-27T10:03:41.3963016+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-06-27T10:03:41.3982897+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}