物料需求计划，采购占用表

MicroServices/Business/Business.Application.Contracts/Dto/DemandscheduleDto.cs

@@ -14,6 +14,8 @@ namespace Business.Dto
     {
         public string ItemNum { get; set; }
 
+        public string WorkOrds { get; set; }
+
         public decimal NeedQty { get; set; }
 
         public decimal LackQty { get; set; }

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

@@ -5541,7 +5541,7 @@ namespace Business.Replenishment
                         plist.ForEach(o =>
                         {
                             o.bom_child_examine_id = bc_ex.Id; o.company_id = param.company_id; o.tenant_id = param.company_id;
-                            o.factory_id = param.factoryId;
+                            o.factory_id = param.factoryId; o.create_time = DateTime.Now;
                         });
                         purchaseList.AddRange(plist);
                     }
@@ -5551,7 +5551,7 @@ namespace Business.Replenishment
                         purlist.ForEach(o =>
                         {
                             o.bom_child_examine_id = bc_ex.Id; o.company_id = param.company_id; o.tenant_id = param.company_id;
-                            o.factory_id = param.factoryId;
+                            o.factory_id = param.factoryId;o.create_time = DateTime.Now;
                         });
                         purchaseoccupyList.AddRange(purlist);
                     }

MicroServices/Business/Business.Application/ResourceExamineManagement/CalcBomViewAppService.cs

@@ -2132,8 +2132,9 @@ namespace Business.ResourceExamineManagement
                         s.morder_mo = mes_morder.morder_no;
                     }
                 });
-                /*item.purchase_occupy_list = new List<purchase_occupy>();
-                occupylist.ForEach(s => {
+                item.purchase_occupy_list = new List<purchase_occupy>();
+                occupylist.ForEach(s =>
+                {
                     if (mes_morder != null)
                     {
                         s.morder_id = mes_morder.Id;
@@ -2151,7 +2152,7 @@ namespace Business.ResourceExamineManagement
                         ocp.po_billno = polist.po_billno;
                     }
                     item.purchase_occupy_list.Add(ocp);
-                });*/
+                });
                 srm_Po_Occupies.AddRange(occupylist);
                 srm_Po_OccupiesInsert.AddRange(occupylist);
             }

MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -6471,10 +6471,12 @@ namespace Business.ResourceExamineManagement
                                         {
                                             itemQty.Find(s => s.ItemNum == a.item_number).LackQty += a.lack_qty.GetValueOrDefault();
                                             itemQty.Find(s => s.ItemNum == a.item_number).NeedQty += a.needCount.GetValueOrDefault();
+                                            if (!itemQty.Find(s => s.ItemNum == a.item_number).WorkOrds.Contains(item.WorkOrd))
+                                                itemQty.Find(s => s.ItemNum == a.item_number).WorkOrds += "," + item.WorkOrd;
                                         }
                                         else
                                         {
-                                            DemandscheduleDto demandscheduleDto = new DemandscheduleDto() { ItemNum = a.item_number, LackQty = a.lack_qty.GetValueOrDefault(), NeedQty = a.needCount.GetValueOrDefault() };
+                                            DemandscheduleDto demandscheduleDto = new DemandscheduleDto() { ItemNum = a.item_number, LackQty = a.lack_qty.GetValueOrDefault(), NeedQty = a.needCount.GetValueOrDefault(),WorkOrds= item.WorkOrd };
                                             itemQty.Add(demandscheduleDto);
                                         }
                                     });
@@ -6548,6 +6550,7 @@ namespace Business.ResourceExamineManagement
                                 itemds.tosechedqty = itemds.mesqty - (itemds.locqty + itemds.sechedqty);
                                 itemds.status = "";
                                 itemds.remarks = "";
+                                itemds.WorkOrds = d.WorkOrds;
                                 itemds.tenant_id = examines.Count > 0 ? examines[0].tenant_id : 1000;
                                 itemds.company_id = examines.Count > 0 ? examines[0].company_id : 1000;
                                 itemds.factory_id = examines.Count > 0 ? examines[0].factory_id : 8010;

MicroServices/Business/Business.Domain/StructuredDB/MES/IC/ic_demandschedule.cs

@@ -112,5 +112,11 @@ namespace Business.Domain
         [Comment("改为历史版本的时间")]
 
         public DateTime? historyversionTime { get; set; }
+
+        /// <summary>
+        /// 工单号
+        /// </summary>
+        [Comment("备注")]
+        public string WorkOrds { get; set; }
     }
 }

MicroServices/Business/QuartzSettings/logs/logs.txt

@@ -2164,3 +2164,22 @@
 {"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-02-25T15:31:01.6998595+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
 {"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-02-25T15:31:01.7018354+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
 {"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-02-25T15:31:01.7097044+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2025-02-25T17:02:20.4393777+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2025-02-25T17:02:20.476901+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2025-02-25T17:02:20.480197+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-02-25T17:02:20.4820233+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-02-25T17:02:20.486498+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-02-25T17:02:20.488009+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2025-02-25T17:04:14.0049417+08:00","EndDate":"2025-02-25T17:04:52.4946111+08:00","Msg":"任务执行成功","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2025-02-25T17:07:14.3375749+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2025-02-25T17:07:14.391091+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2025-02-25T17:07:14.3953002+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-02-25T17:07:14.3972808+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-02-25T17:07:14.4046316+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-02-25T17:07:14.406614+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2025-02-25T17:41:11.3541686+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2025-02-25T17:41:11.4103125+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2025-02-25T17:41:11.4153902+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-02-25T17:41:11.4173063+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-02-25T17:41:11.4191555+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-02-25T17:41:11.4267194+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}