violet/ensign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:寄单放单申请提交校验

Browse Source
This commit is contained in:
zzs 2025-01-24 17:01:06 +08:00
parent 0488315433
commit 87eb614aaa
1 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/com/yem/wm/es/exportpresent/validator/ExportPresentSubmitValidator.java
View File

@ -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<Object, DynamicObject> orders, Map<Object, Boolean> isVail, DynamicObjectCollection receiveC) {
StringBuilder sb = new StringBuilder();
for (Map.Entry<Object, DynamicObject> 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）",
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,9 +130,11 @@ 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,
@ -152,6 +143,7 @@ public class ExportPresentSubmitValidator extends AbstractValidator {
}
}
}
}
if (sb.length() > 0) {
this.addErrorMessage(data, String.valueOf(sb));