From a62bd3607f159758904054055e287cf66980214d Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Mon, 9 Feb 2026 14:01:38 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20TMS-=E8=B4=A2=E5=8A=A1=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E9=94=80=E8=B4=A6=E5=AE=A1=E6=A0=B8=EF=BC=9A=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA=E5=A2=9E=E6=B7=BB?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/emis/EmisWriteoffApplyController.java   | 17 +++++++++++++++++
 .../mapper/EmisWriteoffApplyMapper.xml          | 16 ++++------------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWriteoffApplyController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWriteoffApplyController.java
index 9919088de..f54c80327 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWriteoffApplyController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWriteoffApplyController.java
@@ -124,6 +124,23 @@ public class EmisWriteoffApplyController extends EmisBaseController {
                             })
                             .reduce(BigDecimal.ZERO, BigDecimal::add);
                     apply.setApplyRecMoney(totalAmount);
+
+                    // 提取发票号列表（去重）
+                    List<String> invoiceNos = apply.getDetailList().stream()
+                            .filter(detail -> detail != null && detail.getInvoiceNo() != null)
+                            .flatMap(detail -> {
+                                // 如果invoiceNo包含逗号，先拆分
+                                String invoiceNo = detail.getInvoiceNo().trim();
+                                if (invoiceNo.isEmpty()) {
+                                    return java.util.stream.Stream.empty();
+                                }
+                                return Arrays.stream(invoiceNo.split(","))
+                                        .map(String::trim)
+                                        .filter(no -> !no.isEmpty());
+                            })
+                            .distinct()
+                            .collect(Collectors.toList());
+                    apply.setInvoiceNo(invoiceNos.isEmpty() ? "" : String.join(",", invoiceNos));
                 }
             }
         }
diff --git a/emis-biz/src/main/resources/mapper/EmisWriteoffApplyMapper.xml b/emis-biz/src/main/resources/mapper/EmisWriteoffApplyMapper.xml
index b6e447f22..aecd9b7ef 100644
--- a/emis-biz/src/main/resources/mapper/EmisWriteoffApplyMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWriteoffApplyMapper.xml
@@ -14,7 +14,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="applyDate"    column="apply_date"    />
         <result property="writeoffAmount"    column="writeoff_amount"    />
         <result property="payType"    column="pay_type"    />
-        <result property="invoiceNo"    column="invoice_no"    />
         <result property="tradeDate"    column="trade_date"    />
         <result property="recipient"    column="recipient"    />
         <result property="applyMemo"    column="apply_memo"    />
@@ -50,15 +49,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectEmisWriteoffApplyList" parameterType="EmisWriteoffApply" resultMap="EmisWriteoffApplyResult">
-        select wa.id, wa.apply_no, wa.apply_man_code, wa.apply_man_name, wa.apply_site_code, wa.apply_site_name,
+        select distinct wa.id, wa.apply_no, wa.apply_man_code, wa.apply_man_name, wa.apply_site_code, wa.apply_site_name,
                wa.apply_date, wa.writeoff_amount, wa.pay_type, wa.trade_date, wa.recipient, wa.apply_memo, wa.pay_id,
                wa.bl_center_confirmed, wa.center_confirm_man_code, wa.center_confirm_man_name, wa.center_confirm_date,
                wa.center_confirm_note, wa.center_reject_reason, wa.bl_headquarters_confirmed, wa.headquarters_confirm_man_code,
                wa.headquarters_confirm_man_name, wa.headquarters_confirm_date, wa.headquarters_confirm_note,
                wa.headquarters_reject_reason, wa.revoke_date, wa.revoke_man_code, wa.revoke_man_name, wa.revoke_reason,
-               wa.del_flag, wa.create_by, wa.create_time, wa.update_by, wa.update_time, wa.remark,
-               GROUP_CONCAT(DISTINCT ch.invoice_no ORDER BY ch.invoice_no SEPARATOR ',') as invoice_no
+               wa.del_flag, wa.create_by, wa.create_time, wa.update_by, wa.update_time, wa.remark
         from emis_writeoff_apply wa
+        <if test="(params != null and params.queryParams != null and params.queryParams != '') or (settleBillName != null and settleBillName != '')">
             left join emis_writeoff_apply_detail wad on wa.id = wad.apply_id and wad.del_flag = '0'
             left join emis_settle_sub_bill ssb on wad.bill_code = ssb.bill_code and ssb.del_flag = '0'
             left join emis_settle_invoice_bill_rel sibr on ssb.settle_bill_no = sibr.settle_bill_no and sibr.del_flag = '0'
@@ -73,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             group by apply_seq_no
             ) ch2 on ch1.apply_seq_no = ch2.apply_seq_no and ch1.id = ch2.max_id
             where ch1.del_flag = '0'
-            ) ch on sir.apply_seq_no = ch.apply_seq_no
+            ) ch on sir.apply_seq_no = ch.apply_seq_no        </if>
         <if test="settleBillName != null and settleBillName != ''">
             left join emis_settle_bill sb on wad.settle_bill_no = sb.settle_bill_no and sb.del_flag = '0'
         </if>
@@ -148,13 +147,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 )
             </if>
         </where>
-        group by wa.id, wa.apply_no, wa.apply_man_code, wa.apply_man_name, wa.apply_site_code, wa.apply_site_name,
-               wa.apply_date, wa.writeoff_amount, wa.pay_type, wa.trade_date, wa.recipient, wa.apply_memo, wa.pay_id,
-               wa.bl_center_confirmed, wa.center_confirm_man_code, wa.center_confirm_man_name, wa.center_confirm_date,
-               wa.center_confirm_note, wa.center_reject_reason, wa.bl_headquarters_confirmed, wa.headquarters_confirm_man_code,
-               wa.headquarters_confirm_man_name, wa.headquarters_confirm_date, wa.headquarters_confirm_note,
-               wa.headquarters_reject_reason, wa.revoke_date, wa.revoke_man_code, wa.revoke_man_name, wa.revoke_reason,
-               wa.del_flag, wa.create_by, wa.create_time, wa.update_by, wa.update_time, wa.remark
         order by wa.create_time desc
     </select>