From 15051e5eba45d823e164b45030c952febb2f54ff Mon Sep 17 00:00:00 2001 From: linfso Date: Thu, 26 Jun 2025 07:28:12 +0800 Subject: [PATCH] md --- .../impl/EmisSettleBillServiceImpl.java | 42 ++++++++++++++----- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java index 8f61157ee..81bc247d7 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java @@ -1082,18 +1082,38 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS List list = emisBaseService.selectSubBillListBySettleBillNo(settleBillNo); if (!CollectionUtils.isEmpty(list)) { for (EmisSettleSubBill subBill:list) { - // 更新子账单收款状态 - EmisSettleSubBill updEmisSettleSubBill=new EmisSettleSubBill(); - updEmisSettleSubBill.setPaymentStatus("0"); - updEmisSettleSubBill.setRecedMoney(BigDecimal.ZERO); - updEmisSettleSubBill.setBillCode(subBill.getBillCode()); - emisSettleSubBillMapper.updatePayedStatus(updEmisSettleSubBill); - // 更新运单收款状态 - EmisWaybill emisWaybill = new EmisWaybill(); - emisWaybill.setBillCode(subBill.getBillCode()); - emisWaybill.setPaymentStatus("0"); - emisWaybillMapper.updatePayedStatus(emisWaybill); + // 已收款 + if("1".equals(newBill.getPaymentStatus())) { + // 更新子账单收款状态 + EmisSettleSubBill updEmisSettleSubBill = new EmisSettleSubBill(); + updEmisSettleSubBill.setPaymentStatus("1"); + updEmisSettleSubBill.setRecedMoney(BigDecimal.ZERO); + updEmisSettleSubBill.setBillCode(subBill.getBillCode()); + emisSettleSubBillMapper.updatePayedStatus(updEmisSettleSubBill); + + // 更新运单收款状态 + EmisWaybill emisWaybill = new EmisWaybill(); + emisWaybill.setBillCode(subBill.getBillCode()); + emisWaybill.setPaymentStatus("1"); + emisWaybillMapper.updatePayedStatus(emisWaybill); + } + // 未收款 + else{ + // 更新子账单收款状态 + EmisSettleSubBill updEmisSettleSubBill = new EmisSettleSubBill(); + updEmisSettleSubBill.setPaymentStatus("0"); + updEmisSettleSubBill.setRecedMoney(BigDecimal.ZERO); + updEmisSettleSubBill.setBillCode(subBill.getBillCode()); + emisSettleSubBillMapper.updatePayedStatus(updEmisSettleSubBill); + + // 更新运单收款状态 + EmisWaybill emisWaybill = new EmisWaybill(); + emisWaybill.setBillCode(subBill.getBillCode()); + emisWaybill.setPaymentStatus("0"); + emisWaybillMapper.updatePayedStatus(emisWaybill); + + } } } }