代码提交。

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

@@ -1134,25 +1134,18 @@ namespace Business.ResourceExamineManagement
         //PR自动合并--要货令
         public void PrAutoMerge(string companyid)
         {
-            //TODO:先按每周四调度任务循环，周五下单处理
-
-            //拉取所有，然后根据送货周期来合并第一次得合并数据
-            //List<srm_pr_main> prlist = _mysql_srm_pr_main.GetListAsync(s => s.state == 1 || s.state == 2).Result;
             //直接按间隔多少天一次来处理数据，定时任务按周四来考虑。
             DateTime toTime = DateTime.Now; //new DateTime(2023, 7, 6);
             DateTime starttime = toTime.Date.AddDays(1);
             DateTime endtime = toTime.Date.AddDays(7);
             //只合并要货令
-            List<srm_pr_main> prlist = _mysql_srm_pr_main.GetListAsync(s => s.company_id.ToString() == companyid && s.pr_ssend_date >= starttime && s.pr_ssend_date <= endtime && s.state == 1 && s.IsRequireGoods == 1).Result;
+            List<srm_pr_main> prlist = _mysql_srm_pr_main.GetListAsync(s => s.company_id.ToString() == companyid && s.pr_ssend_date >= starttime && s.pr_ssend_date <= endtime && s.state == 1).Result;
             List<ic_item> ic_Items = _mysql_ic_item.GetListAsync(s => s.company_id.ToString() == companyid && prlist.Select(c => c.icitem_id).Distinct().Contains(s.Id)).Result;
 
             var occupylist = _mysql_srm_po_occupy.GetListAsync(s => prlist.Select(c => c.Id).Contains(s.polist_id.GetValueOrDefault()) && s.company_id.ToString() == companyid && s.IsDeleted == false).Result;
 
-            List<PrWeekDto> prWeekDtos = new List<PrWeekDto>();
-
             List<srm_pr_main> insetPrList = new List<srm_pr_main>();
             List<srm_pr_main> updatePrList = new List<srm_pr_main>();
-            var moPrlist = ObjectMapper.Map<List<srm_pr_main>, List<mo_srm_pr_main>>(prlist);
             long Nbr = help.NextId();
             foreach (var pr in prlist)
             {
@@ -1225,7 +1218,9 @@ namespace Business.ResourceExamineManagement
                     }
                 }
             }
-           
+            
+            //将采购申请推送SAP
+
             using (var unitOfWork = _unitOfWorkManager.Begin(false, true))
             {
                 try

MicroServices/Business/Business.Application/SystemJobManagement/SystemJobAppService.cs

@@ -929,7 +929,7 @@ namespace Business.SystemJobManagement
                 var sysResult =  SyncOrder(domain).Result;
                 if (sysResult == "ok")
                 {
-                    //sysResult = SyncPurOrd(domain, companyid).Result;
+                    sysResult = SyncPurOrd(domain, companyid).Result;
                 }
                 return sysResult;
             }
@@ -943,10 +943,11 @@ namespace Business.SystemJobManagement
         {
             try
             {
+                DateTime time = DateTime.Now.AddMonths(-2).Date;
                 //取数范围 需明确数据范围
-                var workList = _workOrdMaster.Select(c => c.Domain == domain && string.IsNullOrWhiteSpace(c.Status) == false).ToList();
-                var mesMorder = _mysql_mes_morder.GetListAsync(x => x.factory_id.ToString() == domain).Result;
-                var mesMoentry = _mysql_mes_moentry.GetListAsync(x => x.factory_id.ToString() == domain).Result;
+                var workList = _workOrdMaster.Select(c => c.CreateTime >= time && c.Domain == domain && string.IsNullOrWhiteSpace(c.Status) == false).ToList();
+                var mesMorder = _mysql_mes_morder.GetListAsync(x => x.factory_id.ToString() == domain && x.create_time >= time).Result;
+                var mesMoentry = _mysql_mes_moentry.GetListAsync(x => x.factory_id.ToString() == domain && x.create_time >= time).Result;
                 List<mes_morder> updateList = new List<mes_morder>();
                 List<mes_moentry> updateMoentryList = new List<mes_moentry>();
                 foreach (var work in workList)
@@ -1002,10 +1003,13 @@ namespace Business.SystemJobManagement
 
         private async Task<string> SyncPurOrd(string domain,string companyid)
         {
-            var masters = _purOrdMaster.Select(x => x.Domain == domain).ToList();
-            var details = _purOrdDetail.Select(x => x.Domain == domain).ToList();
-            var pomains = _srm_po_main.GetListAsync(x => x.factory_id.ToString() == domain && x.company_id.ToString() == companyid).Result;
-            var polists = _srm_po_list.GetListAsync(x => x.factory_id.ToString() == domain && x.company_id.ToString() == companyid).Result;
+            DateTime time = DateTime.Now.AddMonths(-2).Date;
+
+            var masters = _purOrdMaster.Select(x => x.Domain == domain && x.CreateTime>= time).ToList();
+            var details = _purOrdDetail.Select(x => x.Domain == domain && x.CreateTime >= time).ToList();
+            //日期上多查询一天。
+            var pomains = _srm_po_main.GetListAsync(x => x.factory_id.ToString() == domain && x.company_id.ToString() == companyid && x.create_time >= time.AddDays(-1)).Result;
+            var polists = _srm_po_list.GetListAsync(x => x.factory_id.ToString() == domain && x.company_id.ToString() == companyid && x.create_time >= time.AddDays(-1)).Result;
             List<ic_item> itemList = _mysql_ic_item.GetListAsync(x => x.factory_id.ToString() == domain && x.company_id.ToString() == companyid).Result;
             List<srm_po_main> poList = new List<srm_po_main>();
             List<srm_po_list> detailList = new List<srm_po_list>();