Просмотр исходного кода

工单相关列表赋值主键。

tangdi 2 лет назад
Родитель
Сommit
ffa70a9a7d

+ 11 - 2
MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -1593,12 +1593,21 @@ namespace Business.ResourceExamineManagement
                         {
                             _workOrdMaster.Insert(workOrds);
                         }
+                        var DBworkOrdList = _workOrdMaster.Select(a => a.Domain == workOrds[0].Domain && workOrds.Select(c => c.WorkOrd).Contains(a.WorkOrd));
                         if (workOrdRoutings.Any())
                         {
+                            workOrdRoutings.ForEach(c =>
+                            {
+                                c.WorkOrdMasterRecID = DBworkOrdList.Where(a => a.WorkOrd == c.WorkOrd).First().RecID;
+                            });
                             _workOrdRouting.Insert(workOrdRoutings);
                         }
                         if (workOrdDetails.Any())
                         {
+                            workOrdDetails.ForEach(c =>
+                            {
+                                c.WorkOrdMasterRecID = DBworkOrdList.Where(a => a.WorkOrd == c.WorkOrd).First().RecID;
+                            });
                             _workOrdDetail.Insert(workOrdDetails);
                         }
                         if (WriteMoentry.Any())
@@ -3104,7 +3113,7 @@ namespace Business.ResourceExamineManagement
                     /*var exa = rtn.examines.Find(s => s.morder_no == wod.WorkOrd);
                     exa.latest_times = morder.moentry_sys_etime.GetValueOrDefault().Date.AddDays(1);*/
                     //根据排产后得日期,反推PR。
-                    var wkordPrList = prmainlist.Where(s => s.pr_mono == wod.WorkOrd).ToList();
+                    /*var wkordPrList = prmainlist.Where(s => s.pr_mono == wod.WorkOrd).ToList();
 
                     //反算所有的PR,根据时间减去提前期   //按最大预处理时间倒排
                     var moIcitems = icitemlist.Where(s => s.is_clean == 1 && wkordPrList.Select(c => c.icitem_id).Contains(s.mysql_id)).ToList();
@@ -3125,7 +3134,7 @@ namespace Business.ResourceExamineManagement
                         {
                             pr.pr_ssend_date = DateTime.Now.Date.AddDays(1);
                         }
-                    });
+                    });*/
                 }
                 using (var unitOfWork = _unitOfWorkManager.Begin(false, true))
                 {

+ 6 - 0
MicroServices/Business/Business.Domain/StructuredDB/Production/WorkOrdDetail.cs

@@ -92,5 +92,11 @@ namespace Business.Domain
         /// </summary>
         [Comment("批次序列")]
         public string LotSerial { get; set; }
+
+        /// <summary>
+        /// 工单主键
+        /// </summary>
+        [Comment("工单主键")]
+        public int WorkOrdMasterRecID { get; set; }
     }
 }

+ 6 - 0
MicroServices/Business/Business.Domain/StructuredDB/Production/WorkOrdRouting.cs

@@ -122,5 +122,11 @@ namespace Business.Domain
         /// </summary>
         [Comment("创建时间")]
         public DateTime? CreateTime { get; set; }
+
+        /// <summary>
+        /// 工单主键
+        /// </summary>
+        [Comment("工单主键")]
+        public int WorkOrdMasterRecID { get; set; }
     }
 }