|
@@ -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 {
|