Merge branch 'dev' of http://123.60.180.165:4647/ZZYDOP/DOPCore into dev

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

@@ -2549,8 +2549,8 @@ namespace Business.ResourceExamineManagement
                 //获取工单数据
                 var workOrdMasters = _workOrdMaster.Select(p => mo_Mes_Morders.Select(c=>c.morder_no).Contains(p.WorkOrd));
                 workOrdMasters.ForEach(s => {
-                    s.OrdDate = DateTime.Now.Date.AddDays(7);//锁定期
-                    s.DueDate = DateTime.Now.Date.AddDays(7);
+                    s.OrdDate = DateTime.Now.Date.AddDays(14);//锁定期
+                    s.DueDate = DateTime.Now.Date.AddDays(14);
                 });
                 //优先级排序
                 workOrdMasters = workOrdMasters.OrderBy(s => s.OrdDate).ToList();
@@ -2564,6 +2564,7 @@ namespace Business.ResourceExamineManagement
                     morder.moentry_sys_etime = wod.DueDate;
 
                     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();
 
@@ -2577,9 +2578,9 @@ namespace Business.ResourceExamineManagement
                             var bce = exa.BomChildExamineList.Find(s => s.item_id == pr.icitem_id && s.num == pr.num);
                             pr.pr_sarrive_date = morder.moentry_sys_stime.Value.AddDays((double)(0 - bce.pre_time.GetValueOrDefault() - 1 - icitem.clean_leadtime.GetValueOrDefault()));//到货还需要向前推 物料的预处理时间。到货日期必须提前一天到
                             pr.pr_ssend_date = pr.pr_sarrive_date.GetValueOrDefault().AddDays(0 - ts.Value.Days);
-                            if (pr.pr_ssend_date > DateTime.Now)
+                            if (pr.pr_ssend_date < DateTime.Now.Date.AddDays(1))
                             {
-                                pr.pr_ssend_date = DateTime.Now;
+                                pr.pr_ssend_date = DateTime.Now.Date.AddDays(1);
                             }
                         }
                     });

MicroServices/Business/Business.Domain/StructuredDB/SaleFcst/StandardItemModelSet.cs

@@ -28,5 +28,11 @@ namespace Business.Domain
         /// </summary>
         [Comment("物料编码")]
         public string ItemNumber { get; set; }
+
+        /// <summary>
+        /// 补货周期
+        /// </summary>
+        [Comment("补货周期")]
+        public decimal ReplenishCycle { get; set; }
     }
 }