From fae230d502e7193313800053b64abb515445d1b3 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Fri, 10 Oct 2025 15:49:42 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20=20=20TMS=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=20-=20=E5=AE=A2=E6=88=B7=E8=B4=A6=E5=8D=95=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20-=20=E6=9C=88=E7=BB=93=E8=B4=A6=E5=8D=95=E6=A0=B8=E9=94=80?=
 =?UTF-8?q?=20-=20=E8=BF=90=E5=8D=95=E6=94=B6=E6=AC=BE=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=87=8D=E5=A4=8D=E6=95=B0=E6=8D=AE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

committer: heyu
---
 .../mapper/EmisSettlePayRelMapper.xml         | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisSettlePayRelMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettlePayRelMapper.xml
index 5c581f0ee..675fd9e78 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettlePayRelMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettlePayRelMapper.xml
@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xdadan.erp.emis.mapper.EmisSettlePayRelMapper">
-    
+
     <resultMap type="EmisSettlePayRel" id="EmisSettlePayRelResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="payId"    column="pay_id"    />
@@ -32,16 +32,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                a.update_time,
                a.create_site,
                a.update_site,
-               (select r.apply_seq_no 
-                from emis_settle_pay_invoice_rel r 
-                where r.pay_id = a.pay_id and r.del_flag = '0' 
-                limit 1) as apply_seq_no
+               (
+                   select r.apply_seq_no
+                   from emis_settle_invoice_rel r
+                   where r.bill_no = a.bill_no
+                     and r.del_flag = '0'
+                     and exists (
+                         select 1 from emis_settle_pay_invoice_rel p
+                         where p.apply_seq_no = r.apply_seq_no
+                           and p.pay_id = a.pay_id
+                           and p.del_flag = '0'
+                     )
+                   limit 1
+               ) as apply_seq_no
         from emis_settle_pay_rel a
     </sql>
 
     <select id="selectEmisSettlePayRelList" parameterType="EmisSettlePayRel" resultMap="EmisSettlePayRelWithSubBillResult">
         <include refid="selectEmisSettlePayRelVo"/>
-        <where>  
+        <where>
              a.del_flag='0'
             <if test="id != null "> and a.id = #{id}</if>
             <if test="payId != null  and payId != ''"> and a.pay_id = #{payId}</if>
@@ -100,13 +109,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            and update_site = #{updateSite}
 		limit 1
 	</select>
-  
+
     <select id="selectEmisSettlePayRelById" parameterType="Long" resultMap="EmisSettlePayRelResult">
-        select id, pay_id, bill_no, pay_money, del_flag, create_by, create_time, update_by, update_time, create_site, update_site 
+        select id, pay_id, bill_no, pay_money, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_settle_pay_rel a
         where a.id = #{id}
     </select>
-        
+
     <insert id="insertEmisSettlePayRel" parameterType="EmisSettlePayRel" useGeneratedKeys="true" keyProperty="id">
         insert into emis_settle_pay_rel
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -164,4 +173,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>