From cff5b58687d9986a10e0fc8425f4c1a0da79b756 Mon Sep 17 00:00:00 2001
From: zelian_wu <zelian.wu@xujiesoft.com>
Date: Mon, 24 Jun 2024 14:12:50 +0800
Subject: [PATCH] 2024/06/17

---
 .../com/spring/modules/shipment/entity/Shipment.java     | 4 ++++
 .../resources/mapper/shipment/ShipmentDetailMapper.xml   | 9 +--------
 src/main/resources/mapper/shipment/ShipmentMapper.xml    | 6 +++---
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/spring/modules/shipment/entity/Shipment.java b/src/main/java/com/spring/modules/shipment/entity/Shipment.java
index 44a7aa4..957def3 100644
--- a/src/main/java/com/spring/modules/shipment/entity/Shipment.java
+++ b/src/main/java/com/spring/modules/shipment/entity/Shipment.java
@@ -22,4 +22,8 @@ public class Shipment {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date shipDate;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createDate;
 }
diff --git a/src/main/resources/mapper/shipment/ShipmentDetailMapper.xml b/src/main/resources/mapper/shipment/ShipmentDetailMapper.xml
index 9094d29..1593154 100644
--- a/src/main/resources/mapper/shipment/ShipmentDetailMapper.xml
+++ b/src/main/resources/mapper/shipment/ShipmentDetailMapper.xml
@@ -3,13 +3,9 @@
 <mapper namespace="com.spring.modules.shipment.mapper.ShipmentDetailMapper">
     <sql id="columns">
         ifs.shipment_id,
-        ifs.site,
         ifs.part_no,
-        ifs.part_desc,
         ifs.sale_qty,
-        ifs.order_ref1,
-        ifs.order_ref2,
-        ifs.order_ref3
+        ifs.lot_batch_no
     </sql>
 
     <select id="queryShipmentDetailList" resultType="com.spring.modules.shipment.entity.ShipmentDetail">
@@ -17,9 +13,6 @@
         <include refid="columns"/>
         from v_ifs_shipment_line ifs
         <where>
-            <if test="site != null and site != ''">
-                and ifs.site = #{site}
-            </if>
             <if test="shipmentId != null and shipmentId != ''">
                 and ifs.shipment_id like #{shipmentId}
             </if>
diff --git a/src/main/resources/mapper/shipment/ShipmentMapper.xml b/src/main/resources/mapper/shipment/ShipmentMapper.xml
index c220f09..4b1b263 100644
--- a/src/main/resources/mapper/shipment/ShipmentMapper.xml
+++ b/src/main/resources/mapper/shipment/ShipmentMapper.xml
@@ -3,14 +3,14 @@
 <mapper namespace="com.spring.modules.shipment.mapper.ShipmentMapper">
 
     <sql id="columns">
-        ifs.shipment_id,ifs.site,ifs.customer_no,ifs.customer_name,ifs.ship_date
+        ifs.shipment_id,ifs.site,ifs.customer_no,ifs.customer_name,ifs.ship_date,sh.create_date
     </sql>
 
     <select id="selectShipmentList" resultType="com.spring.modules.shipment.entity.Shipment">
         select <include refid="columns" /> from v_ifs_shipment ifs
         left join shipment_handle sh on ifs.shipment_id = sh.shipment_id and ifs.site = sh.site
         <where>
-            and sh.create_date is null
+<!--            and sh.create_date is null-->
             <if test="site != null and site != ''">
                 and ifs.site = #{site}
             </if>
@@ -30,7 +30,7 @@
         select <include refid="columns" /> from v_ifs_shipment ifs
         left join shipment_handle sh on ifs.shipment_id = sh.shipment_id and ifs.site = sh.site
         <where>
-            and sh.create_date is null
+<!--            and sh.create_date is null-->
             <if test="params.site != null and params.site != ''">
                 and ifs.site = #{params.site}
             </if>