wuxiaobing преди 3 дни
родител
ревизия
0b0e13cb59

+ 2 - 2
code/wnq/nckd-wnq01-wnq-scm/src/main/java/nckd/poc602/plugin/operate/PayBillSubmitOperationServicePlugIn.java

@@ -87,7 +87,7 @@ public class PayBillSubmitOperationServicePlugIn extends AbstractOperationServic
 								BigDecimal nckd_cgyfjeNew = e_actamt.add(nckd_cgyfje);
 								if(nckd_cgyfjeNew.compareTo(receiptallamount) > 0) {
 									existError = true;
-									String error = "对应销售合同已收金额" + receiptallamount +",采购已付款金额" + nckd_cgyfje + ",当前付款金额已超出可付金额";
+									String error = "对应销售合同已收金额" + receiptallamount.setScale(2) +",采购已付款金额" + nckd_cgyfje.setScale(2) + ",当前付款金额已超出可付金额";
 									e.setCancel(true);
 									e.setCancelMessage(error);
 									break;
@@ -98,7 +98,7 @@ public class PayBillSubmitOperationServicePlugIn extends AbstractOperationServic
 									BigDecimal cgbl = (nckd_cgyfje.add(e_actamt)).divide(ycje).multiply(BigDecimal.valueOf(100));
 									if(cgbl.compareTo(xsbl) > 0) {
 										existError = true;
-										String error = "对应销售合同收款比例" + xsbl +"%,采购已付款比例" + cgbl + "%,当前付款金额 已超出可付比例";
+										String error = "对应销售合同收款比例" + xsbl.setScale(2) +"%,采购已付款比例" + cgbl.setScale(2) + "%,当前付款金额 已超出可付比例";
 										e.setCancel(true);
 										e.setCancelMessage(error);
 									}

+ 1 - 1
code/wnq/nckd-wnq01-wnq-scm/src/main/java/nckd/poc602/plugin/operate/PurContractSubmitOperationServicePlugIn.java

@@ -53,7 +53,7 @@ public class PurContractSubmitOperationServicePlugIn extends AbstractOperationSe
 					BigDecimal nckd_ycjeNew = purjshj.add(nckd_ycje);
 					if(nckd_ycjeNew.compareTo(salejshj) > 0) {
 						existError = true;
-						String error = "当前合同累计已下采购订单金额" + nckd_ycje + ",当前采购金额已超" + nckd_ycjeNew.subtract(salejshj) + "不允许采购";
+						String error = "当前合同累计已下采购订单金额" + nckd_ycje.setScale(2) + ",当前采购金额已超" + (nckd_ycjeNew.subtract(salejshj)).setScale(2) + "不允许采购";
 						e.setCancel(true);
 						e.setCancelMessage(error);
 						break;