From 3e6678a95e434a4c2ca2e8c90350238ed6d9a4c8 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Tue, 8 Oct 2024 15:36:07 +0800
Subject: [PATCH] =?UTF-8?q?wms=E8=BF=87=E8=B4=A6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/wms/mapper/WmsOdsMateStorageNewsSnMapper.java   | 4 +++-
 .../op/wms/service/impl/OdsProcureOrderServiceImpl.java    | 2 +-
 .../main/resources/mapper/wms/OdsProcureOutOrderMapper.xml | 2 +-
 .../resources/mapper/wms/WmsOdsMateStorageNewsSnMapper.xml | 7 +++++++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsMateStorageNewsSnMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsMateStorageNewsSnMapper.java
index fc7411056..712ca93f0 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsMateStorageNewsSnMapper.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsMateStorageNewsSnMapper.java
@@ -77,5 +77,7 @@ public interface WmsOdsMateStorageNewsSnMapper {
 
     public   WmsOdsMateStorageNewsSn selectWmsOdsMateStorageNewsSnByWlCodeTEM(WmsOdsMateStorageNewsSn wmsOdsMateStorageNewsSn);
 
-    void updatesub(WmsOdsMateStorageNews wmsOdsMateStorageNews);
+    public   void updatesub(WmsOdsMateStorageNews wmsOdsMateStorageNews);
+
+    public   void updateWmsOdsMateStorageNewsSnTWM(WmsOdsMateStorageNewsSn wmsRawOrderInNewsSn);
 }
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java
index 321f7b661..bf70c217c 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java
@@ -1501,7 +1501,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
                     wmsRawOrderInNewsSn.setWhCode(wmsRawOrderInSn1.getWhCode());
                     wmsRawOrderInNewsSn.setWlCode(wmsRawOrderInSn1.getWlCode());
                     wmsRawOrderInNewsSn.setUserDefined3("1");
-                    wmsOdsMateStorageNewsSnMapper.updateWmsOdsMateStorageNewsSn(wmsRawOrderInNewsSn);
+                    wmsOdsMateStorageNewsSnMapper.updateWmsOdsMateStorageNewsSnTWM(wmsRawOrderInNewsSn);
                     wmsRawOrderInSn1.setUserDefined1("2");
                     wmsRawOrderInSnMapper.updateWmsRawOrderInSn(wmsRawOrderInSn1);
                     WmsOdsMateStorageNews  wmsOdsMateStorageNews=new WmsOdsMateStorageNews();
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml
index 3fdfe3741..479b6604c 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml
@@ -1390,7 +1390,7 @@
 			<if test="enterpriseId != null  and enterpriseId != ''"> and Enterprise_Id = #{enterpriseId}</if>
 			<if test="enterpriseCode != null  and enterpriseCode != ''"> and Enterprise_Code = #{enterpriseCode}</if>
 		</where>
-
+		ORDER BY	Create_Date	DESC
 	</select>
 	<select id="insertWmsOdsProcureReturnOrder"	parameterType="OdsProcureOutOrder">
 		insert into wms_ods_procure_return_order
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsSnMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsSnMapper.xml
index a41e7a44c..333a33f26 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsSnMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsSnMapper.xml
@@ -188,6 +188,13 @@
         where mate_order_in_sn_id = #{mateOrderInSnId}
     </update>
 
+
+    <update id="updateWmsOdsMateStorageNewsSnTWM" parameterType="WmsOdsMateStorageNewsSn">
+        update wms_ods_mate_storage_news_sn
+        set	   user_defined3   = #{userDefined3},
+                  gmt_modified=GETDATE()
+        where wh_code=#{whCode}	and 	wl_code=#{wlCode}   and wa_code=#{waCode}	and	material_code=#{materialCode}
+    </update>
     <delete id="deleteWmsOdsMateStorageNewsSnByMateOrderInSnId" parameterType="Long">
 		delete from wms_ods_mate_storage_news_sn where mate_order_in_sn_id = #{mateOrderInSnId}
 	</delete>