From 96b1f12a406d3d8befe4afe0ff0a54e128006612 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Mon, 12 May 2025 17:00:15 +0800
Subject: [PATCH 1/3] =?UTF-8?q?demand:=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=88=AA=E4=BF=A1=E5=BC=80=E7=A5=A8=E8=AE=B0=E5=BD=95=20-=20?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96=E5=A6=82=E4=B8=8B=E5=9B=BE?=
 =?UTF-8?q?=E6=89=80=E7=A4=BA=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/EmisSettleInvoiceChRecord.java     |  9 +++
 .../EmisSettleInvoiceChRecordMapper.xml       | 62 +++++++++++++++++--
 2 files changed, 67 insertions(+), 4 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceChRecord.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceChRecord.java
index b7d6777a0..e5aecb4d9 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceChRecord.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceChRecord.java
@@ -126,4 +126,13 @@ public class EmisSettleInvoiceChRecord extends BaseEntity
     // 申请备注
     private String applyRemark;
 
+    // 发送月份
+    private String sendMonth;
+    // 结算类型
+    private String settleType;
+    // 开票备注
+    private String openBillRemark;
+    // 付款天数
+    private String payDays;
+
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
index 315d8ecae..3953265fd 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
@@ -43,6 +43,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="openChStatusDesc"    column="open_ch_status_desc"    />
         <result property="openComCode"    column="open_com_code"    />
         <result property="extData"    column="ext_data"    />
+        <result property="sendMonth"    column="send_month"    />
+        <result property="settleType"    column="settle_type"    />
+        <result property="openBillRemark"    column="open_bill_remark"    />
+        <result property="payDays"    column="pay_days"    />
 
         <association property="billMonth"  column="apply_seq_no" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectBillMonthByApplySeqNo"/>
         <association property="billCode"  column="apply_seq_no" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectBillCodeByApplySeqNo"/>
@@ -57,10 +61,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectEmisSettleInvoiceChRecordList" parameterType="EmisSettleInvoiceChRecord" resultMap="EmisSettleInvoiceChRecordResult">
-        select id, req_no, apply_seq_no, bl_ecinv, invoice_type, real_invoice_type, company_name, company_tax_no, company_tel, company_address, bank_name, bank_acc_no, contact, phone, tax_rate, open_money, email, saler_company_name, saler_company_tax_no, saler_company_tel, saler_company_address, saler_bank_name, saler_bank_acc_no, saler_contact, saler_phone, saler_checker, saler_payee, invoice_no, file_path, qr_path, op_man_code, op_date, op_site_code, open_ch_id, open_ch_status, open_ch_status_desc, open_com_code, ext_data, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
-        from emis_settle_invoice_ch_record a
-        <where>  
-             del_flag='0'
+        SELECT
+        a.id, a.req_no, a.apply_seq_no, a.bl_ecinv, a.invoice_type, a.real_invoice_type, a.company_name, a.company_tax_no, a.company_tel,
+        a.company_address, a.bank_name, a.bank_acc_no, a.contact, a.phone, a.tax_rate, a.open_money, a.email, a.saler_company_name, a.saler_company_tax_no,
+        a.saler_company_tel, a.saler_company_address, a.saler_bank_name, a.saler_bank_acc_no, a.saler_contact, a.saler_phone, a.saler_checker, a.saler_payee,
+        a.invoice_no, a.file_path, a.qr_path, a.op_man_code, a.op_date, a.op_site_code, a.open_ch_id, a.open_ch_status, a.open_ch_status_desc, a.open_com_code,
+        a.ext_data, a.remark, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.create_site, a.update_site,
+            (SELECT GROUP_CONCAT(DISTINCT CONCAT(SUBSTRING(DATE_FORMAT(w.send_date, '%Y'), 3, 2), DATE_FORMAT(w.send_date, '%m')))
+             FROM emis_waybill w
+             INNER JOIN emis_settle_invoice_rel ir ON w.bill_code = ir.bill_no
+             WHERE ir.apply_seq_no = a.apply_seq_no) as send_month,
+            (SELECT b.settle_type 
+             FROM emis_settle_bill b
+             INNER JOIN emis_settle_invoice_record r ON b.settle_bill_no = r.settle_bill_no
+             WHERE r.apply_seq_no = a.apply_seq_no
+             LIMIT 1) as settle_type,
+            CASE 
+                WHEN (SELECT b.settle_type 
+                      FROM emis_settle_bill b
+                      INNER JOIN emis_settle_invoice_record r ON b.settle_bill_no = r.settle_bill_no
+                      WHERE r.apply_seq_no = a.apply_seq_no
+                      LIMIT 1) = '2' 
+                THEN (
+                    SELECT GROUP_CONCAT(DISTINCT
+                        CONCAT(
+                            CONCAT(SUBSTRING(DATE_FORMAT(w.send_date, '%Y'), 3, 2), DATE_FORMAT(w.send_date, '%m ')),
+                            b.cust_name
+                        )
+                    )
+                    FROM emis_waybill w
+                    INNER JOIN emis_settle_invoice_rel ir ON w.bill_code = ir.bill_no
+                    INNER JOIN emis_settle_invoice_record r ON ir.apply_seq_no = r.apply_seq_no
+                    INNER JOIN emis_settle_bill b ON r.settle_bill_no = b.settle_bill_no
+                    WHERE ir.apply_seq_no = a.apply_seq_no
+                )
+                ELSE (
+                    SELECT GROUP_CONCAT(DISTINCT
+                        CONCAT(
+                            DATE_FORMAT(w.send_date, '%m%d '),
+                            w.send_company
+                        )
+                    )
+                    FROM emis_waybill w
+                    INNER JOIN emis_settle_invoice_rel ir ON w.bill_code = ir.bill_no
+                    WHERE ir.apply_seq_no = a.apply_seq_no
+                )
+            END as open_bill_remark,
+            (SELECT GROUP_CONCAT(DISTINCT CONCAT(DATE_FORMAT(pr.trade_date, '%m/%d'), ' 已付'))
+             FROM emis_settle_pay_record pr
+             INNER JOIN emis_settle_pay_bill_rel pbr ON pr.pay_id = pbr.pay_id
+             INNER JOIN emis_settle_invoice_bill_rel ibr ON ibr.settle_bill_no = pbr.settle_bill_no
+             WHERE ibr.apply_seq_no = a.apply_seq_no) as pay_days
+        FROM emis_settle_invoice_ch_record a
+        <where>
+            del_flag='0'
             <if test="id != null "> and id = #{id}</if>
             <if test="reqNo != null  and reqNo != ''"> and req_no = #{reqNo}</if>
             <if test="applySeqNo != null  and applySeqNo != ''"> and apply_seq_no = #{applySeqNo}</if>

From e9fccff6dd55c96fcd19ca8c588abf6d32bc5926 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Mon, 12 May 2025 17:52:30 +0800
Subject: [PATCH 2/3] =?UTF-8?q?demand:=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=88=AA=E4=BF=A1=E5=BC=80=E7=A5=A8=E8=AE=B0=E5=BD=95=20-=20?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96=E5=A6=82=E4=B8=8B=E5=9B=BE?=
 =?UTF-8?q?=E6=89=80=E7=A4=BA=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/EmisSettleInvoiceChRecordMapper.xml    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
index 3953265fd..0054117f4 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
@@ -73,13 +73,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
              WHERE ir.apply_seq_no = a.apply_seq_no) as send_month,
             (SELECT b.settle_type 
              FROM emis_settle_bill b
-             INNER JOIN emis_settle_invoice_record r ON b.settle_bill_no = r.settle_bill_no
+             INNER JOIN emis_settle_invoice_bill_rel r ON b.settle_bill_no = r.settle_bill_no
              WHERE r.apply_seq_no = a.apply_seq_no
              LIMIT 1) as settle_type,
             CASE 
                 WHEN (SELECT b.settle_type 
                       FROM emis_settle_bill b
-                      INNER JOIN emis_settle_invoice_record r ON b.settle_bill_no = r.settle_bill_no
+                      INNER JOIN emis_settle_invoice_bill_rel r ON b.settle_bill_no = r.settle_bill_no
                       WHERE r.apply_seq_no = a.apply_seq_no
                       LIMIT 1) = '2' 
                 THEN (
@@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     )
                     FROM emis_waybill w
                     INNER JOIN emis_settle_invoice_rel ir ON w.bill_code = ir.bill_no
-                    INNER JOIN emis_settle_invoice_record r ON ir.apply_seq_no = r.apply_seq_no
+                    INNER JOIN emis_settle_invoice_bill_rel r ON ir.apply_seq_no = r.apply_seq_no
                     INNER JOIN emis_settle_bill b ON r.settle_bill_no = b.settle_bill_no
                     WHERE ir.apply_seq_no = a.apply_seq_no
                 )

From a983c455bc0f37d161a0e4d6b4f9161b8e08f4a5 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Tue, 13 May 2025 10:02:42 +0800
Subject: [PATCH 3/3] =?UTF-8?q?demand:=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=88=AA=E4=BF=A1=E5=BC=80=E7=A5=A8=E8=AE=B0=E5=BD=95=20-=20?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96=E5=A6=82=E4=B8=8B=E5=9B=BE?=
 =?UTF-8?q?=E6=89=80=E7=A4=BA=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/EmisSettleInvoiceChRecordMapper.xml  | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
index 0054117f4..cfa020150 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
@@ -107,7 +107,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     WHERE ir.apply_seq_no = a.apply_seq_no
                 )
             END as open_bill_remark,
-            (SELECT GROUP_CONCAT(DISTINCT CONCAT(DATE_FORMAT(pr.trade_date, '%m/%d'), ' 已付'))
+            (SELECT GROUP_CONCAT(DISTINCT 
+                CONCAT(
+                    DATE_FORMAT(pr.trade_date, '%m/%d'), 
+                    ' 已付（',
+                    CASE pr.pay_type
+                        WHEN '1' THEN '企业微信收款'
+                        WHEN '2' THEN '工行汇款3890'
+                        WHEN '3' THEN '微信支付'
+                        WHEN '4' THEN '支付宝'
+                        WHEN '5' THEN '其他'
+                        WHEN '6' THEN '招行付款'
+                        ELSE pr.pay_type
+                    END,
+                    '）'
+                )
+             )
              FROM emis_settle_pay_record pr
              INNER JOIN emis_settle_pay_bill_rel pbr ON pr.pay_id = pbr.pay_id
              INNER JOIN emis_settle_invoice_bill_rel ibr ON ibr.settle_bill_no = pbr.settle_bill_no