소스 검색

材料费详情对比(改,设置数字保留两位小数)

lw 1 년 전
부모
커밋
4c7e2e16c4

+ 5 - 5
module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrder/controller/WzOutboundOrderHController.java

@@ -224,15 +224,15 @@ public class WzOutboundOrderHController extends JeecgController<WzOutboundOrderH
                             taskNoList.remove(CDo.getRwh()+"_-_pc");
                             BigDecimal proportion = BigDecimal.valueOf(CDo.getProportion());
                             if (proportion.compareTo(BigDecimal.ZERO) != 0) {
-                                CDo.setTotalAmount(CDo.getTotalAmount().multiply(proportion).setScale(2, RoundingMode.HALF_UP));
-                                CDo.setTotalCount(CDo.getTotalCount().multiply(proportion).setScale(2, RoundingMode.HALF_UP));
+                                CDo.setTotalAmount(CDo.getTotalAmount().multiply(proportion));
+                                CDo.setTotalCount(CDo.getTotalCount().multiply(proportion));
                             }
                         }else {
                             taskNoList.remove(CDo.getRwh());
                         }
-                        clfCompareTaskResultVo.setTotalAmount(CDo.getTotalAmount());
-                        clfCompareTaskResultVo.setTotalCount(CDo.getTotalCount());
-                        clfCompareTaskResultVo.setUnitPrice(CDo.getUnitPrice());
+                        clfCompareTaskResultVo.setTotalAmount(CDo.getTotalAmount().setScale(2,RoundingMode.HALF_UP));
+                        clfCompareTaskResultVo.setTotalCount(CDo.getTotalCount().setScale(2,RoundingMode.HALF_UP));
+                        clfCompareTaskResultVo.setUnitPrice(CDo.getUnitPrice().setScale(2,RoundingMode.HALF_UP));
                         if (unitPrice == null) {
                             unitPrice = CDo.getUnitPrice();
                         } else {

+ 3 - 3
module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrder/vo/CLFCompareTaskResultVo.java

@@ -18,15 +18,15 @@ public class CLFCompareTaskResultVo {
     /*标识*/
     private String flag;
 
-    @Excel(name = "总金额", width = 15,orderNum = "2")
+    @Excel(name = "总金额", width = 15,orderNum = "2",exportFormat = "0.00")
     /*总金额*/
     private BigDecimal totalAmount;
 
-    @Excel(name = "总数量", width = 15,orderNum = "3")
+    @Excel(name = "总数量", width = 15, orderNum = "3", exportFormat = "0.00")
     /*总数量*/
     private BigDecimal totalCount;
 
-    @Excel(name = "单价", width = 15,orderNum = "4")
+    @Excel(name = "单价", width = 15,orderNum = "4",exportFormat ="0.00")
     /*单价*/
     private BigDecimal unitPrice;
 }