From 79d0a701e6bce8d18c74097d6ac59855ab908758 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Wed, 4 Sep 2024 11:52:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81=E8=BF=87=E8=B4=A6=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8Dbug2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op/wms/mapper/WmsProductPutMapper.java    |  2 +
 .../impl/WmsProductPutServiceImpl.java        |  2 +-
 .../mapper/wms/WmsProductPutMapper.xml        | 42 ++++++++++++++++++-
 3 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java
index 505a679f..15bfb926 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java
@@ -90,6 +90,8 @@ public interface WmsProductPutMapper {
 
     void updateWmsProductStatus(WmsProductPut wmsProductPut2);
 
+    List<WmsProductPut> selectWmsProductPutSAPByIds(String productOrder);
+
 //    String selectProOrderWorkorder(WmsProductPut wmsProductPut1);
 
 
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
index 9f2a95af..82106f15 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
@@ -280,7 +280,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
                 wmsProductPut) {
             WmsProductPut wmsProductPutSAPById = wmsProductPutMapper.selectWmsProductPutSAPById(wmsProductPut1.getId());
             if (wmsProductPutSAPById != null) {
-                List<WmsProductPut> wmsProductPut2 = wmsProductPutMapper.selectWmsProductPutSAPByProDuct(wmsProductPutSAPById.getProductOrder());
+                List<WmsProductPut> wmsProductPut2 = wmsProductPutMapper.selectWmsProductPutSAPByIds(wmsProductPutSAPById.getProductOrder());
                 if (wmsProductPut2.size() > 0) {
                     List<Map<String, Object>> mapList = new ArrayList<>();
                     Map<String, Object> map = new HashMap<>();
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml
index 0ef49bdb..ef8e5c2c 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml
@@ -294,7 +294,6 @@
 			wms_product_put
 				LEFT JOIN pro_order_workorder ON pro_order_workorder.order_code=wms_product_put.product_order
 		WHERE	 wms_product_put.id = #{id}
-		  AND	wms_product_put.status= '1'
 		  AND wms_product_put.SAP_status IN ( 0, 2 )
 	</select>
     <select id="getReportList" resultType="com.op.system.api.domain.wms.wmsReportWork">
@@ -477,4 +476,45 @@
           AND status != '1'; -- 添加条件以避免不必要的更新
         and id = #{id}
     </update>
+    <select id="selectWmsProductPutSAPByIds"    >
+        SELECT	DISTINCT
+            wms_product_put.id,
+            wms_product_put.work_order,
+            wms_product_put.factory_code,
+            wms_product_put.product_order,
+            wms_product_put.wh_code,
+            wms_product_put.wa_code,
+            wms_product_put.wl_code,
+            wms_product_put.product_name,
+            wms_product_put.product_code,
+            wms_product_put.product_sort,
+            wms_product_put.specification,
+            wms_product_put.unit_of_measure,
+            wms_product_put.plan_quantity,
+            wms_product_put.put_quantity,
+            wms_product_put.status,
+            wms_product_put.SAP_status,
+            wms_product_put.SAP_proof,
+            wms_product_put.SAP_message,
+            wms_product_put.put_date,
+            wms_product_put.batch_number,
+            wms_product_put.attr3,
+            wms_product_put.attr4,
+            wms_product_put.attr5,
+            wms_product_put.attr6,
+            wms_product_put.attr7,
+            wms_product_put.attr8,
+            wms_product_put.attr9,
+            wms_product_put.attr10,
+            wms_product_put.create_by,
+            wms_product_put.create_time,
+            wms_product_put.update_by,
+            wms_product_put.update_time ,
+            pro_order_workorder.product_date
+        FROM
+            wms_product_put
+                LEFT JOIN pro_order_workorder ON pro_order_workorder.workorder_code_sap=wms_product_put.product_order
+        WHERE	    wms_product_put.id = #{id}
+          AND wms_product_put.SAP_status IN ( 0, 2 )
+    </select>
 </mapper>