Pengxy 9 달 전
부모
커밋
92781498e1

+ 4 - 4
MicroServices/Business/Business.Application.Contracts/ResourceExamineManagement/Dto/BomChildExamineDto.cs

@@ -297,14 +297,14 @@ namespace Business.ResourceExamineManagement.Dto
         public int PurLT { get; set; }
 
         /// <summary>
-        /// 设计时间
+        /// bom设计时间
         /// </summary>
-        public decimal? DesignTime { get; set; }
+        public decimal? BOMDesignTime { get; set; }
 
         /// <summary>
-        /// 标准生产时间
+        /// 工艺设计时间
         /// </summary>
-        public decimal? ProductionTime { get; set; }
+        public decimal? RoutingDesignTime { get; set; }
 
         /// <summary>
         /// 损耗率

+ 6 - 6
MicroServices/Business/Business.Application/ResourceExamineManagement/PretreatmentAppService.cs

@@ -93,8 +93,8 @@ namespace Business.ResourceExamineManagement
             dto.erp_cls_name = item.erp_cls_name;
             dto.type = type;
             dto.PurLT = item.PurLT;
-            dto.DesignTime = item.DesignTime;
-            dto.ProductionTime = item.ProductionTime;
+            dto.BOMDesignTime = item.BOMDesignTime;
+            dto.RoutingDesignTime = item.RoutingDesignTime;
             //var bdto = ObjectMapper.Map<ic_bom,BomChildExamineDto>(bom);
             returnlist.Add(dto);
             var childlist = bomchildlist.Where(a => a.bom_id == bom.mysql_id).OrderBy(s=>s.child_num).ToList();
@@ -134,8 +134,8 @@ namespace Business.ResourceExamineManagement
                     cdto.Op = c.Op;
                     cdto.clean_leadtime = icitem.clean_leadtime;
                     cdto.PurLT = icitem.PurLT;
-                    cdto.DesignTime = icitem.DesignTime;
-                    cdto.ProductionTime = icitem.ProductionTime;
+                    cdto.BOMDesignTime = icitem.BOMDesignTime;
+                    cdto.RoutingDesignTime = icitem.RoutingDesignTime;
                     cdto.scrap = c.scrap.GetValueOrDefault();
                     cdto.wastage = c.wastage.GetValueOrDefault();
                     cdto.security_stock=icitem.secinv.GetValueOrDefault();
@@ -308,8 +308,8 @@ namespace Business.ResourceExamineManagement
                 dto.substitute_code = "";
                 dto.icitem_ids = "";
                 dto.PurLT = icitem.PurLT;
-                dto.DesignTime = icitem.DesignTime;
-                dto.ProductionTime = icitem.ProductionTime;
+                dto.BOMDesignTime = icitem.BOMDesignTime;
+                dto.RoutingDesignTime = icitem.RoutingDesignTime;
                 GetBomList(bomlist, bomchildlist, icitemlist, dto, returnlist, type, (int)dto.num_order);
             }
             else

+ 3 - 3
MicroServices/Business/Business.Application/ResourceExamineManagement/ProductExamineAppService.cs

@@ -197,7 +197,7 @@ namespace Business.ResourceExamineManagement
                     if (icitem != null)
                     {
                         //加上自检、入库、发运提前期
-                        dto.kitting_time = dto.kitting_time.AddDays((double)(icitem.self_inspection_date.GetValueOrDefault() + icitem.Warehousing_date.GetValueOrDefault() + icitem.Shipping_date.GetValueOrDefault()+icitem.ProductionTime.GetValueOrDefault()));
+                        dto.kitting_time = dto.kitting_time.AddDays((double)(icitem.self_inspection_date.GetValueOrDefault() + icitem.Warehousing_date.GetValueOrDefault() + icitem.Shipping_date.GetValueOrDefault()+icitem.RoutingDesignTime.GetValueOrDefault()));
                         dto.kitting_time= dto.kitting_time<=item.plan_date.GetValueOrDefault()? item.plan_date.GetValueOrDefault(): dto.kitting_time;
                     }
                     item.sys_material_date = dto.kitting_time;
@@ -217,7 +217,7 @@ namespace Business.ResourceExamineManagement
                 if (icitem != null)
                 {
                     //加上自检、入库、发运提前期
-                    item.sys_material_date = time.AddDays((double)(icitem.self_inspection_date.GetValueOrDefault() + icitem.Warehousing_date.GetValueOrDefault() + icitem.Shipping_date.GetValueOrDefault() + icitem.ProductionTime.GetValueOrDefault()));
+                    item.sys_material_date = time.AddDays((double)(icitem.self_inspection_date.GetValueOrDefault() + icitem.Warehousing_date.GetValueOrDefault() + icitem.Shipping_date.GetValueOrDefault() + icitem.RoutingDesignTime.GetValueOrDefault()));
                 }
                 //param.PlanStart = dto.kitting_time.Date.AddDays(3);
 
@@ -254,7 +254,7 @@ namespace Business.ResourceExamineManagement
                 if (icitem != null)
                 {
                     //加上自检、入库、发运提前期
-                    item.sys_capacity_date = item.sys_capacity_date.GetValueOrDefault().AddDays((double)(icitem.self_inspection_date.GetValueOrDefault() + icitem.Warehousing_date.GetValueOrDefault() + icitem.Shipping_date.GetValueOrDefault() + icitem.ProductionTime.GetValueOrDefault()));
+                    item.sys_capacity_date = item.sys_capacity_date.GetValueOrDefault().AddDays((double)(icitem.self_inspection_date.GetValueOrDefault() + icitem.Warehousing_date.GetValueOrDefault() + icitem.Shipping_date.GetValueOrDefault() + icitem.RoutingDesignTime.GetValueOrDefault()));
                 }
                 item.sys_capacity_date = item.sys_capacity_date <= item.plan_date ? item.plan_date : item.sys_capacity_date;
             }

+ 10 - 10
MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -794,8 +794,8 @@ namespace Business.ResourceExamineManagement
                         bomChildExamineDto.type = 0;
                         bomChildExamineDto.PurLT = curicitem == null ? 0 : curicitem.PurLT;
                         bomChildExamineDto.clean_leadtime = curicitem == null ? 0 : curicitem.clean_leadtime;
-                        bomChildExamineDto.DesignTime = curicitem == null ? 0 : curicitem.DesignTime;
-                        bomChildExamineDto.ProductionTime = curicitem == null ? 0 : curicitem.ProductionTime;
+                        bomChildExamineDto.BOMDesignTime = curicitem == null ? 0 : curicitem.BOMDesignTime;
+                        bomChildExamineDto.RoutingDesignTime = curicitem == null ? 0 : curicitem.RoutingDesignTime;
                         pretreatments.Add(bomChildExamineDto);
                     }
                 });
@@ -911,12 +911,12 @@ namespace Business.ResourceExamineManagement
                             bang_id = bangid,
                             morder_no = GenerateMoList[0]
                         };
-                        _CalcBomViewAppService.CreateMainOrder(generateMorderDto, getBomList[0], new List<BomChildExamineDto>(), new List<BomChildExamineDto>(), bangid, item.plan_date.GetValueOrDefault(), sklist, item, icitemlist, Convert.ToInt32(getBomList[0].ProductionTime.GetValueOrDefault() == 0 ? 1 : getBomList[0].ProductionTime.GetValueOrDefault()));
+                        _CalcBomViewAppService.CreateMainOrder(generateMorderDto, getBomList[0], new List<BomChildExamineDto>(), new List<BomChildExamineDto>(), bangid, item.plan_date.GetValueOrDefault(), sklist, item, icitemlist, Convert.ToInt32(getBomList[0].RoutingDesignTime.GetValueOrDefault() == 0 ? 1 : getBomList[0].RoutingDesignTime.GetValueOrDefault()));
 
                         //最晚开工时间=订单行客户要求交期-运输提前期-库存提前期-生产提前期-下单提前期-生产时间
                         dtl.latest_times = item.plan_date.GetValueOrDefault().AddDays(-Convert.ToDouble(curFacDtl?.transportation_leadtime.GetValueOrDefault() + curFacDtl?.stock_leadtime.GetValueOrDefault() + curFacDtl?.production_leadtime.GetValueOrDefault() + curFacDtl?.order_leadtime.GetValueOrDefault() + _CalcBomViewAppService.ProductionTimeDay));
                         //物料齐套时间
-                        dtl.kitting_times = dtl.latest_times.AddDays(Convert.ToDouble(getBomList[0].DesignTime.GetValueOrDefault() + getBomList[0].PurLT));
+                        dtl.kitting_times = dtl.latest_times.AddDays(Convert.ToDouble(getBomList[0].BOMDesignTime.GetValueOrDefault() + getBomList[0].PurLT));
                         //TODO:最早开始时间默认3天后(后期调整,因为要计算排产,计算产能这一类,才能得到开工时间)
                         dtl.earliest_times = dtl.kitting_times.AddDays(1);
                     }
@@ -4811,8 +4811,8 @@ namespace Business.ResourceExamineManagement
                 bomChildExamineDto.type = 0;
                 bomChildExamineDto.PurLT = curicitem == null ? 0 : curicitem.PurLT;
                 bomChildExamineDto.clean_leadtime = curicitem == null ? 0 : curicitem.clean_leadtime;
-                bomChildExamineDto.DesignTime = curicitem == null ? 0 : curicitem.DesignTime;
-                bomChildExamineDto.ProductionTime = curicitem == null ? 0 : curicitem.ProductionTime;
+                bomChildExamineDto.BOMDesignTime = curicitem == null ? 0 : curicitem.BOMDesignTime;
+                bomChildExamineDto.RoutingDesignTime = curicitem == null ? 0 : curicitem.RoutingDesignTime;
 
                 bomChildExamineDtos.Add(bomChildExamineDto);
 
@@ -4852,8 +4852,8 @@ namespace Business.ResourceExamineManagement
                                 bomChildExamineDto.type = 0;
                                 bomChildExamineDto.PurLT = curicitem == null ? 0 : curicitem.PurLT;
                                 bomChildExamineDto.clean_leadtime = curicitem == null ? 0 : curicitem.clean_leadtime;
-                                bomChildExamineDto.DesignTime = curicitem == null ? 0 : curicitem.DesignTime;
-                                bomChildExamineDto.ProductionTime = curicitem == null ? 0 : curicitem.ProductionTime;
+                                bomChildExamineDto.BOMDesignTime = curicitem == null ? 0 : curicitem.BOMDesignTime;
+                                bomChildExamineDto.RoutingDesignTime = curicitem == null ? 0 : curicitem.RoutingDesignTime;
                                 bomChildExamineDtos.Add(bomChildExamineDto);
                             });
                         }
@@ -4882,8 +4882,8 @@ namespace Business.ResourceExamineManagement
                             bomChildExamineDto.type = 0;
                             bomChildExamineDto.PurLT = curicitem == null ? 0 : curicitem.PurLT;
                             bomChildExamineDto.clean_leadtime = curicitem == null ? 0 : curicitem.clean_leadtime;
-                            bomChildExamineDto.DesignTime = curicitem == null ? 0 : curicitem.DesignTime;
-                            bomChildExamineDto.ProductionTime = curicitem == null ? 0 : curicitem.ProductionTime;
+                            bomChildExamineDto.BOMDesignTime = curicitem == null ? 0 : curicitem.BOMDesignTime;
+                            bomChildExamineDto.RoutingDesignTime = curicitem == null ? 0 : curicitem.RoutingDesignTime;
                             bomChildExamineDtos.Add(bomChildExamineDto);
                         });
                     }

+ 4 - 4
MicroServices/Business/Business.Application/SystemJobManagement/SystemJobAppService.cs

@@ -976,8 +976,8 @@ namespace Business.SystemJobManagement
                             Warehousing_date = 1,
                             Shipping_date = 3,
                             PurLT = custList[i].PurLT,
-                            DesignTime = custList[i].DesignTime,
-                            ProductionTime = custList[i].ProductionTime
+                            BOMDesignTime = custList[i].BOMDesignTime,
+                            RoutingDesignTime = custList[i].RoutingDesignTime
                         });
                     }
                     else
@@ -991,8 +991,8 @@ namespace Business.SystemJobManagement
                         ic_item.is_clean = custList[i].IssuePolicy ? 1 : 0;
                         ic_item.clean_leadtime = custList[i].MFGMTTR;
                         ic_item.PurLT = custList[i].PurLT;
-                        ic_item.DesignTime = custList[i].DesignTime;
-                        ic_item.ProductionTime = custList[i].ProductionTime;
+                        ic_item.BOMDesignTime = custList[i].BOMDesignTime;
+                        ic_item.RoutingDesignTime = custList[i].RoutingDesignTime;
                         ic_item.secinv = custList[i].SafetyStk;
                         ic_item.self_inspection_date = custList[i].InsLT;
                         ItemsUpd.Add(ic_item);

+ 6 - 6
MicroServices/Business/Business.Domain/MongoDB/MES/IC/mo_ic_item.cs

@@ -693,17 +693,17 @@ namespace Business.Domain
         public int PurLT { get; set; }
 
         /// <summary>
-        /// 设计时间
+        /// bom设计时间
         /// </summary>
-        [Comment("设计时间")]
+        [Comment("bom设计时间")]
         [DefaultValue(0)]
-        public decimal? DesignTime { get; set; }
+        public decimal? BOMDesignTime { get; set; }
 
         /// <summary>
-        /// 标准生产时间
+        /// 工艺设计时间
         /// </summary>
-        [Comment("标准生产时间")]
+        [Comment("工艺设计时间")]
         [DefaultValue(0)]
-        public decimal? ProductionTime { get; set; }
+        public decimal? RoutingDesignTime { get; set; }
     }
 }

+ 4 - 4
MicroServices/Business/Business.Domain/StructuredDB/Bang/b_bom_pretreatment.cs

@@ -190,14 +190,14 @@ namespace Business.Domain
         public int PurLT { get; set; }
 
         /// <summary>
-        /// 设计时间
+        /// bom设计时间
         /// </summary>
-        public decimal? DesignTime { get; set; }
+        public decimal? BOMDesignTime { get; set; }
 
         /// <summary>
-        /// 标准生产时间
+        /// 工艺设计时间
         /// </summary>
-        public decimal? ProductionTime { get; set; }
+        public decimal? RoutingDesignTime { get; set; }
 
         /// <summary>
         /// 损耗率

+ 4 - 4
MicroServices/Business/Business.Domain/StructuredDB/MES/IC/ItemMaster.cs

@@ -106,14 +106,14 @@ namespace Business.Domain
         public int PurLT { get; set; }
 
         /// <summary>
-        /// 设计时间
+        /// bom设计时间
         /// </summary>
-        public decimal? DesignTime { get; set; }
+        public decimal? BOMDesignTime { get; set; }
 
         /// <summary>
-        /// 标准生产时间
+        /// 工艺设计时间
         /// </summary>
-        public decimal? ProductionTime { get; set; }
+        public decimal? RoutingDesignTime { get; set; }
 
         /// <summary>
         /// 存货周转率

+ 6 - 6
MicroServices/Business/Business.Domain/StructuredDB/MES/IC/ic_item.cs

@@ -700,17 +700,17 @@ namespace Business.Domain
         public int PurLT { get; set; }
 
         /// <summary>
-        /// 设计时间
+        /// bom设计时间
         /// </summary>
-        [Comment("设计时间")]
+        [Comment("bom设计时间")]
         [DefaultValue(0)]
-        public decimal? DesignTime { get; set; }
+        public decimal? BOMDesignTime { get; set; }
 
         /// <summary>
-        /// 标准生产时间
+        /// 工艺设计时间
         /// </summary>
-        [Comment("标准生产时间")]
+        [Comment("工艺设计时间")]
         [DefaultValue(0)]
-        public decimal? ProductionTime { get; set; }
+        public decimal? RoutingDesignTime { get; set; }
     }
 }

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

@@ -4300,3 +4300,15 @@
 {"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-07-09T15:18:50.1100341+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
 {"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-07-09T15:18:50.1150856+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
 {"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-07-09T15:18:50.117247+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2025-07-09T16:26:51.6312802+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2025-07-09T16:26:51.6706217+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2025-07-09T16:26:51.6742431+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-07-09T16:26:51.6758785+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-07-09T16:26:51.6817128+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-07-09T16:26:51.6840415+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2025-07-09T16:37:57.0404957+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2025-07-09T16:37:57.0744396+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2025-07-09T16:37:57.0774397+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-07-09T16:37:57.0800743+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-07-09T16:37:57.0846448+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-07-09T16:37:57.0870444+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}