From 20a9c5a5e727ac09abba905e7240c476904a399f Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Fri, 10 Oct 2025 16:14:07 +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=94=B6=E6=AC=BE=E6=98=8E=E7=BB=86=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=20-=20=E5=BC=80=E7=A5=A8=E9=87=91=E9=A2=9D=E3=80=81=E5=BC=80?=
 =?UTF-8?q?=E7=A5=A8=E7=8A=B6=E6=80=81=E5=8F=96=E5=80=BC=E4=B8=8D=E5=87=86?=
 =?UTF-8?q?=E7=A1=AE=E9=97=AE=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/EmisSettlePayRecordMapper.xml      | 56 ++++++++++++++++++-
 1 file changed, 53 insertions(+), 3 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml
index fd041a8a1..4307ba44b 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml
@@ -655,7 +655,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getInvoiceAmountsByPayIds" parameterType="java.util.List" resultType="map">
         select
             espbr.pay_id,
-            SUM(esir.money) as total_amount
+            (
+                SUM(esir.money)
+                + COALESCE(
+                    (
+                        select SUM(COALESCE(r.add_open_money, 0))
+                        from emis_settle_invoice_record r
+                        where r.del_flag = '0' and r.invoice_status = '2'
+                          and r.apply_seq_no in (
+                              select distinct esir2.apply_seq_no
+                              from emis_settle_pay_bill_rel espbr2
+                                       left join emis_settle_sub_bill essb2 on espbr2.settle_bill_no = essb2.settle_bill_no
+                                       left join emis_settle_invoice_rel esir2 on essb2.bill_code = esir2.bill_no
+                              where espbr2.del_flag = '0' and essb2.del_flag = '0' and esir2.del_flag = '0'
+                                and espbr2.pay_id = espbr.pay_id
+                          )
+                    ), 0)
+            ) as total_amount
         from emis_settle_pay_bill_rel espbr
         left join emis_settle_sub_bill essb on espbr.settle_bill_no = essb.settle_bill_no
         left join emis_settle_invoice_rel esir on essb.bill_code = esir.bill_no
@@ -708,7 +724,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select
         espbr.pay_id,
         DATE(esir_record.op_date) as invoice_date,
-        SUM(esir.money) as invoice_amount,
+        (
+            SUM(esir.money)
+            + COALESCE(
+                (
+                    select SUM(COALESCE(r.add_open_money, 0))
+                    from emis_settle_invoice_record r
+                    where r.del_flag = '0' and r.invoice_status = '2'
+                      and DATE(r.op_date) = DATE(esir_record.op_date)
+                      and r.company_name = esir_record.company_name
+                      and r.apply_seq_no in (
+                          select distinct esir2.apply_seq_no
+                          from emis_settle_pay_bill_rel espbr2
+                                   left join emis_settle_sub_bill essb2 on espbr2.settle_bill_no = essb2.settle_bill_no
+                                   left join emis_settle_invoice_rel esir2 on essb2.bill_code = esir2.bill_no
+                          where espbr2.del_flag = '0' and essb2.del_flag = '0' and esir2.del_flag = '0'
+                            and espbr2.pay_id = espbr.pay_id
+                      )
+                ), 0)
+        ) as invoice_amount,
         GROUP_CONCAT(DISTINCT esir_record.company_name SEPARATOR ' ') as company_name,
         0 as total_invoice_amount,
         0 as bill_amount
@@ -732,7 +766,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         NULL as invoice_date,
         0 as invoice_amount,
         '' as company_name,
-        SUM(CASE WHEN esir_record.invoice_status = '2' THEN esir.money ELSE 0 END) as total_invoice_amount,
+        (
+            SUM(CASE WHEN esir_record.invoice_status = '2' THEN esir.money ELSE 0 END)
+            + COALESCE(
+                (
+                    select SUM(COALESCE(r.add_open_money, 0))
+                    from emis_settle_invoice_record r
+                    where r.del_flag = '0' and r.invoice_status = '2'
+                      and r.apply_seq_no in (
+                          select distinct esir2.apply_seq_no
+                          from emis_settle_pay_bill_rel espbr2
+                                   left join emis_settle_sub_bill essb2 on espbr2.settle_bill_no = essb2.settle_bill_no
+                                   left join emis_settle_invoice_rel esir2 on essb2.bill_code = esir2.bill_no
+                          where espbr2.del_flag = '0' and essb2.del_flag = '0' and esir2.del_flag = '0'
+                            and espbr2.pay_id = espbr.pay_id
+                      )
+                ), 0)
+        ) as total_invoice_amount,
         MAX(esb.rec_money) as bill_amount
         from emis_settle_pay_bill_rel espbr
         left join emis_settle_sub_bill essb on espbr.settle_bill_no = essb.settle_bill_no