Преглед на файлове

物料需求计划工单号和资源检查id

Pengxy преди 1 година
родител
ревизия
60d1a7f248

+ 2 - 0
MicroServices/Business/Business.Application.Contracts/Dto/DemandscheduleDto.cs

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

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

@@ -6382,7 +6382,8 @@ namespace Business.ResourceExamineManagement
                 var workExamineResult = _businessBangDbContext.b_examine_result.Where(a => workordList.Contains(a.morder_no) && a.factory_id.ToString() == domain).GroupBy(i => i.morder_no).Select(g => new
                 {
                     workOrd = g.Key,
-                    examineId = g.Max(row => row.Id)
+                    examineId = g.Max(row => row.Id),
+                    bangid= g.Max(row => row.bangid)
                 }).ToList();
                 //需要测试工单没有做资源检查会不会报错
                 var examineIds = workExamineResult.Select(s => s.examineId).ToList();
@@ -6473,10 +6474,12 @@ namespace Business.ResourceExamineManagement
                                             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;
+                                            if (!itemQty.Find(s => s.ItemNum == a.item_number).bangid.Contains(examids.bangid.GetValueOrDefault().ToString()))
+                                                itemQty.Find(s => s.ItemNum == a.item_number).bangid += "," + examids.bangid.GetValueOrDefault().ToString();
                                         }
                                         else
                                         {
-                                            DemandscheduleDto demandscheduleDto = new DemandscheduleDto() { ItemNum = a.item_number, LackQty = a.lack_qty.GetValueOrDefault(), NeedQty = a.needCount.GetValueOrDefault(),WorkOrds= item.WorkOrd };
+                                            DemandscheduleDto demandscheduleDto = new DemandscheduleDto() { ItemNum = a.item_number, LackQty = a.lack_qty.GetValueOrDefault(), NeedQty = a.needCount.GetValueOrDefault(),WorkOrds= item.WorkOrd,bangid= examids.bangid.GetValueOrDefault().ToString() };
                                             itemQty.Add(demandscheduleDto);
                                         }
                                     });
@@ -6550,7 +6553,8 @@ namespace Business.ResourceExamineManagement
                                 itemds.tosechedqty = itemds.mesqty - (itemds.locqty + itemds.sechedqty);
                                 itemds.status = "";
                                 itemds.remarks = "";
-                                itemds.WorkOrds = d.WorkOrds;
+                                itemds.wolist = d.WorkOrds;
+                                itemds.bangid = d.bangid;
                                 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;

+ 8 - 2
MicroServices/Business/Business.Domain/StructuredDB/MES/IC/ic_demandschedule.cs

@@ -116,7 +116,13 @@ namespace Business.Domain
         /// <summary>
         /// 工单号
         /// </summary>
-        [Comment("备注")]
-        public string WorkOrds { get; set; }
+        [Comment("工单号")]
+        public string wolist { get; set; }
+
+        /// <summary>
+        /// 资源检查id
+        /// </summary>
+        [Comment("资源检查id")]
+        public string bangid { get; set; }
     }
 }

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

@@ -2183,3 +2183,9 @@
 {"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}
+{"TaskName":"定时同步WMS物料订单等基础数据到MySQL","GroupName":"systemquartzjob","BeginDate":"2025-02-26T14:07:40.8924546+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时创建NLog日志按月分表","GroupName":"systemquartzjob","BeginDate":"2025-02-26T14:07:40.9451266+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"定时同步MySQL基础数据到MongoDB","GroupName":"systemquartzjob","BeginDate":"2025-02-26T14:07:40.9509208+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"长周期物料PR","GroupName":"systemquartzjob","BeginDate":"2025-02-26T14:07:40.9529348+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"TestTimeOut","GroupName":"systemquartzjob","BeginDate":"2025-02-26T14:07:40.9598562+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"BOM预处理自动任务","GroupName":"BOM预处理自动任务","BeginDate":"2025-02-26T14:07:40.9620738+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}