From 85fdf2894b80b41630e74cc025af738f47e8a8d1 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 20 Jul 2024 16:09:53 +0800
Subject: [PATCH] md

---
 .../erp/emis/domain/EmisSettleSubBill.java    |  2 ++
 .../erp/emis/domain/vo/WaybillOrder.java      |  2 ++
 .../mapper/EmisSettleSubBillMapper.xml        | 21 +++++++++++++------
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java
index 8ce992dea..0b40219e5 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java
@@ -63,6 +63,8 @@ public class EmisSettleSubBill extends BaseEntity
     private String billMonth;
     /* 月结编号 */
     private String custNo;
+    /* 月结客户名称 */
+    private String custName;
     /* 客户编码 */
     private String customerCode;
     /* 客户名称 */
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
index 9083d0c54..6db94d2cd 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
@@ -72,6 +72,7 @@ public class WaybillOrder  implements Serializable {
 
     /* 支付月结编号 */
     private String custNo;
+    private String custName;
 
     /* 快递线路 */
     private String transLine;
@@ -468,6 +469,7 @@ public class WaybillOrder  implements Serializable {
         voItem.setPaymentType(dbWaybill.getPaymentType());
         voItem.setCalcFeeType(dbWaybill.getCalcFeeType());
         voItem.setCustNo(dbWaybill.getCustNo());
+        voItem.setCustName(dbWaybill.getCustName());
 
         voItem.setTransLine(dbWaybill.getTransLineType());
         voItem.setProductType(dbWaybill.getProductType());
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
index 0fedb301a..7d44ce716 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
@@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="blMerge"    column="bl_merge"    />
         <result property="billMonth"    column="bill_month"    />
         <result property="custNo"    column="cust_no"    />
+        <result property="custName"    column="cust_name"    />
         <result property="customerCode"    column="customer_code"    />
         <result property="customerName"    column="customer_name"    />
         <result property="payee"    column="payee"    />
@@ -60,12 +61,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <sql id="selectEmisSettleSubBillVo">
-        select id, bill_no, parent_bill_no, settle_bill_no, bill_code, bill_date, bill_fee, currency, settle_type, bl_split, bl_merge, bill_month, cust_no, customer_code, customer_name, payee, salesmen, bl_special_quote, bl_sensitive, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_settle_sub_bill
+        select id, bill_no, parent_bill_no, settle_bill_no, bill_code, bill_date, bill_fee, currency, settle_type, bl_split, bl_merge, bill_month, cust_no, cust_name, customer_code, customer_name, payee, salesmen, bl_special_quote, bl_sensitive, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_settle_sub_bill
     </sql>
 
     <select id="selectEmisSettleSubBillList" parameterType="EmisSettleSubBill" resultMap="EmisSettleSubBillResult">
         select b.id, b.bill_no, b.parent_bill_no, b.settle_bill_no, b.bill_code, b.bill_date,
-        b.bill_fee, b.currency, b.settle_type, b.bl_split, b.bl_merge, b.bill_month, b.cust_no,
+        b.bill_fee, b.currency, b.settle_type, b.bl_split, b.bl_merge, b.bill_month, b.cust_no,b.cust_name,
         b.customer_code, b.customer_name, b.payee, b.salesmen, b.bl_special_quote, b.bl_sensitive,
         b.bl_confirm_center, b.confirm_center_date, b.confirm_center_note, b.confirm_center_man_code,
          b.confirm_center_code, b.bl_confirm_site, b.confirm_site_date, b.confirm_site_man_code,
@@ -89,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="blSplit != null  and blSplit != ''"> and bl_split=#{blSplit}</if>
             <if test="billMonth != null  and billMonth != ''"> and bill_month=#{billMonth}</if>
             <if test="custNo != null  and custNo != ''"> and b.cust_no=#{custNo}</if>
+            <if test="custName != null  and custName != ''"> and b.cust_name like concat('%', #{custName}, '%')</if>
             <if test="customerCode != null  and customerCode != ''"> and b.customer_code=#{customerCode}</if>
             <if test="customerName != null  and customerName != ''"> and b.customer_name like concat('%', #{customerName}, '%')</if>
 
@@ -212,6 +214,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="blSplit != null  and blSplit != ''"> and bl_split=#{blSplit}</if>
             <if test="billMonth != null  and billMonth != ''"> and bill_month=#{billMonth}</if>
             <if test="custNo != null  and custNo != ''"> and b.cust_no=#{custNo}</if>
+            <if test="custName != null  and custName != ''"> and b.cust_name like concat('%', #{custName}, '%')</if>
+
             <if test="customerCode != null  and customerCode != ''"> and b.customer_code=#{customerCode}</if>
             <if test="customerName != null  and customerName != ''"> and b.customer_name like concat('%', #{customerName}, '%')</if>
 
@@ -318,7 +322,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         count(a.bill_code) as totalNum,
         round(sum(b.bill_fee),2) as totalBillFee,
         b.cust_no as custNo,
-        max(b.customer_name)  as customerName,
+        max(b.custName)  as custName,
         sum(a.parcel_qty) as parcelQty,
         sum(a.bill_weight) as totalBillWeight,
         sum(a.total_volume) as totalVolume,
@@ -345,6 +349,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="blSplit != null  and blSplit != ''"> and bl_split=#{blSplit}</if>
             <if test="billMonth != null  and billMonth != ''"> and bill_month=#{billMonth}</if>
             <if test="custNo != null  and custNo != ''"> and b.cust_no=#{custNo}</if>
+            <if test="custName != null  and custName != ''"> and b.cust_name like concat('%', #{custName}, '%')</if>
+
             <if test="customerCode != null  and customerCode != ''"> and b.customer_code=#{customerCode}</if>
             <if test="customerName != null  and customerName != ''"> and b.customer_name like concat('%', #{customerName}, '%')</if>
 
@@ -490,20 +496,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectEmisSettleSubBillById" parameterType="Long" resultMap="EmisSettleSubBillResult">
-        select id, bill_no, parent_bill_no, settle_bill_no, bill_code, bill_date, bill_fee, currency, settle_type, bl_split, bl_merge, bill_month, cust_no, customer_code, customer_name, payee, salesmen, bl_special_quote, bl_sensitive, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        select id, bill_no, parent_bill_no, settle_bill_no, bill_code, bill_date, bill_fee, currency, settle_type, bl_split, bl_merge, bill_month, cust_no, cust_name, customer_code, customer_name, payee, salesmen, bl_special_quote, bl_sensitive, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_settle_sub_bill a
         where a.id = #{id}
     </select>
 
     <select id="selectSettleSubBillByBillCode" parameterType="String" resultMap="EmisSettleSubBillResult">
-        select id, bill_no, parent_bill_no, settle_bill_no, bill_code, bill_date, bill_fee, currency, settle_type, bl_split, bl_merge, bill_month, cust_no, customer_code, customer_name, payee, salesmen, bl_special_quote, bl_sensitive, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        select id, bill_no, parent_bill_no, settle_bill_no, bill_code, bill_date, bill_fee, currency, settle_type, bl_split, bl_merge, bill_month, cust_no, cust_name, customer_code, customer_name, payee, salesmen, bl_special_quote, bl_sensitive, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_settle_sub_bill a
         where a.del_flag='0' and a.bill_code = #{billCode} and a.parent_bill_no='0' limit 1
     </select>
 
 
     <select id="selectSettleSubBillBySubBillNo" parameterType="String" resultMap="EmisSettleSubBillResult">
-        select id, bill_no, parent_bill_no, settle_bill_no, bill_code, bill_date, bill_fee, currency, settle_type, bl_split, bl_merge, bill_month, cust_no, customer_code, customer_name, payee, salesmen, bl_special_quote, bl_sensitive, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        select id, bill_no, parent_bill_no, settle_bill_no, bill_code, bill_date, bill_fee, currency, settle_type, bl_split, bl_merge, bill_month, cust_no, cust_name, customer_code, customer_name, payee, salesmen, bl_special_quote, bl_sensitive, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_settle_sub_bill a
         where a.del_flag='0' and a.bill_no = #{subBillNo}  limit 1
     </select>
@@ -525,6 +531,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="blMerge != null and blMerge != ''">bl_merge,</if>
             <if test="billMonth != null and billMonth != ''">bill_month,</if>
             <if test="custNo != null and custNo != ''">cust_no,</if>
+            <if test="custName != null and custName != ''">cust_name,</if>
             <if test="customerCode != null and customerCode != ''">customer_code,</if>
             <if test="customerName != null and customerName != ''">customer_name,</if>
             <if test="payee != null and payee != ''">payee,</if>
@@ -563,6 +570,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="blMerge != null and blMerge != ''">#{blMerge},</if>
             <if test="billMonth != null and billMonth != ''">#{billMonth},</if>
             <if test="custNo != null and custNo != ''">#{custNo},</if>
+            <if test="custName != null and custName != ''">#{custName},</if>
             <if test="customerCode != null and customerCode != ''">#{customerCode},</if>
             <if test="customerName != null and customerName != ''">#{customerName},</if>
             <if test="payee != null and payee != ''">#{payee},</if>
@@ -604,6 +612,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="blMerge != null and blMerge != ''">bl_merge = #{blMerge},</if>
             <if test="billMonth != null and billMonth != ''">bill_month = #{billMonth},</if>
             <if test="custNo != null and custNo != ''">cust_no = #{custNo},</if>
+            <if test="custName != null and custName != ''">cust_name = #{custName},</if>
             <if test="customerCode != null and customerCode != ''">customer_code = #{customerCode},</if>
             <if test="customerName != null and customerName != ''">customer_name = #{customerName},</if>
             <if test="payee != null and payee != ''">payee = #{payee},</if>