From 6a2d847f086d7cea1f1d18948012a6b1febc3905 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Tue, 10 Jun 2025 23:32:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E8=B4=A6=E6=88=B7=E7=9A=84=E6=B5=81?=
 =?UTF-8?q?=E6=B0=B4=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=A4=87=E6=B3=A8?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datasource/vo/AccountVo4InOutList.java    | 10 ++++++++++
 .../resources/mapper_xml/AccountMapperEx.xml  | 20 ++++++++++++-------
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/AccountVo4InOutList.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/AccountVo4InOutList.java
index 5da3dd4f..b9070d61 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/AccountVo4InOutList.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/AccountVo4InOutList.java
@@ -24,6 +24,8 @@ public class AccountVo4InOutList {
 
     private String amList;
 
+    private String remark;
+
     private Long tenantId;
 
     public Long getAccountId() {
@@ -106,6 +108,14 @@ public class AccountVo4InOutList {
         this.amList = amList;
     }
 
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
     public Long getTenantId() {
         return tenantId;
     }
diff --git a/jshERP-boot/src/main/resources/mapper_xml/AccountMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/AccountMapperEx.xml
index 3350a695..1e0da511 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/AccountMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/AccountMapperEx.xml
@@ -201,7 +201,8 @@
 
     <select id="findAccountInOutList" parameterType="com.jsh.erp.datasource.entities.AccountExample" resultMap="ResultInOutList">
         <!--主表出入库涉及的账户 -->
-        select dh.number,concat(dh.sub_type,dh.type) as newType, 'bill' as fromType, s.supplier,dh.change_amount,date_format(dh.oper_time,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList
+        select dh.number,concat(dh.sub_type,dh.type) as newType, 'bill' as fromType, s.supplier,dh.change_amount,
+               date_format(dh.oper_time,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList, dh.remark
         from jsh_depot_head dh left join jsh_supplier s on dh.organ_id = s.id and ifnull(s.delete_flag,'0') !='1'
         where 1=1
         <if test="accountId != null">
@@ -224,7 +225,8 @@
         and ifnull(dh.delete_flag,'0') !='1'
         <!--主表收入和支出涉及的账户 -->
         UNION ALL
-        select ah.bill_no,ah.type as newType, 'financial' as fromType, s.supplier,ah.change_amount,date_format(ah.bill_time,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList
+        select ah.bill_no,ah.type as newType, 'financial' as fromType, s.supplier,ah.change_amount,
+               date_format(ah.bill_time,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList, ah.remark
         from jsh_account_head ah left join jsh_supplier s on ah.organ_id=s.id and ifnull(s.delete_flag,'0') !='1'
         where ah.type!='转账'
         <if test="accountId != null">
@@ -247,7 +249,8 @@
         and ifnull(ah.delete_flag,'0') !='1'
         <!--明细中涉及的账户（收款,付款,收预付款） -->
         UNION ALL
-        select ah.bill_no,ah.type as newType, 'financial' as fromType, s.supplier,ai.each_amount change_amount,date_format(ah.bill_time,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList
+        select ah.bill_no,ah.type as newType, 'financial' as fromType, s.supplier,ai.each_amount change_amount,
+               date_format(ah.bill_time,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList, ah.remark
         from jsh_account_head ah left join jsh_supplier s on ah.organ_id=s.id
         left join jsh_account_item ai on ai.header_id=ah.id and ifnull(ai.delete_flag,'0') !='1'
         where ah.type in ('收款','付款','收预付款')
@@ -271,7 +274,8 @@
         and ifnull(ah.delete_flag,'0') !='1'
         <!--主表中转出的账户 -->
         UNION ALL
-        select ah.bill_no,ah.type as newType, 'financial' as fromType, '' as sName,ah.change_amount,date_format(ah.bill_time,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList
+        select ah.bill_no,ah.type as newType, 'financial' as fromType, '' as sName,ah.change_amount,
+               date_format(ah.bill_time,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList, ah.remark
         from jsh_account_head ah
         where ah.type='转账'
         <if test="accountId != null">
@@ -294,7 +298,8 @@
         and ifnull(ah.delete_flag,'0') !='1'
         <!--明细中被转入的账户 -->
         UNION ALL
-        select ah.bill_no,ah.type as newType, 'financial' as fromType, '' as sName,ai.each_amount change_amount,date_format(ah.bill_time,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList
+        select ah.bill_no,ah.type as newType, 'financial' as fromType, '' as sName,ai.each_amount change_amount,
+               date_format(ah.bill_time,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList, ah.remark
         from jsh_account_head ah left join jsh_account_item ai on ai.header_id=ah.id and ifnull(ai.delete_flag,'0') !='1'
         where ah.type='转账'
         <if test="accountId != null">
@@ -317,8 +322,9 @@
         and ifnull(ah.delete_flag,'0') !='1'
         <!--多账户的情况 -->
         UNION ALL
-        select dh.number,concat(dh.sub_type,dh.type) as newType, 'bill' as fromType, s.supplier,dh.change_amount,date_format(dh.oper_time,'%Y-%m-%d %H:%i:%S') as oTime,
-        dh.account_id_list as AList,dh.account_money_list as AMList
+        select dh.number,concat(dh.sub_type,dh.type) as newType, 'bill' as fromType, s.supplier,dh.change_amount,
+               date_format(dh.oper_time,'%Y-%m-%d %H:%i:%S') as oTime,
+        dh.account_id_list as AList,dh.account_money_list as AMList, dh.remark
         from jsh_depot_head dh left join jsh_supplier s on dh.organ_id = s.id and ifnull(s.delete_flag,'0') !='1'
         where 1=1
         <if test="accountId != null">