From ef441a5676e13f87de4a6097279c35d04455d795 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Tue, 14 Jan 2025 10:48:32 +0800
Subject: [PATCH] =?UTF-8?q?wms=E6=88=90=E5=93=81=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=8A=A0=E6=88=90?=
 =?UTF-8?q?=E5=93=81=E9=94=80=E5=94=AE=E6=89=8B=E6=8C=81=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E6=94=B9=E5=8A=A8=E6=B7=BB=E5=8A=A0=E5=87=BA=E5=BA=93=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/op/wms/domain/WmsFpStorageNewsSn.java   | 8 ++++++++
 .../main/resources/mapper/wms/WmsFpStorageNewsMapper.xml  | 2 ++
 .../resources/mapper/wms/WmsFpStorageNewsSnMapper.xml     | 5 +++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsFpStorageNewsSn.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsFpStorageNewsSn.java
index ddffdbce..44d46f83 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsFpStorageNewsSn.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsFpStorageNewsSn.java
@@ -40,7 +40,15 @@ public class WmsFpStorageNewsSn extends BaseEntity {
      */
     @Excel(name = "库位编码")
     private String wlCode;
+    private String outAmount;
 
+    public String getOutAmount() {
+        return outAmount;
+    }
+
+    public void setOutAmount(String outAmount) {
+        this.outAmount = outAmount;
+    }
 
     /**
      * 库位编码
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 6f4e4bac..e6a7b91f 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
@@ -38,6 +38,7 @@
         <result property="factoryCode" column="factory_code"/>
         <result property="sapFactoryCode" column="sap_factory_code"/>
         <result property="wlName" column="wl_name"/>
+
     </resultMap>
 
     <sql id="selectWmsFpStorageNewsVo">
@@ -131,6 +132,7 @@
             active_flag,
             factory_code,
             sap_factory_code,
+
             wl_name
         FROM
             wms_fp_storage_news
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml
index c2cb39e7..c5823bcd 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml
@@ -33,10 +33,11 @@
         <result property="activeFlag" column="active_flag"/>
         <result property="factoryCode" column="factory_code"/>
         <result property="sapFactoryCode" column="sap_factory_code"/>
+        <result property="outAmount" column="outAmount"/>
     </resultMap>
 
     <sql id="selectWmsFpStorageNewsSnVo">
-		select storage_id, wh_code, wa_code, wl_code, order_no, product_name, product_code, sn, bar_code, amount, batch_number, 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 from wms_fp_storage_news_sn
+		select storage_id, wh_code, wa_code, wl_code, order_no, product_name, product_code, sn, bar_code, amount, batch_number, 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,  out_amount  outAmount, sap_factory_code from wms_fp_storage_news_sn
 	</sql>
 
     <select id="selectWmsFpStorageNewsSnList" parameterType="WmsFpStorageNewsSn" resultMap="WmsFpStorageNewsSnResult">
@@ -374,7 +375,7 @@
     </delete>
     <update id="updateWmsFpStorageNewsSnOut">
         UPDATE wms_fp_storage_news_sn
-        SET amount = COALESCE(amount, 0) - #{amount}  -- 如果user_defined2为NULL，则先将其设置为0再进行加法
+        SET out_amount = COALESCE(out_amount, 0)+ #{amount}  -- 如果user_defined2为NULL，则先将其设置为0再进行加法
         WHERE storage_id = #{storageId}
           AND active_flag = '1';
     </update>