From 87eb614aaa7edf0a6cbc2ac6dc190baf4c1bccbf Mon Sep 17 00:00:00 2001 From: zzs Date: Fri, 24 Jan 2025 17:01:06 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=AF=84=E5=8D=95=E6=94=BE=E5=8D=95?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=8F=90=E4=BA=A4=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExportPresentSubmitValidator.java | 52 ++++++++----------- 1 file changed, 22 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/yem/wm/es/exportpresent/validator/ExportPresentSubmitValidator.java b/src/main/java/com/yem/wm/es/exportpresent/validator/ExportPresentSubmitValidator.java index c9eec244..9e09ec6e 100644 --- a/src/main/java/com/yem/wm/es/exportpresent/validator/ExportPresentSubmitValidator.java +++ b/src/main/java/com/yem/wm/es/exportpresent/validator/ExportPresentSubmitValidator.java @@ -75,17 +75,7 @@ public class ExportPresentSubmitValidator extends AbstractValidator { } } - /** - * 0、见提单并且100%L/C，100%OA、100%DP、100%DA并且没有预收款：判断预收款项是否认领完成 - * 0、见提单并且100%L/C，100%OA、100%DP、100%DA并且有预收款：只判断预收款项是否认领完成 - * 通过或不进行1234校验 - * 1、见提单并且正常款项：判断合同是否认领完成 - * 2、见提单并且特殊款项：判断合同是否认领完成 - * 1或2通过不进行后续校验 - * 3、未件提单并且正常款项：判断合同是否认领完成 - * 4、未件提单并且特殊款项：判断合同是否认领完成 - * 3或4通过不进行后续校验 - */ + private void prePayAmtValidator(ExtendedDataEntity data, Map orders, Map isVail, DynamicObjectCollection receiveC) { StringBuilder sb = new StringBuilder(); for (Map.Entry entry : orders.entrySet()) { @@ -103,7 +93,7 @@ public class ExportPresentSubmitValidator extends AbstractValidator { boolean isSpecialRapStyle = false; for (DynamicObject d : collection) { DynamicObject rapstyle = d.getDynamicObject("yem_rapstyle_c"); - if (YEM.isNotEmpty(rapstyle) && "D/A JSFS08 L/C OA D/A".contains(rapstyle.getString("number"))) { + if (YEM.isNotEmpty(rapstyle) && "D/A JSFS08 L/C OA D/A O/A".contains(rapstyle.getString("number"))) { isSpecialRapStyle = true; } } @@ -113,18 +103,17 @@ public class ExportPresentSubmitValidator extends AbstractValidator { String billno = order.getString("billno"); // 合同已认领金额 BigDecimal climeAmt = PaymentControlUtil.getContractClimeAmt(order, ""); - // 只判断预付款是否认领完成 - if (!isDoVail) { - if (isSpecialRapStyle) { - if (climeAmt.compareTo(offeramount) < 0) { - sb.append(String.format("合同 [ %s ] ，合同金额 [ %s ]， 合同已认领金额合计 [ %s ]，合同未认领完成，请全部认领后提交单据！（L/C、OA、DP、DA）", - billno, - offeramount.setScale(4, RoundingMode.HALF_UP).toPlainString(), - climeAmt.setScale(4, RoundingMode.HALF_UP).toPlainString())).append("\r\n"); - } - - } else { + if (isSpecialRapStyle) { + if (climeAmt.compareTo(offeramount) < 0) { + sb.append(String.format("合同 [ %s ] ，合同金额 [ %s ]， 合同已认领金额合计 [ %s ]，合同未认领完成，请全部认领后提交单据！", + billno, + offeramount.setScale(4, RoundingMode.HALF_UP).toPlainString(), + climeAmt.setScale(4, RoundingMode.HALF_UP).toPlainString())).append("\r\n"); + } + } else { + // 只判断预付款是否认领完成 + if (!isDoVail) { BigDecimal climeAmtShip = PaymentControlUtil.getContractClimeAmt(order, "D"); BigDecimal climeAmtProc = PaymentControlUtil.getContractClimeAmt(order, "E"); @@ -141,14 +130,17 @@ public class ExportPresentSubmitValidator extends AbstractValidator { orderPreAmt.setScale(4, RoundingMode.HALF_UP).toPlainString(), climePreAmt.setScale(4, RoundingMode.HALF_UP).toPlainString())).append("\r\n"); } - } - } else { - if (climeAmt.compareTo(offeramount) < 0) { - sb.append(String.format("合同 [ %s ] ，合同金额 [ %s ]， 合同已认领金额合计 [ %s ]，合同未认领完成，请全部认领后提交单据！", - billno, - offeramount.setScale(4, RoundingMode.HALF_UP).toPlainString(), - climeAmt.setScale(4, RoundingMode.HALF_UP).toPlainString())).append("\r\n"); + } else { + + + + if (climeAmt.compareTo(offeramount) < 0) { + sb.append(String.format("合同 [ %s ] ，合同金额 [ %s ]， 合同已认领金额合计 [ %s ]，合同未认领完成，请全部认领后提交单据！", + billno, + offeramount.setScale(4, RoundingMode.HALF_UP).toPlainString(), + climeAmt.setScale(4, RoundingMode.HALF_UP).toPlainString())).append("\r\n"); + } } } }