From b4eef7489eb225ea5723bea377fcaef753d9e3c5 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Fri, 14 Nov 2025 10:54:24 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20tms-=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8-=E6=9C=88=E7=BB=93=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E5=87=BA=E8=B4=A7=E7=BB=9F=E8=AE=A1-=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=9C=88=E7=BB=93=E5=AE=A2=E6=88=B7=E9=A6=96?=
 =?UTF-8?q?=E6=AC=A1=E7=AD=BE=E7=BA=A6=E6=97=B6=E9=97=B4=20=20tms-?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8-=E6=9C=88=E7=BB=93?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=87=BA=E8=B4=A7=E7=BB=9F=E8=AE=A1-?=
 =?UTF-8?q?=E6=9C=AA=E5=87=BA=E8=B4=A7=E7=9A=84=E6=9C=88=E7=BB=93=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E4=B9=9F=E6=94=AF=E6=8C=81=E6=9F=A5=E8=AF=A2=20commit?=
 =?UTF-8?q?ter:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/MonthlyCustomerShipmentStatVO.java     |   3 +
 .../resources/mapper/EmisWaybillMapper.xml    | 102 +++++++++---------
 2 files changed, 56 insertions(+), 49 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/MonthlyCustomerShipmentStatVO.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/MonthlyCustomerShipmentStatVO.java
index 5921ac8f0..5bed08112 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/MonthlyCustomerShipmentStatVO.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/MonthlyCustomerShipmentStatVO.java
@@ -113,5 +113,8 @@ public class MonthlyCustomerShipmentStatVO implements Serializable {
     private Integer thailandTickets;
     /* 泰国实际重量 */
     private BigDecimal thailandWeight;
+
+    /* 首次签约日期 */
+    private String firstSigningDay;
 }
 
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 23e22b9b8..6143d2891 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -3995,12 +3995,13 @@
     <!-- 查询月结客户出货统计 -->
     <select id="selectMonthlyCustomerShipmentStat" parameterType="EmisWaybill" resultType="map">
         SELECT
-            a.customer_code AS customerCode,
-            a.cust_name AS customerName,
-            a.cust_no AS custNo,
+            cu.customer_code AS customerCode,
+            cu.customer_name AS customerName,
+            cu.monthly_pay_code AS custNo,
+            cu.salesmen AS salesmen,
+            cu.first_signing_day AS firstSigningDay,
             COUNT(DISTINCT a.bill_code) AS totalTickets,
             IFNULL(SUM(a.bill_weight), 0) AS totalWeight,
-            GROUP_CONCAT(DISTINCT cu.salesmen ORDER BY a.order_date SEPARATOR '/') AS salesmen,
             SUM(CASE WHEN a.send_country = '0086' AND tl.trans_type = '1' THEN 1 ELSE 0 END) AS expressTickets,
             IFNULL(SUM(CASE WHEN a.send_country = '0086' AND tl.trans_type = '1' THEN a.bill_weight ELSE 0 END), 0) AS expressWeight,
             SUM(CASE WHEN a.send_country = '0086' AND tl.trans_type = '2' THEN 1 ELSE 0 END) AS airTickets,
@@ -4013,13 +4014,11 @@
             IFNULL(SUM(CASE WHEN a.receive_country = '0086'  THEN a.bill_weight ELSE 0 END), 0) AS importWeight,
             SUM(CASE WHEN a.receive_country != '0086' AND NOT (a.send_country = '0086' AND tl.trans_type IN ('1','2','3','4','5')) THEN 1 ELSE 0 END) AS otherTickets,
             IFNULL(SUM(CASE WHEN a.receive_country != '0086' AND NOT (a.send_country = '0086' AND tl.trans_type IN ('1','2','3','4','5')) THEN a.bill_weight ELSE 0 END), 0) AS otherWeight
-        FROM emis_waybill a
-        LEFT JOIN emis_trans_line tl ON a.trans_line_type = tl.line_code AND tl.del_flag = '0'
-        LEFT JOIN emis_customer_user cu ON a.cust_no = cu.monthly_pay_code AND cu.del_flag = '0'
-        <where>
-            a.del_flag = '0'
-            AND a.order_status !='0'
-            AND a.order_status!='2'
+        FROM emis_customer_user cu
+        LEFT JOIN emis_waybill a ON cu.monthly_pay_code = a.cust_no
+            AND a.del_flag = '0'
+            AND a.order_status != '0'
+            AND a.order_status != '2'
             AND a.cust_no IS NOT NULL
             AND a.cust_no != ''
             <!-- 剔除问题件类型为面单删除、出口虚拟单、返货虚拟单的运单 -->
@@ -4036,16 +4035,6 @@
             <if test="params.endSendDate != null and params.endSendDate != ''">
                 AND a.send_date <![CDATA[ <= ]]> #{params.endSendDate}
             </if>
-            <!-- 客户名称 -->
-            <if test="customerName != null and customerName != ''">
-                AND a.cust_name LIKE CONCAT('%', #{custName}, '%')
-            </if>
-            <if test="customerCode != null and customerCode != ''">
-                AND a.customer_code = #{customerCode}
-            </if>
-            <if test="custNo != null and custNo != ''">
-                AND a.cust_no = #{custNo}
-            </if>
             <!-- 寄件国家 -->
             <if test="sendCountry != null and sendCountry != ''">
                 AND a.send_country = #{sendCountry}
@@ -4061,6 +4050,20 @@
                     </otherwise>
                 </choose>
             </if>
+        LEFT JOIN emis_trans_line tl ON a.trans_line_type = tl.line_code AND tl.del_flag = '0'
+        <where>
+            cu.del_flag = '0'
+            AND cu.customer_type = '2'
+            <!-- 客户名称 -->
+            <if test="customerName != null and customerName != ''">
+                AND (cu.customer_name LIKE CONCAT('%', #{custName}, '%') OR a.cust_name LIKE CONCAT('%', #{custName}, '%'))
+            </if>
+            <if test="customerCode != null and customerCode != ''">
+                AND (cu.customer_code = #{customerCode} OR a.customer_code = #{customerCode})
+            </if>
+            <if test="custNo != null and custNo != ''">
+                AND cu.monthly_pay_code = #{custNo}
+            </if>
             <!-- 销售主管 -->
             <if test="salesExecutive != null and salesExecutive != ''">
                 AND cu.sales_executive LIKE CONCAT('%', #{salesExecutive}, '%')
@@ -4090,19 +4093,20 @@
                 )
             </if>
         </where>
-        GROUP BY a.cust_no
-        ORDER BY a.cust_name
+        GROUP BY cu.monthly_pay_code
+        ORDER BY totalWeight desc,totalTickets desc
     </select>
 
     <!-- 按目的国家查询月结客户出货统计 -->
     <select id="selectMonthlyCustomerShipmentStatByCountry" parameterType="EmisWaybill" resultType="map">
         SELECT
-            a.customer_code AS customerCode,
-            a.cust_name AS customerName,
-            a.cust_no AS custNo,
-            COUNT(DISTINCT a.bill_code) AS totalTickets,
+            cu.customer_code AS customerCode,
+            cu.customer_name AS customerName,
+            cu.monthly_pay_code AS custNo,
+            cu.salesmen AS salesmen,
+            cu.first_signing_day AS firstSigningDay,
+        COUNT(DISTINCT a.bill_code) AS totalTickets,
             IFNULL(SUM(a.bill_weight), 0) AS totalWeight,
-            GROUP_CONCAT(DISTINCT cu.salesmen ORDER BY a.order_date SEPARATOR '/') AS salesmen,
             SUM(CASE WHEN a.receive_country = '0086' THEN 1 ELSE 0 END) AS chinaTickets,
             IFNULL(SUM(CASE WHEN a.receive_country = '0086' THEN a.bill_weight ELSE 0 END), 0) AS chinaWeight,
             SUM(CASE WHEN a.receive_country = '0084' THEN 1 ELSE 0 END) AS vietnamTickets,
@@ -4118,15 +4122,12 @@
             SUM(CASE WHEN a.receive_country = '0066' THEN 1 ELSE 0 END) AS thailandTickets,
             IFNULL(SUM(CASE WHEN a.receive_country = '0066' THEN a.bill_weight ELSE 0 END), 0) AS thailandWeight,
             SUM(CASE WHEN a.receive_country NOT IN ('0086','0084','0855','0095','0880','0856','0066') THEN 1 ELSE 0 END) AS otherTickets,
-            IFNULL(SUM(CASE WHEN a.receive_country NOT IN ('0086','0084','0855','0095','0880','0856','0066') THEN a.bill_weight ELSE 0 END), 0) AS otherWeight,
-            0 AS importTickets,
-            0 AS importWeight
-        FROM emis_waybill a
-        LEFT JOIN emis_customer_user cu ON a.cust_no = cu.monthly_pay_code AND cu.del_flag = '0'
-        <where>
-            a.del_flag = '0'
-            AND a.order_status !='0'
-            AND a.order_status!='2'
+            IFNULL(SUM(CASE WHEN a.receive_country NOT IN ('0086','0084','0855','0095','0880','0856','0066') THEN a.bill_weight ELSE 0 END), 0) AS otherWeight
+        FROM emis_customer_user cu
+        LEFT JOIN emis_waybill a ON cu.monthly_pay_code = a.cust_no
+            AND a.del_flag = '0'
+            AND a.order_status != '0'
+            AND a.order_status != '2'
             AND a.cust_no IS NOT NULL
             AND a.cust_no != ''
             <!-- 剔除问题件类型为面单删除、出口虚拟单、返货虚拟单的运单 -->
@@ -4143,16 +4144,6 @@
             <if test="params.endSendDate != null and params.endSendDate != ''">
                 AND a.send_date <![CDATA[ <= ]]> #{params.endSendDate}
             </if>
-            <!-- 客户名称 -->
-            <if test="customerName != null and customerName != ''">
-                AND a.cust_name LIKE CONCAT('%', #{custName}, '%')
-            </if>
-            <if test="customerCode != null and customerCode != ''">
-                AND a.customer_code = #{customerCode}
-            </if>
-            <if test="custNo != null and custNo != ''">
-                AND a.cust_no = #{custNo}
-            </if>
             <!-- 寄件国家 -->
             <if test="sendCountry != null and sendCountry != ''">
                 AND a.send_country = #{sendCountry}
@@ -4168,6 +4159,19 @@
                     </otherwise>
                 </choose>
             </if>
+        <where>
+            cu.del_flag = '0'
+            AND cu.customer_type = '2'
+            <!-- 客户名称 -->
+            <if test="customerName != null and customerName != ''">
+                AND (cu.customer_name LIKE CONCAT('%', #{custName}, '%') OR a.cust_name LIKE CONCAT('%', #{custName}, '%'))
+            </if>
+            <if test="customerCode != null and customerCode != ''">
+                AND (cu.customer_code = #{customerCode} OR a.customer_code = #{customerCode})
+            </if>
+            <if test="custNo != null and custNo != ''">
+                AND cu.monthly_pay_code = #{custNo}
+            </if>
             <!-- 销售主管 -->
             <if test="salesExecutive != null and salesExecutive != ''">
                 AND cu.sales_executive LIKE CONCAT('%', #{salesExecutive}, '%')
@@ -4197,8 +4201,8 @@
                 )
             </if>
         </where>
-        GROUP BY a.cust_no
-        ORDER BY a.cust_name
+        GROUP BY cu.monthly_pay_code
+        ORDER BY totalWeight desc,totalTickets desc
     </select>
 
     <!-- 查询月结客户出货明细 -->