|
@@ -357,6 +357,7 @@ public class WorkInvoiceAllController extends BaseController {
|
|
|
workInvoice.setInvoiceDate(new Date());
|
|
|
}
|
|
|
|
|
|
+ //已收款处理
|
|
|
if(null != workInvoice.getWorkReceiptList() && workInvoice.getWorkReceiptList().size()>0){
|
|
|
BigDecimal moneyAll = new BigDecimal(0);
|
|
|
for (WorkInvoiceReceipt info: workInvoice.getWorkReceiptList()) {
|
|
@@ -364,12 +365,12 @@ public class WorkInvoiceAllController extends BaseController {
|
|
|
moneyAll = moneyAll.add(new BigDecimal(info.getMoney()));
|
|
|
}
|
|
|
}
|
|
|
- workInvoice.setProceedsMoney(moneyAll.toString());
|
|
|
+ workInvoice.setProceedsMoney(moneyAll.setScale(2,BigDecimal.ROUND_HALF_UP).toString());
|
|
|
|
|
|
if(null != workInvoice.getMoney() && null != moneyAll){
|
|
|
BigDecimal money = new BigDecimal(workInvoice.getMoney());
|
|
|
BigDecimal noProceedsMoney = money.subtract(moneyAll);
|
|
|
- workInvoice.setNoProceedsMoney(noProceedsMoney.toString());
|
|
|
+ workInvoice.setNoProceedsMoney(noProceedsMoney.setScale(2,BigDecimal.ROUND_HALF_UP).toString());
|
|
|
}
|
|
|
|
|
|
}
|