|
|
@@ -96,8 +96,8 @@ public class PayBillSubmitOperationServicePlugIn extends AbstractOperationServic
|
|
|
payBill.set("nckd_ceyj", null);
|
|
|
if(jshj.compareTo(BigDecimal.ZERO) != 0 && ycje.compareTo(BigDecimal.ZERO) != 0 ){
|
|
|
//销售合同的比例：已收金额/价税合计 ;销售合同的比例：采购已付金额+当前付款金额/ 已采金额
|
|
|
- BigDecimal xsbl = receiptallamount.divide(jshj,4, BigDecimal.ROUND_HALF_UP);
|
|
|
- BigDecimal cgbl = (nckd_cgyfje.add(e_actamt)).divide(ycje,4, BigDecimal.ROUND_HALF_UP);
|
|
|
+ BigDecimal xsbl = receiptallamount.divide(jshj,2, BigDecimal.ROUND_HALF_UP);
|
|
|
+ BigDecimal cgbl = (nckd_cgyfje.add(e_actamt)).divide(ycje,2, BigDecimal.ROUND_HALF_UP);
|
|
|
if(cgbl.compareTo(xsbl) > 0) {
|
|
|
existError = true;
|
|
|
String error = "对应销售合同收款比例" + xsbl.multiply(BigDecimal.valueOf(100)) +"%，采购已付款比例" + cgbl.multiply(BigDecimal.valueOf(100)) + "%，当前付款金额 已超出可付比例";
|
|
|
@@ -106,7 +106,7 @@ public class PayBillSubmitOperationServicePlugIn extends AbstractOperationServic
|
|
|
e.setCancelMessage(error);
|
|
|
break;
|
|
|
}else {
|
|
|
- String error = "1对应销售合同收款比例" + xsbl.multiply(BigDecimal.valueOf(100)) +"%，采购已付款比例" + cgbl.multiply(BigDecimal.valueOf(100)) + "%，当前付款金额 已超出可付比例";
|
|
|
+ String error = nckd_cgyfje + "," + e_actamt +"1对应销售合同收款比例" + xsbl.multiply(BigDecimal.valueOf(100)) +"%，采购已付款比例" + cgbl.multiply(BigDecimal.valueOf(100)) + "%，当前付款金额 已超出可付比例";
|
|
|
payBill.set("nckd_ceyj", error);
|
|
|
}
|
|
|
}
|
wuxiaobing