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

feat:发货联系书款项信息

Browse Source
This commit is contained in:
violet 2024-09-06 19:25:18 +08:00
parent a26db3adf6
commit 1e25a581d2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/yem/wm/es/contactbook/op/ContactBookSaveOp.java
View File

@ -206,7 +206,7 @@ public class ContactBookSaveOp extends AbstractOperationServicePlugIn
logger.info("下单已认领金额：{}， 下单预收金额：{}", procClaimAnt, advancePayment); logger.info("下单已认领金额：{}， 下单预收金额：{}", procClaimAnt, advancePayment);
debugMsg.append(String.format("下单已认领金额：%s， 下单预收金额：%s", procClaimAnt, advancePayment)).append("\n"); debugMsg.append(String.format("下单已认领金额：%s， 下单预收金额：%s", procClaimAnt, advancePayment)).append("\n");
// 下单已认领金额 >= 下单预收金额 // 下单已认领金额 >= 下单预收金额
if (procClaimAnt.compareTo(advancePayment) >= 0) { if (advancePayment.compareTo(BigDecimal.ZERO) > 0 && procClaimAnt.compareTo(advancePayment) >= 0) {
isProcClaimFinish = true; isProcClaimFinish = true;
} }
@ -216,7 +216,7 @@ public class ContactBookSaveOp extends AbstractOperationServicePlugIn
BigDecimal shipClaimAmt = PaymentControlUtil.getAmountClaimed(new DynamicObject[]{shipDetail}, "E");//本次发运已认领金额 BigDecimal shipClaimAmt = PaymentControlUtil.getAmountClaimed(new DynamicObject[]{shipDetail}, "E");//本次发运已认领金额
logger.info("发运已认领金额：{}，发运预收金额：{}", shipClaimAmt, thisShipIOUAmt); logger.info("发运已认领金额：{}，发运预收金额：{}", shipClaimAmt, thisShipIOUAmt);
debugMsg.append(String.format("发运已认领金额：%s， 发运预收金额：%s", shipClaimAmt, thisShipIOUAmt)).append("\n"); debugMsg.append(String.format("发运已认领金额：%s， 发运预收金额：%s", shipClaimAmt, thisShipIOUAmt)).append("\n");
if (shipClaimAmt.compareTo(thisShipIOUAmt) >= 0) { if (thisShipIOUAmt.compareTo(BigDecimal.ZERO) > 0 && shipClaimAmt.compareTo(thisShipIOUAmt) >= 0) {
isShipClaimFinish = true; isShipClaimFinish = true;
} }
@ -226,7 +226,7 @@ public class ContactBookSaveOp extends AbstractOperationServicePlugIn
logger.info("尾款已认领金额：{}， 尾款应收金额：{}", shipClaimAmt_periodrefund, periodrefundamt); logger.info("尾款已认领金额：{}， 尾款应收金额：{}", shipClaimAmt_periodrefund, periodrefundamt);
debugMsg.append(String.format("尾款已认领金额：%s， 尾款应收金额：%s", shipClaimAmt_periodrefund, periodrefundamt)).append("\n"); debugMsg.append(String.format("尾款已认领金额：%s， 尾款应收金额：%s", shipClaimAmt_periodrefund, periodrefundamt)).append("\n");
// 尾款认领金额 >= 尾款 应收金额 // 尾款认领金额 >= 尾款 应收金额
if (shipClaimAmt_periodrefund.compareTo(periodrefundamt) >= 0) { if (periodrefundamt.compareTo(BigDecimal.ZERO) > 0 && shipClaimAmt_periodrefund.compareTo(periodrefundamt) >= 0) {
isFinalClaimFinish = true; isFinalClaimFinish = true;
} }