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

MicroServices/Business/Business.Application/ReplenishmentManagement/ReplenishmentAppService.cs

@@ -3346,7 +3346,7 @@ namespace Business.Replenishment
 
         private async Task ClearDO(string domain)
         {
-            var purordlist = _PurOrdMaster.Select(x => x.Status.ToUpper() != "C" && x.ReqBy == "DO" && x.Domain == domain).ToList();
+            var purordlist = _PurOrdMaster.Select(x => x.Status.ToUpper() != "C" && x.ReqBy == "DO" && x.Domain == domain && x.USAGE != "ECR" && x.USAGE != "研发").ToList();
             var purdtllist = _PurOrdDetail.Select(x => purordlist.Select(c => c.RecID).Contains(x.PurOrdRecID) && x.Domain == domain).ToList();
             var shdzblist = _scm_shdzb.Select(x => purordlist.Select(c => c.PurOrd).Contains(x.po_bill)).ToList();
             var podslist = _srmpolistds.Select(x => purordlist.Select(c => c.PurOrd).Contains(x.ponumber) && x.isactive == 1).ToList();

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

@@ -1254,7 +1254,8 @@ namespace Business.ResourceExamineManagement
                                 newPr.pr_sqty = ilist.Sum(s => s.pr_sqty);//建议数量
 
                                 decimal qty = newPr.pr_rqty.GetValueOrDefault();
-                                if (pur != null && newPr.pr_type == 2 && pur.quota_rate.GetValueOrDefault() == 100)//委外的采购申请通过委外圆整逻辑处理
+                                //if (pur != null && newPr.pr_type == 2 && pur.quota_rate.GetValueOrDefault() == 100)//委外的采购申请通过委外圆整逻辑处理
+                                if (pur != null)//按卫亮要求所有的全部圆整
                                 {
                                     //数量圆整 按最小包装量向上圆整
                                     if (pur.packaging_qty.GetValueOrDefault() != 0)
@@ -1284,7 +1285,7 @@ namespace Business.ResourceExamineManagement
                             else
                             {
                                 decimal qty = pr.pr_rqty.GetValueOrDefault();
-                                if (pur != null && pur.quota_rate.GetValueOrDefault() == 100)
+                                if (pur != null)//按卫亮要求所有的全部圆整
                                 {
                                     //数量圆整 按最小包装量向上圆整
                                     if (pur.packaging_qty.GetValueOrDefault() != 0)
@@ -1359,6 +1360,9 @@ namespace Business.ResourceExamineManagement
                         new NLogHelper("ResourceExamineAppService").WriteLog("PrAutoMerge", "采购申请单自动合并更新失败：" + e.Message, _currentTenant.Id.ToString());
                     };
                 }
+
+                //暂时固定传8010后面有时间再改
+                await CreateDemandSchedule(domain);
                 return "ok";
             }
             catch (Exception e)
@@ -6494,7 +6498,7 @@ namespace Business.ResourceExamineManagement
             }
             catch (Exception e)
             {
-                new NLogHelper("ResourceExamineAppService").WriteLog("WorkOrdKittingCheckByNo", "修改计划工单失败：" + e.Message, _currentTenant.Id.ToString());
+                new NLogHelper("ResourceExamineAppService").WriteLog("AutomaticPrAdjustDate", "PR推送失败失败：" + e.Message, _currentTenant.Id.ToString());
                 return "更新失败，请联系管理员。";
             }
         }
@@ -6518,7 +6522,7 @@ namespace Business.ResourceExamineManagement
                 {
                     return result;
                 }
-                //result = await PrSendSAP(domain);
+                result = await PrSendSAP(domain);
                 if (result != "ok")
                 {
                     return result;
@@ -6728,8 +6732,6 @@ namespace Business.ResourceExamineManagement
                         new NLogHelper("ResourceExamineAppService").WriteLog("PrAutoMerge", "采购申请单自动合并更新失败：" + e.Message, _currentTenant.Id.ToString());
                     };
                 }
-                //暂时固定传8010后面有时间再改
-                await CreateDemandSchedule(domain);
                 return "ok";
             }
             catch (Exception e)