成本分配表调整

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

@@ -558,12 +558,12 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
 //                                    BigDecimal num2 = money2.multiply(quantity);
 //                                    includestaxTotal = includestaxTotal.add(num2);
 //                                }else{
-                                    if (oConvertUtils.isNotEmpty(str.getFabriccostIncludestaxUsd()) && str.getFabriccostIncludestaxUsd().compareTo(BigDecimal.ZERO)>0){
-                                        BigDecimal num = str.getFabriccostIncludestax().multiply(new BigDecimal(1.13));
-                                        usageQuantityTotal = usageQuantityTotal.add(num);
-                                    }else {
+//                                    if (oConvertUtils.isNotEmpty(str.getFabriccostIncludestaxUsd()) && str.getFabriccostIncludestaxUsd().compareTo(BigDecimal.ZERO)>0){
+//                                        BigDecimal num = str.getFabriccostIncludestax().multiply(new BigDecimal(1.13));
+//                                        usageQuantityTotal = usageQuantityTotal.add(num);
+//                                    }else {
                                         usageQuantityTotal = usageQuantityTotal.add(str.getFabriccostIncludestax());
-                                    }
+//                                    }
                                     notincludestaxTotal = notincludestaxTotal.add(str.getFabriccostNotincludestax());
                                     System.out.println("notincludestaxTotal2\t"+notincludestaxTotal);
                                     includestaxTotal = includestaxTotal.add(str.getFabriccostIncludestaxUsd());
@@ -642,12 +642,12 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
 //                                    BigDecimal num2 = money2.multiply(quantity);
 //                                    includestaxTotal = includestaxTotal.add(num2);
 //                                }else{
-                                if (oConvertUtils.isNotEmpty(str.getFabriccostIncludestaxUsd()) && str.getFabriccostIncludestaxUsd().compareTo(BigDecimal.ZERO)>0){
-                                    BigDecimal num = str.getFabriccostIncludestax().multiply(new BigDecimal(1.13));
-                                    usageQuantityTotal = usageQuantityTotal.add(num);
-                                }else {
+//                                if (oConvertUtils.isNotEmpty(str.getFabriccostIncludestaxUsd()) && str.getFabriccostIncludestaxUsd().compareTo(BigDecimal.ZERO)>0){
+//                                    BigDecimal num = str.getFabriccostIncludestax().multiply(new BigDecimal(1.13));
+//                                    usageQuantityTotal = usageQuantityTotal.add(num);
+//                                }else {
                                     usageQuantityTotal = usageQuantityTotal.add(str.getFabriccostIncludestax());
-                                }
+//                                }
                                     notincludestaxTotal = notincludestaxTotal.add(str.getFabriccostNotincludestax());
                                     System.out.println("notincludestaxTotal2\t"+notincludestaxTotal);
                                     includestaxTotal = includestaxTotal.add(str.getFabriccostIncludestaxUsd());
@@ -671,7 +671,7 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
 //                System.out.println("面料含税人民币2\t"+usageQuantityTotal.setScale(2,BigDecimal.ROUND_HALF_UP));
 //                System.out.println("实际总金额2\t"+usageQuantityTotal);
                     System.out.println("人民币面料成本notincludestaxTotal\t"+notincludestaxTotal);
-                    usageQuantityTotal = usageQuantityTotal.setScale(2, BigDecimal.ROUND_HALF_UP);
+//                    usageQuantityTotal = usageQuantityTotal.setScale(2, BigDecimal.ROUND_HALF_UP);
                     if (syCostAllocation.getFabriccostIncludestax()!=null){
                         syCostAllocation.setFabriccostIncludestax(syCostAllocation.getFabriccostIncludestax().add(usageQuantityTotal.setScale(2,BigDecimal.ROUND_HALF_UP)));
                     }else{