Pengxy 9 hónapja
szülő
commit
59257c50a7

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

@@ -297,6 +297,16 @@ namespace Business.ResourceExamineManagement.Dto
         public int PurLT { get; set; }
 
         /// <summary>
+        /// 设计时间
+        /// </summary>
+        public decimal? DesignTime { get; set; }
+
+        /// <summary>
+        /// 标准生产时间
+        /// </summary>
+        public decimal? ProductionTime { get; set; }
+
+        /// <summary>
         /// 损耗率
         /// </summary>
         [Comment("损耗率")]

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

@@ -93,6 +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;
             //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();
@@ -132,6 +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.scrap = c.scrap.GetValueOrDefault();
                     cdto.wastage = c.wastage.GetValueOrDefault();
                     cdto.security_stock=icitem.secinv.GetValueOrDefault();
@@ -304,6 +308,8 @@ namespace Business.ResourceExamineManagement
                 dto.substitute_code = "";
                 dto.icitem_ids = "";
                 dto.PurLT = icitem.PurLT;
+                dto.DesignTime = icitem.DesignTime;
+                dto.ProductionTime = icitem.ProductionTime;
                 GetBomList(bomlist, bomchildlist, icitemlist, dto, returnlist, type, (int)dto.num_order);
             }
             else

+ 16 - 3
MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -847,9 +847,16 @@ namespace Business.ResourceExamineManagement
                     //库存初始化
                     _CalcBomViewAppService.BomStock(getBomList, stocklist, bangid);
                     _CalcBomViewAppService.newStockOccList = new List<mo_ic_item_stockoccupy>();
-                    //计算
-                    _CalcBomViewAppService.CalcView(getBomList, bangid, item.qty.GetValueOrDefault(), item.plan_date, sklist, item, icitemlist);
-
+                    //bom未生成,直接取标准时间
+                    if (getBomList.Count == 1)
+                    { 
+                    
+                    }
+                    else
+                    {
+                        //计算
+                        _CalcBomViewAppService.CalcView(getBomList, bangid, item.qty.GetValueOrDefault(), item.plan_date, sklist, item, icitemlist);
+                    }
                     //TODO:最晚开始时间
                     var curFacDtl = leadTimeList.FirstOrDefault(p => p.item_id == childBom.icitem_id);
                     //最晚开工时间=订单行客户要求交期-运输提前期-库存提前期-生产提前期-下单提前期-生产时间
@@ -4706,6 +4713,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;
 
                 bomChildExamineDtos.Add(bomChildExamineDto);
 
@@ -4745,6 +4754,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;
                                 bomChildExamineDtos.Add(bomChildExamineDto);
                             });
                         }
@@ -4773,6 +4784,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;
                             bomChildExamineDtos.Add(bomChildExamineDto);
                         });
                     }

+ 5 - 1
MicroServices/Business/Business.Application/SystemJobManagement/SystemJobAppService.cs

@@ -975,7 +975,9 @@ namespace Business.SystemJobManagement
                             self_inspection_date = custList[i].InsLT,
                             Warehousing_date = 1,
                             Shipping_date = 3,
-                            PurLT = custList[i].PurLT
+                            PurLT = custList[i].PurLT,
+                            DesignTime = custList[i].DesignTime,
+                            ProductionTime = custList[i].ProductionTime
                         });
                     }
                     else
@@ -989,6 +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.secinv = custList[i].SafetyStk;
                         ic_item.self_inspection_date = custList[i].InsLT;
                         ItemsUpd.Add(ic_item);

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

@@ -691,5 +691,19 @@ namespace Business.Domain
         [DefaultValue(0)]
         [Precision(23, 10)]
         public int PurLT { get; set; }
+
+        /// <summary>
+        /// 设计时间
+        /// </summary>
+        [Comment("设计时间")]
+        [DefaultValue(0)]
+        public decimal? DesignTime { get; set; }
+
+        /// <summary>
+        /// 标准生产时间
+        /// </summary>
+        [Comment("标准生产时间")]
+        [DefaultValue(0)]
+        public decimal? ProductionTime { get; set; }
     }
 }

+ 10 - 0
MicroServices/Business/Business.Domain/StructuredDB/Bang/b_bom_pretreatment.cs

@@ -190,6 +190,16 @@ namespace Business.Domain
         public int PurLT { get; set; }
 
         /// <summary>
+        /// 设计时间
+        /// </summary>
+        public decimal? DesignTime { get; set; }
+
+        /// <summary>
+        /// 标准生产时间
+        /// </summary>
+        public decimal? ProductionTime { get; set; }
+
+        /// <summary>
         /// 损耗率
         /// </summary>
         [Comment("损耗率")]

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

@@ -106,6 +106,16 @@ namespace Business.Domain
         public int PurLT { get; set; }
 
         /// <summary>
+        /// 设计时间
+        /// </summary>
+        public decimal? DesignTime { get; set; }
+
+        /// <summary>
+        /// 标准生产时间
+        /// </summary>
+        public decimal? ProductionTime { get; set; }
+
+        /// <summary>
         /// 存货周转率
         /// </summary>
         [Comment("存货周转率")]

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

@@ -698,5 +698,19 @@ namespace Business.Domain
         [DefaultValue(0)]
         [Precision(23, 10)]
         public int PurLT { get; set; }
+
+        /// <summary>
+        /// 设计时间
+        /// </summary>
+        [Comment("设计时间")]
+        [DefaultValue(0)]
+        public decimal? DesignTime { get; set; }
+
+        /// <summary>
+        /// 标准生产时间
+        /// </summary>
+        [Comment("标准生产时间")]
+        [DefaultValue(0)]
+        public decimal? ProductionTime { get; set; }
     }
 }

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

@@ -4102,3 +4102,9 @@
 {"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-06-27T10:07:29.7266696+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
 {"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-06-27T10:07:29.7322011+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
 {"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-06-27T10:07:29.7339479+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2025-06-27T10:47:37.4384091+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2025-06-27T10:47:37.4767944+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2025-06-27T10:47:37.4794979+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-06-27T10:47:37.4811391+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-06-27T10:47:37.4860877+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-06-27T10:47:37.4887598+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}