From ff3722be844d3acad8fbfe9e6d105f47a3646d84 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 21 Jul 2024 16:24:41 +0800
Subject: [PATCH] md

---
 .../erp/emis/service/impl/EmisSettleBillServiceImpl.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 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 9eb9e05ce..2b219037f 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
@@ -268,7 +268,7 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
      * @return
      * @throws EmisBizError
      */
-    private int reCalcSettleBillFee(EmisSettleBill emisSettleBill) throws EmisBizError {
+    private int reCalcSettleBillFee(EmisSettleBill old) throws EmisBizError {
 
         // 计算应收总账单金额
         // 检查子账单是否可加入
@@ -284,7 +284,7 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
 
         sendMoneySum=totalRecMoney;
 
-        List<EmisSettleSubBill> listSubBill=emisSettleSubBillMapper.selectSubBillListBySettleBillNo(emisSettleBill.getSettleBillNo());
+        List<EmisSettleSubBill> listSubBill=emisSettleSubBillMapper.selectSubBillListBySettleBillNo(old.getSettleBillNo());
         if(CollectionUtil.isEmpty(listSubBill)){
             throw  new EmisBizError(EmisBizErrorType.FAIL,"子账单数量为空，请检查");
         }
@@ -298,8 +298,13 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
             feeWeight=feeWeight.add(subBill.getWaybillDetail().getSettlementWeight());
         }
 
+
+        EmisSettleBill emisSettleBill = new EmisSettleBill();
+        emisSettleBill.setId(old.getId());
+
         // 总票数
         emisSettleBill.setSendPieceSum(sendPieceSum);
+
         // 总件数
         emisSettleBill.setPieceNumber(pieceNumber);