From aefe0417247687986f17bf2be5ce84329fa07c4e Mon Sep 17 00:00:00 2001
From: zelian_wu <zelian.wu@xujiesoft.com>
Date: Tue, 2 Jul 2024 10:00:14 +0800
Subject: [PATCH] 2024/06/28

---
 src/main/resources/mapper/shipment/ShipmentMapper.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/resources/mapper/shipment/ShipmentMapper.xml b/src/main/resources/mapper/shipment/ShipmentMapper.xml
index 4aab1d7..512777d 100644
--- a/src/main/resources/mapper/shipment/ShipmentMapper.xml
+++ b/src/main/resources/mapper/shipment/ShipmentMapper.xml
@@ -8,6 +8,7 @@
 
     <select id="selectShipmentList" resultType="com.spring.modules.shipment.entity.Shipment">
         select <include refid="columns" /> from v_ifs_shipment ifs
+        inner join customer c on ifs.customer_no = c.customer_no and ifs.site = c.site
         left join shipment_handle sh on ifs.shipment_id = sh.shipment_id and ifs.site = sh.site
         <where>
 <!--            and sh.create_date is null-->
@@ -24,10 +25,12 @@
                 and  #{endDate} >= ifs.ship_date
             </if>
         </where>
+        order by ifs.ship_date desc
     </select>
 
     <select id="selectShipmentPage" resultType="com.spring.modules.shipment.entity.Shipment">
         select <include refid="columns" /> from v_ifs_shipment ifs
+        inner join customer c on ifs.customer_no = c.customer_no and ifs.site = c.site
         left join shipment_handle sh on ifs.shipment_id = sh.shipment_id and ifs.site = sh.site
         <where>
 <!--            and sh.create_date is null-->
@@ -44,6 +47,7 @@
                 and  #{params.endDate} >= ifs.ship_date
             </if>
         </where>
+        order by ifs.ship_date desc
     </select>
 
     <select id="searchTransDetailsubCachData" resultType="com.spring.modules.material.data.TransDetailsubCachData">