From b562a81e7a36d12fb28d42106317068adba7262e Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Mon, 22 Sep 2025 11:26:45 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=B4=A6=E5=8D=95=E7=AE=A1=E7=90=86=20-=20?=
 =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E4=B8=AD=E5=BF=83=E9=94=80=E8=B4=A6=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=20-=E8=B4=A2=E5=8A=A1=E5=AE=A1=E6=A0=B8=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87/=E6=80=BB=E9=83=A8=E9=A9=B3=E5=9B=9E=E4=BB=A5?=
 =?UTF-8?q?=E5=90=8E=E6=9B=B4=E6=96=B0=E5=8F=91=E7=A5=A8=E6=94=B6=E6=AC=BE?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E3=80=81=E5=B7=B2=E6=94=B6=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

committer: heyu
---
 .../impl/EmisWriteoffApplyServiceImpl.java    | 22 +++++++++----------
 .../mapper/EmisSettleInvoiceRecordMapper.xml  |  4 +++-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWriteoffApplyServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWriteoffApplyServiceImpl.java
index 79f4df0cb..0b94abbd7 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWriteoffApplyServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWriteoffApplyServiceImpl.java
@@ -1329,17 +1329,17 @@ public class EmisWriteoffApplyServiceImpl extends EmisBaseService implements IEm
                 return;
             }
 
-            // 按 invoice_no 分组处理开票记录
-            Map<String, List<EmisSettleInvoiceRecord>> invoiceGroups = invoiceRecords.stream()
-                    .filter(record -> StringUtil.isNotBlank(record.getInvoiceNo()))
-                    .collect(java.util.stream.Collectors.groupingBy(EmisSettleInvoiceRecord::getInvoiceNo));
+            // 按 id 分组处理开票记录
+            Map<Long, List<EmisSettleInvoiceRecord>> invoiceGroups = invoiceRecords.stream()
+                    .filter(record -> record.getId() != null)
+                    .collect(java.util.stream.Collectors.groupingBy(EmisSettleInvoiceRecord::getId));
 
-            for (Map.Entry<String, List<EmisSettleInvoiceRecord>> entry : invoiceGroups.entrySet()) {
-                String invoiceNo = entry.getKey();
+            for (Map.Entry<Long, List<EmisSettleInvoiceRecord>> entry : invoiceGroups.entrySet()) {
+                Long recordId = entry.getKey();
                 List<EmisSettleInvoiceRecord> invoiceList = entry.getValue();
 
                 try {
-                    // 计算该发票号对应的总申请金额
+                    // 计算该开票记录对应的总申请金额
                     BigDecimal totalApplyMoney = detailList.stream()
                             .filter(detail -> StringUtil.isNotBlank(detail.getBillCode()))
                             .map(detail -> detail.getApplyMoney() != null ? detail.getApplyMoney() : BigDecimal.ZERO)
@@ -1386,12 +1386,12 @@ public class EmisWriteoffApplyServiceImpl extends EmisBaseService implements IEm
                         }
                     }
 
-                    log.info("开票记录付款状态更新成功，发票号: {}, 更新记录数: {}, 新已收金额: {}, 付款状态: {}, 申请金额: {}, 开票金额: {}",
-                            invoiceNo, updateCount, newRecedMoney, paymentStatus, totalApplyMoney, applyMoney);
+                    log.info("开票记录付款状态更新成功，记录ID: {}, 更新记录数: {}, 新已收金额: {}, 付款状态: {}, 申请金额: {}, 开票金额: {}",
+                            recordId, updateCount, newRecedMoney, paymentStatus, totalApplyMoney, applyMoney);
 
                 } catch (Exception e) {
-                    log.error("更新开票记录付款状态失败，发票号: {}", invoiceNo, e);
-                    // 继续处理其他发票，不抛出异常
+                    log.error("更新开票记录付款状态失败，记录ID: {}", recordId, e);
+                    // 继续处理其他记录，不抛出异常
                 }
             }
 
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml
index f537f4ceb..90dc49859 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml
@@ -235,7 +235,7 @@
         where a.del_flag = '0'
         and exists (
             select 1 from emis_settle_invoice_rel rel
-            where rel.del_flag = '0' 
+            where rel.del_flag = '0'
             and rel.apply_seq_no = a.apply_seq_no
             and rel.bill_no in
             <foreach item="billCode" collection="billCodes" open="(" separator="," close=")">
@@ -468,6 +468,8 @@
             <if test="openMoneyMax != null">open_money_max = #{openMoneyMax},</if>
             <if test="openMoney != null">open_money = #{openMoney},</if>
             <if test="invoiceNo != null and invoiceNo != ''">invoice_no = #{invoiceNo},</if>
+            <if test="recedMoney != null">reced_money = #{recedMoney},</if>
+            <if test="paymentStatus != null and paymentStatus != ''">payment_status = #{paymentStatus},</if>
             <if test="invoiceStatus != null and invoiceStatus != ''">invoice_status = #{invoiceStatus},</if>
             <if test="invoiceStatusDesc != null and invoiceStatusDesc != ''">invoice_status_desc = #{invoiceStatusDesc},</if>
             <if test="recieveAddress != null and recieveAddress != ''">recieve_address = #{recieveAddress},</if>