Browse Source

成本分配表费用支出计算调整

huxy 1 day ago
parent
commit
a79db57835

+ 15 - 10
jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/service/impl/SyCostAllocationServiceImpl.java

@@ -814,16 +814,21 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
 
             SyCostAllocationCostpay syCostAllocationCostpay = syCostAllocationCostpays.get(i);
             //人民币税额算占比
-            if(oConvertUtils.isNotEmpty(syCostAllocationCostpay.getShuiemoney())){
-                syCostAllocationCostpay.setShuiemoney(syCostAllocationCostpay.getShuiemoney().multiply(zhanBi));
-            }
-            //人民币(不含税)算占比
-            if(oConvertUtils.isNotEmpty(syCostAllocationCostpay.getDisbursedLocalmoney())){
-                syCostAllocationCostpay.setDisbursedLocalmoney(syCostAllocationCostpay.getDisbursedLocalmoney().multiply(zhanBi).setScale(2,BigDecimal.ROUND_HALF_UP));
-            }
-            //美元算占比
-            if(oConvertUtils.isNotEmpty(syCostAllocationCostpay.getDisbursedOriginalmoney())){
-                syCostAllocationCostpay.setDisbursedOriginalmoney(syCostAllocationCostpay.getDisbursedOriginalmoney().multiply(zhanBi).setScale(2,BigDecimal.ROUND_HALF_UP));
+            System.out.println("账套号  "+syCostAllocationCostpay.getSetNo()+" 支出单号  "+syCostAllocationCostpay.getDisbursementSlipNo()
+                    +"  税额  "+syCostAllocationCostpay.getShuiemoney()+"  占比  "+zhanBi);
+            if(syCostAllocationCostpay.getSetNo().equals("101")){//101才计算占比
+                //人民币 税额算占比
+                if(oConvertUtils.isNotEmpty(syCostAllocationCostpay.getShuiemoney())){
+                    syCostAllocationCostpay.setShuiemoney(syCostAllocationCostpay.getShuiemoney().multiply(zhanBi));
+                }
+                //人民币(不含税)算占比
+                if(oConvertUtils.isNotEmpty(syCostAllocationCostpay.getDisbursedLocalmoney())){
+                    syCostAllocationCostpay.setDisbursedLocalmoney(syCostAllocationCostpay.getDisbursedLocalmoney().multiply(zhanBi).setScale(2,BigDecimal.ROUND_HALF_UP));
+                }
+                //美元算占比
+                if(oConvertUtils.isNotEmpty(syCostAllocationCostpay.getDisbursedOriginalmoney())){
+                    syCostAllocationCostpay.setDisbursedOriginalmoney(syCostAllocationCostpay.getDisbursedOriginalmoney().multiply(zhanBi).setScale(2,BigDecimal.ROUND_HALF_UP));
+                }
             }
 
             //费用支出单原币本币汇总 并 赋值给表头(运杂费)