From e8cb726894aae9648240dd4f1578b891fa80afcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=9D=B0?= <2658502433@qq.com>
Date: Wed, 11 Sep 2024 14:19:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op/wms/mapper/WmsFpStorageNewsMapper.java |   5 +
 .../impl/WmsFpStorageNewsServiceImpl.java     |   2 +-
 .../mapper/wms/WmsFpStorageNewsMapper.xml     | 128 +++++++++++++++++-
 3 files changed, 133 insertions(+), 2 deletions(-)

diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsMapper.java
index 2ad37869..fa6760d4 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsMapper.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsMapper.java
@@ -28,6 +28,11 @@ public interface WmsFpStorageNewsMapper {
      */
     public List<WmsFpStorageNews> selectWmsFpStorageNewsList(WmsFpStorageNews wmsFpStorageNews);
 
+    /*
+    * 展示
+    * */
+    public List<WmsFpStorageNews> selectWmsFpStorageNewsList1(WmsFpStorageNews wmsFpStorageNews);
+
     /**
      * 新增成品库存主表
      *
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsFpStorageNewsServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsFpStorageNewsServiceImpl.java
index acce5e8e..d9f6bcfd 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsFpStorageNewsServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsFpStorageNewsServiceImpl.java
@@ -42,7 +42,7 @@ public class WmsFpStorageNewsServiceImpl implements IWmsFpStorageNewsService {
     @Override
     @DS("#header.poolName")
     public List<WmsFpStorageNews> selectWmsFpStorageNewsList(WmsFpStorageNews wmsFpStorageNews) {
-        return wmsFpStorageNewsMapper.selectWmsFpStorageNewsList(wmsFpStorageNews);
+        return wmsFpStorageNewsMapper.selectWmsFpStorageNewsList1(wmsFpStorageNews);
     }
 
     /**
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsMapper.xml
index a03ec3f1..f93d5667 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsMapper.xml
@@ -41,7 +41,11 @@
     </resultMap>
 
     <sql id="selectWmsFpStorageNewsVo">
-		select storage_id, wh_code, region_code, wa_code, storage_type, wl_code, product_code, product_name, amount, storage_amount, occupy_amount, lpn, product_batch, receive_date, product_date, user_defined1, user_defined2, user_defined3, user_defined4, user_defined5, user_defined6, user_defined7, user_defined8, user_defined9, user_defined10, create_by, gmt_create, last_modified_by, gmt_modified, active_flag, factory_code, sap_factory_code, wl_name from wms_fp_storage_news
+		select storage_id, wh_code, region_code, wa_code, storage_type, wl_code, product_code, product_name, amount,
+		       storage_amount, occupy_amount, lpn, product_batch, receive_date, product_date, user_defined1,
+		       user_defined2, user_defined3, user_defined4, user_defined5, user_defined6, user_defined7,
+		       user_defined8, user_defined9, user_defined10, create_by, gmt_create, last_modified_by,
+		       gmt_modified, active_flag, factory_code, sap_factory_code, wl_name from wms_fp_storage_news
 	</sql>
 
     <select id="selectWmsFpStorageNewsList" parameterType="WmsFpStorageNews" resultMap="WmsFpStorageNewsResult">
@@ -85,6 +89,128 @@
         </where>
         ORDER BY	gmt_create	DESC
     </select>
+
+
+
+    <sql id="selectWmsFpStorageNewsVo1">
+        SELECT
+            storage_id,
+            wh_code,
+            region_code,
+            wa_code,
+            storage_type,
+            wl_code,
+            CASE
+
+                WHEN product_code = '0' THEN
+                    '0' -- 单独的'0'
+                ELSE STUFF( product_code, 1, PATINDEX( '%[^0]%', product_code ) - 1, '' )
+                END AS product_code,
+            product_name,
+            amount,
+            storage_amount,
+            occupy_amount,
+            lpn,
+            product_batch,
+            receive_date,
+            product_date,
+            user_defined1,
+            user_defined2,
+            user_defined3,
+            user_defined4,
+            user_defined5,
+            user_defined6,
+            user_defined7,
+            user_defined8,
+            user_defined9,
+            user_defined10,
+            create_by,
+            gmt_create,
+            last_modified_by,
+            gmt_modified,
+            active_flag,
+            factory_code,
+            sap_factory_code,
+            wl_name
+        FROM
+            wms_fp_storage_news
+    </sql>
+
+    <select id="selectWmsFpStorageNewsList1" parameterType="WmsFpStorageNews" resultMap="WmsFpStorageNewsResult">
+        <include refid="selectWmsFpStorageNewsVo1"/>
+        <where>
+            <if test="storageId != null  and storageId != ''">and storage_id = #{storageId}</if>
+            <if test="whCode != null  and whCode != ''">and wh_code = #{whCode}</if>
+            <if test="regionCode != null  and regionCode != ''">and region_code = #{regionCode}</if>
+            <if test="waCode != null  and waCode != ''">and wa_code = #{waCode}</if>
+            <if test="storageType != null  and storageType != ''">and storage_type = #{storageType}</if>
+            <if test="wlCode != null  and wlCode != ''">and wl_code = #{wlCode}</if>
+            <if test="productCode != null  and productCode != ''">and product_code    like concat('%', #{productCode},
+                '%') </if>
+            <if test="productName != null  and productName != ''">and product_name like concat('%', #{productName},
+                '%')
+            </if>
+            <if test="amount != null ">and amount = #{amount}</if>
+            <if test="storageAmount != null ">and storage_amount = #{storageAmount}</if>
+            <if test="occupyAmount != null ">and occupy_amount = #{occupyAmount}</if>
+            <if test="lpn != null  and lpn != ''">and lpn = #{lpn}</if>
+            <if test="productBatch != null  and productBatch != ''">and product_batch = #{productBatch}</if>
+            <if test="receiveDate != null ">and receive_date = #{receiveDate}</if>
+            <if test="productDate != null ">and product_date = #{productDate}</if>
+            <if test="userDefined1 != null  and userDefined1 != ''">and user_defined1 = #{userDefined1}</if>
+            <if test="userDefined2 != null  and userDefined2 != ''">and user_defined2 = #{userDefined2}</if>
+            <if test="userDefined3 != null  and userDefined3 != ''">and user_defined3 = #{userDefined3}</if>
+            <if test="userDefined4 != null  and userDefined4 != ''">and user_defined4 = #{userDefined4}</if>
+            <if test="userDefined5 != null  and userDefined5 != ''">and user_defined5 = #{userDefined5}</if>
+            <if test="userDefined6 != null  and userDefined6 != ''">and user_defined6 = #{userDefined6}</if>
+            <if test="userDefined7 != null  and userDefined7 != ''">and user_defined7 = #{userDefined7}</if>
+            <if test="userDefined8 != null  and userDefined8 != ''">and user_defined8 = #{userDefined8}</if>
+            <if test="userDefined9 != null  and userDefined9 != ''">and user_defined9 = #{userDefined9}</if>
+            <if test="userDefined10 != null  and userDefined10 != ''">and user_defined10 = #{userDefined10}</if>
+            <if test="gmtCreate != null ">and gmt_create = #{gmtCreate}</if>
+            <if test="lastModifiedBy != null  and lastModifiedBy != ''">and last_modified_by = #{lastModifiedBy}</if>
+            <if test="gmtModified != null ">and gmt_modified = #{gmtModified}</if>
+            <if test="activeFlag != null  and activeFlag != ''">and active_flag = #{activeFlag}</if>
+            <if test="factoryCode != null  and factoryCode != ''">and factory_code = #{factoryCode}</if>
+            <if test="sapFactoryCode != null  and sapFactoryCode != ''">and sap_factory_code = #{sapFactoryCode}</if>
+            <if test="wlName != null  and wlName != ''">and wl_name like concat('%', #{wlName}, '%')</if>
+        </where>
+        ORDER BY	gmt_create	DESC
+    </select>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
     <select id="selectWmsFpStorageNewsByStorageId" parameterType="String" resultMap="WmsFpStorageNewsResult">
         <include refid="selectWmsFpStorageNewsVo"/>