代码提交。

MicroServices/Business/Business.Application.Contracts/ResourceExamineManagement/IResourceExamineAppService.cs

@@ -88,9 +88,9 @@ namespace Business.ResourceExamineManagement
         /// <summary>
         /// Pr自动合并
         /// </summary>
-        /// <param name="workOrds"></param>
+        /// <param name="domain"></param>
         /// <returns></returns>
-        Task<string> PrAutoMerge(string companyid);
+        Task<string> PrAutoMerge(string domain);
 
         /// <summary>
         /// Pr手动合并
@@ -104,7 +104,7 @@ namespace Business.ResourceExamineManagement
         /// </summary>
         /// <param name="ids"></param>
         /// <returns></returns>
-        Task<string> PrAutoApprove(string companyid);
+        Task<string> PrAutoApprove(string domain);
 
         /// <summary>
         /// Pr手动审核
@@ -139,7 +139,7 @@ namespace Business.ResourceExamineManagement
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
-        Task<string> PrSendSAP(string companyid);
+        Task<string> PrSendSAP(string domain);
 
         /// <summary>
         /// 生产日计划自动发布
@@ -175,5 +175,12 @@ namespace Business.ResourceExamineManagement
         /// <param name="domain"></param>
         /// <returns></returns>
         Task<string> WorkOrdKittingCheckByNo(string workord, string qty, string instockdate, string priority, string domain, string userAccount);
+
+        /// <summary>
+        /// 调整过去采购申请时间
+        /// </summary>
+        /// <param name="domain"></param>
+        /// <returns></returns>
+        Task<string> AutomaticPrAdjustDate(string domain);
     }
 }

MicroServices/Business/Business.Application/ResourceExamineManagement/PretreatmentAppService.cs

@@ -124,6 +124,7 @@ namespace Business.ResourceExamineManagement
                     cdto.haveicsubs = c.haveicsubs;
                     cdto.substitute_code = c.substitute_code;
                     cdto.icitem_ids = c.icitem_ids;
+                    cdto.unit = icitem == null ? "" : icitem.unit;
                     cdto.type = type;
                     cdto.item_id = childBom.icitem_id;
                     cdto.bom_id = childBom.mysql_id;