From 6bce1430e6357c7a092795ccad72491378836a9a Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Fri, 6 Sep 2024 10:16:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81=E8=BF=87=E8=B4=A6=E5=92=8C?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/op/wms/mapper/WmsProductPutMapper.java   | 2 +-
 .../com/op/wms/service/impl/WmsProductPutServiceImpl.java  | 2 +-
 .../src/main/resources/mapper/wms/WmsProductPutMapper.xml  | 4 ++--
 .../src/main/resources/mapper/wms/WmsRawOrderInMapper.xml  | 7 +++++--
 4 files changed, 9 insertions(+), 6 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 15bfb926..cfdb4584 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,7 +90,7 @@ public interface WmsProductPutMapper {
 
     void updateWmsProductStatus(WmsProductPut wmsProductPut2);
 
-    List<WmsProductPut> selectWmsProductPutSAPByIds(String productOrder);
+    List<WmsProductPut> selectWmsProductPutSAPByIds(@Param("id")String id);
 
 //    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 7a5568c2..3e3db616 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
@@ -282,7 +282,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
                 wmsProductPut) {
             WmsProductPut wmsProductPutSAPById = wmsProductPutMapper.selectWmsProductPutSAPById(wmsProductPut1.getId());
             if (wmsProductPutSAPById != null) {
-                List<WmsProductPut> wmsProductPut2 = wmsProductPutMapper.selectWmsProductPutSAPByIds(wmsProductPutSAPById.getProductOrder());
+                List<WmsProductPut> wmsProductPut2 = wmsProductPutMapper.selectWmsProductPutSAPByIds(wmsProductPutSAPById.getId());
                 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 2175b032..f670fe46 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
@@ -472,11 +472,11 @@
 
         UPDATE wms_product_put
         SET status = '1'
-        WHERE plan_quantity = put_quantity
+        WHERE  <![CDATA[     plan_quantity <= put_quantity  	]]>
           AND status != '1'
         AND id = #{id}
     </update>
-    <select id="selectWmsProductPutSAPByIds"    >
+    <select id="selectWmsProductPutSAPByIds"    parameterType="String" resultMap="WmsProductPutResult">
         SELECT	DISTINCT
             wms_product_put.id,
             wms_product_put.work_order,
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInMapper.xml
index 38b84164..d7d8cd8e 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInMapper.xml
@@ -77,8 +77,10 @@
             <if test="poNo != null  and poNo != ''">and po_no = #{poNo}</if>
             <if test="poLine != null  and poLine != ''">and po_line = #{poLine}</if>
             <if test="poType != null  and poType != ''">and po_type = #{poType}</if>
-            <if test="materialCode != null  and materialCode != ''">and material_code = #{materialCode}</if>
-            <if test="materialDesc != null  and materialDesc != ''">and material_desc = #{materialDesc}</if>
+            <if test="materialCode != null  and materialCode != ''">and material_code like concat('%', #{materialCode},
+                '%')  </if>
+            <if test="materialDesc != null  and materialDesc != ''">and material_desc like concat('%', #{materialDesc},
+                '%') </if>
             <if test="unit != null  and unit != ''">and unit = #{unit}</if>
             <if test="buyerGroup != null  and buyerGroup != ''">and buyer_group = #{buyerGroup}</if>
             <if test="supplyCode != null  and supplyCode != ''">and supply_code = #{supplyCode}</if>
@@ -123,6 +125,7 @@
             <if test="gmtModified != null ">and gmt_modified = #{gmtModified}</if>
             <if test="activeFlag != null  and activeFlag != ''">and active_flag = #{activeFlag}</if>
         </where>
+        ORDER BY	gmt_create	DESC
     </select>
 
     <select id="selectWmsRawOrderInByRawOrderInId" parameterType="String" resultMap="WmsRawOrderInResult">