Przeglądaj źródła

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

Murphy 2 lat temu
rodzic
commit
f642a553f2

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

@@ -6627,7 +6627,7 @@ 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)//委外的采购申请通过委外圆整逻辑处理
                                 {
                                     //数量圆整 按最小包装量向上圆整
                                     if (pur.packaging_qty.GetValueOrDefault() != 0)
@@ -6657,7 +6657,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)