From 11688cc09c9bcbbb0d1fda93059570cc6067e816 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Thu, 9 Jan 2025 11:25:40 +0800
Subject: [PATCH] =?UTF-8?q?wms=E6=89=8B=E6=8C=81=E6=8E=A5=E5=8F=A3bug2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op/wms/mapper/WmsSellOutEmbryoMapper.java |  2 +
 .../impl/WmsProductPutServiceImpl.java        |  2 +-
 .../mapper/wms/WmsSellOutEmbryoMapper.xml     | 79 +++++++++++++++++++
 3 files changed, 82 insertions(+), 1 deletion(-)

diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsSellOutEmbryoMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsSellOutEmbryoMapper.java
index bebefa809..a6bd4f695 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsSellOutEmbryoMapper.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsSellOutEmbryoMapper.java
@@ -103,4 +103,6 @@ public interface WmsSellOutEmbryoMapper {
     int updateWmsSellOutEmbryoRE(WmsSellOutEmbryo wmsSellOutEmbryo);
 
     public WmsSellOutEmbryo selectWmsSellOutEmbryoByIdRE(String id);
+
+    List<WmsSellOutEmbryo> selectWmsSellOutEmbryoListRE(WmsSellOutEmbryo wmsSellOutEmbryo);
 }
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 80fc29e36..70cd74521 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
@@ -949,7 +949,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
         //wms_sell_out_embryo
         DynamicDataSourceContextHolder.push("ds_" + wmsSellOutEmbryo.getFactoryCode());
         wmsSellOutEmbryo.setActiveFlag("1");
-        List<WmsSellOutEmbryo>  wmsSellOutEmbryoList=     wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoList(wmsSellOutEmbryo);
+        List<WmsSellOutEmbryo>  wmsSellOutEmbryoList=     wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoListRE(wmsSellOutEmbryo);
         return wmsSellOutEmbryoList;
     }
     @Override
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsSellOutEmbryoMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsSellOutEmbryoMapper.xml
index 3989866e1..004aa8afa 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsSellOutEmbryoMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsSellOutEmbryoMapper.xml
@@ -127,6 +127,85 @@
         </where>
         ORDER BY	create_time	DESC
     </select>
+    <select id="selectWmsSellOutEmbryoListRE" parameterType="WmsSellOutEmbryo" resultMap="WmsSellOutEmbryoResult">
+        SELECT
+        id,
+        delivery_order,
+        Item_number,
+        active_flag,
+        factory_code,
+        wh_code,
+        wa_code,
+        wl_code,
+        delivery_place,
+        product_name,
+        product_code,
+        product_sort,
+        specification,
+        unit_of_measure,
+        lot_number,
+        plan_quantity,
+        out_quantity,
+        status,
+        SAP_status,
+        SAP_proof,
+        SAP_message,
+        out_date,
+        attr1,
+        attr2,
+        attr3,
+        attr4,
+        attr5,
+        attr6,
+        attr7,
+        attr8,
+        attr9,
+        attr10,
+        create_by,
+        create_time,
+        update_by,
+        update_time,
+        remark
+        FROM
+        wms_sell_out_embryo_order
+        <where>
+            <if test="deliveryOrder != null  and deliveryOrder != ''">and delivery_order = #{deliveryOrder}</if>
+            <if test="itemNumber != null  and itemNumber != ''">and Item_number = #{itemNumber}</if>
+            <if test="factoryCode != null  and factoryCode != ''">and factory_code = #{factoryCode}</if>
+            <if test="whCode != null  and whCode != ''">and wh_code = #{whCode}</if>
+            <if test="waCode != null  and waCode != ''">and wa_code = #{waCode}</if>
+            <if test="wlCode != null  and wlCode != ''">and wl_code = #{wlCode}</if>
+            <if test="deliveryPlace != null  and deliveryPlace != ''">and delivery_place = #{deliveryPlace}</if>
+            <if test="productName != null  and productName != ''">and product_name like concat('%', #{productName},
+                '%')
+            </if>
+            <if test="productCode != null  and productCode != ''">and product_code = #{productCode}</if>
+            <if test="productSort != null  and productSort != ''">and product_sort = #{productSort}</if>
+            <if test="specification != null  and specification != ''">and specification = #{specification}</if>
+            <if test="unitOfMeasure != null  and unitOfMeasure != ''">and unit_of_measure = #{unitOfMeasure}</if>
+            <if test="lotNumber != null  and lotNumber != ''">and lot_number = #{lotNumber}</if>
+            <if test="planQuantity != null ">and plan_quantity = #{planQuantity}</if>
+            <if test="outQuantity != null ">and out_quantity = #{outQuantity}</if>
+            <if test="status != null  and status != ''">and status = #{status}</if>
+            <if test="sapStatus != null  and sapStatus != ''">and SAP_status = #{sapStatus}</if>
+            <if test="sapProof != null  and sapProof != ''">and SAP_proof = #{sapProof}</if>
+            <if test="sapMessage != null  and sapMessage != ''">and SAP_message = #{sapMessage}</if>
+            <if test="outDate != null ">and out_date = #{outDate}</if>
+            <if test="activeFlag != null  and activeFlag != ''">and active_flag = #{activeFlag}</if>
+            <if test="attr1 != null  and attr1 != ''">and attr1 = #{attr1}</if>
+            <if test="attr2 != null  and attr2 != ''">and attr2 = #{attr2}</if>
+            <if test="attr3 != null  and attr3 != ''">and attr3 = #{attr3}</if>
+            <if test="attr4 != null  and attr4 != ''">and attr4 = #{attr4}</if>
+            <if test="attr5 != null  and attr5 != ''">and attr5 = #{attr5}</if>
+            <if test="attr6 != null  and attr6 != ''">and attr6 = #{attr6}</if>
+            <if test="attr7 != null  and attr7 != ''">and attr7 = #{attr7}</if>
+            <if test="attr8 != null  and attr8 != ''">and attr8 = #{attr8}</if>
+            <if test="attr9 != null  and attr9 != ''">and attr9 = #{attr9}</if>
+            <if test="attr10 != null  and attr10 != ''">and attr10 = #{attr10}</if>
+            <if test="stockOrder != null  and stockOrder != ''">and stock_order = #{stockOrder}</if>
+        </where>
+        ORDER BY	create_time	DESC
+    </select>
     <select id="selectWmsSellOutEmbryoListTS" parameterType="WmsSellOutEmbryo" resultMap="WmsSellOutEmbryoResult">
         SELECT
         id,