tangdi před 2 roky
rodič
revize
f18ee6d731

+ 7 - 0
MicroServices/Business/Business.Application.Contracts/ResourceExamineManagement/IResourceExamineAppService.cs

@@ -42,6 +42,13 @@ namespace Business.ResourceExamineManagement
         /// <returns></returns>
         Task<string> ReceiveResult(string ids, int type,string companyid);
 
+        /// <summary>
+        /// 自动任务执行资源检查
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        Task<string> receiveresultControllerApi(string companyid);
+
         /// <summary>
         /// 自动下达
         /// </summary>

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

@@ -577,6 +577,23 @@ namespace Business.ResourceExamineManagement
         }
         #endregion
 
+        /// <summary>
+        /// 自动任务执行资源检查
+        /// </summary>
+        /// <param name="companyid"></param>
+        /// <returns></returns>
+        public async Task<string> receiveresultControllerApi(string companyid)
+        {
+            var seorders = _mysql_crm_seorder.GetListAsync(s => s.company_id.ToString() == companyid).Result;
+            string ids = string.Join(',', seorders.Select(x => x.Id));
+            var rtn = await ReceiveResult(ids, 0, companyid);
+            if (rtn == "ok")
+            {
+                rtn = await ReviewExamineResult(ids, 0);
+            }
+            return rtn;
+        }
+
         /// <summary>
         /// 资源检查 -- TODO:根据客户的不同标准交货期(假如客户设定10天),如果检查交期小于标准交货期(10天),则默认把建议交期调整为10天。
         /// </summary>
@@ -1004,7 +1021,6 @@ namespace Business.ResourceExamineManagement
             }
         }
 
-
         //PR手动合并
         public async Task<string> PrMerge(string ids)
         {
@@ -3976,7 +3992,7 @@ namespace Business.ResourceExamineManagement
             if (nbrMasterList.Any())
             {
                 string seqSql = "";
-                var weekplan = _replenishmentWeekPlan.GetListAsync(s => s.factory_id.ToString() == domain && workOrdMasters.Select(x => x.WorkOrd).Contains(s.OrderNO)).Result;
+                var weekplan = _replenishmentWeekPlan.GetListAsync(s => s.factory_id.ToString() == domain && workOrdMasters.Select(x => x.WorkOrd).Contains(s.ProductionOrder)).Result;
                 var worklistDto = _serialNumberAppService.GetBillNo(domain, "WOlot", workOrdMasters.Count, userAccount, 1);
                 var rstSeqId = _serialNumberAppService.GetSeqIdList(domain, 1, 1);
                 long seqId = 0;