diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsSellOutEmbryoController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsSellOutEmbryoController.java
index cd1e0d8ca..c9a37c696 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsSellOutEmbryoController.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsSellOutEmbryoController.java
@@ -46,7 +46,16 @@ public class WmsSellOutEmbryoController extends BaseController {
         List<WmsSellOutEmbryo> list = wmsSellOutEmbryoService.selectWmsSellOutEmbryoList(wmsSellOutEmbryo);
         return getDataTable(list);
     }
+    /**
+     * 查询成品销售出库列表
+     */
 
+    @GetMapping("/listRE")
+    public TableDataInfo listRE(WmsSellOutEmbryo wmsSellOutEmbryo) {
+        startPage();
+        List<WmsSellOutEmbryo> list = wmsSellOutEmbryoService.selectWmsSellOutEmbryoREList(wmsSellOutEmbryo);
+        return getDataTable(list);
+    }
     /**
      * 导出成品销售出库列表
      */
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsSellOutEmbryo.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsSellOutEmbryo.java
index b39f2893c..73285102b 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsSellOutEmbryo.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsSellOutEmbryo.java
@@ -54,6 +54,16 @@ public class WmsSellOutEmbryo extends BaseEntity {
     @Excel(name = "库区编码")
     private String waCode;
 
+    private String stockOrder;
+
+    public String getStockOrder() {
+        return stockOrder;
+    }
+
+    public void setStockOrder(String stockOrder) {
+        this.stockOrder = stockOrder;
+    }
+
     /**
      * 库位编码
      */
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsSnMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsSnMapper.java
index 32d512d25..e222a3785 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsSnMapper.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsSnMapper.java
@@ -89,4 +89,8 @@ public interface WmsFpStorageNewsSnMapper {
     public  void addBatchPallet(@Param("list")List<ProOrderWorkorder> dtos);
 
     public List<WmsFpStorageNewsSn> selectBSKList(WmsFpStorageNewsSn proOrderWorkorder);
+
+    List<WmsFpStorageNewsSn> selectWmsFpStorageNewsSnSTList(WmsFpStorageNewsSn wmsFpStorageNewsSn);
+
+    public   void insertWmsFpStorageNewsSnRecords(WmsFpStorageNewsSn wmsFpStorageNewsSn3);
 }
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 314427897..b78de1f44 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
@@ -85,4 +85,6 @@ public interface WmsSellOutEmbryoMapper {
     void updateWmsAllocationOutEmbryo(WmsAllocationOutEmbryo wmsAllocationOutEmbryo);
 
     void updateWmsSellOutEmbryotwo(WmsSellOutEmbryo wmsSellOutEmbryoUpdate);
+
+    List<WmsSellOutEmbryo> selectWmsSellOutEmbryoREList(WmsSellOutEmbryo wmsSellOutEmbryo);
 }
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsSellOutEmbryoService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsSellOutEmbryoService.java
index 70ff03227..4ba24d1ee 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsSellOutEmbryoService.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsSellOutEmbryoService.java
@@ -78,4 +78,6 @@ public interface IWmsSellOutEmbryoService {
     public WmsSellOutEmbryo selectWmsSellOutEmbryoByOrderCodeAndProductCode(String deliveryOrder, String productCode);
 
     void SynchronizationOfShippingDocuments();
+
+    List<WmsSellOutEmbryo> selectWmsSellOutEmbryoREList(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 28939138d..286cf0de7 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
@@ -856,58 +856,36 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
             wmsFpStorageNewsSn1.setActiveFlag("1");
             wmsFpStorageNewsSn1.setProductCode(wmsSellOutEmbryo1.getProductCode());
             wmsFpStorageNewsSnMapper.updateWmsFpStorageNewsSnOut(wmsFpStorageNewsSn1);
-        }
-
-
-
-
-
-        //成品销售出库--确认接口---修改出库单，--出库库存
-        WmsSellOutEmbryo    wmsSellOutEmbryo1 =   wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoById(wmsSellOutEmbryo.getId());
-        Integer tem=   wmsProductPutTrayCodeList.size();
-        BigDecimal OutQuantity=   wmsSellOutEmbryo1.getOutQuantity().add(new BigDecimal(tem));//2
-        int result = wmsSellOutEmbryo1.getPlanQuantity().compareTo(OutQuantity);
-        WmsSellOutEmbryo    wmsSellOutEmbryoUpdate=new  WmsSellOutEmbryo();
-        if (result == 0){//出库完
-            wmsSellOutEmbryoUpdate.setStatus("1");
-        }else {
-            wmsSellOutEmbryoUpdate.setStatus("0");
-        }
-        wmsSellOutEmbryoUpdate.setId(wmsSellOutEmbryo.getId());
-        wmsSellOutEmbryoUpdate.setOutQuantity(OutQuantity);
-        wmsSellOutEmbryoMapper.updateWmsSellOutEmbryo(wmsSellOutEmbryoUpdate);
-        //订单修改完成
-        for(WmsProductPutTrayCode   wmsProductPutTrayCode:   wmsProductPutTrayCodeList){//库存修改
-            //解除绑定
-            wmsProductPutTrayCode.setRelatStatus("0");
-            wmsProductPutTrayCodeMapper.updateWmsProductPutTrayCode(wmsProductPutTrayCode);
-            //改明细
-            WmsFpStorageNewsSn  wmsFpStorageNewsSn=new WmsFpStorageNewsSn();
-            wmsFpStorageNewsSn.setSn(wmsProductPutTrayCode.getSn());
-            wmsFpStorageNewsSn.setWlCode(wmsProductPutTrayCode.getWlCode());
-            wmsFpStorageNewsSn.setActiveFlag("1");
-            wmsFpStorageNewsSn.setProductCode(wmsSellOutEmbryo1.getProductCode());
-            wmsFpStorageNewsSnMapper.updateWmsFpStorageNewsSnOut(wmsFpStorageNewsSn);
-            //判断如果托盘数据被出完，就关闭这个明细
-//            List<WmsFpStorageNewsSn>    wmsFpStorageNewsSns=  wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnList(wmsFpStorageNewsSn);
-            if (wmsFpStorageNewsSns.size()>0){
-                WmsFpStorageNewsSn  wmsFpStorageNewsSn1=    wmsFpStorageNewsSns.get(0);
-
-                BigDecimal  ken=    new   BigDecimal(wmsFpStorageNewsSn1.getUserDefined2());
-                int comparisonResult = ken.compareTo(wmsFpStorageNewsSn1.getAmount());
-                if (comparisonResult == 0) {
-                    // ken和amount相等
-                    wmsFpStorageNewsSn1.setActiveFlag("0");
-                    wmsFpStorageNewsSnMapper.updateWmsFpStorageNewsSn(wmsFpStorageNewsSn1);
-                }
-            }
-            //改主表
+            WmsFpStorageNewsSn   wmsFpStorageNewsSn2=  wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnByStorageId(wmsFpStorageNewsSn.getStorageId());
+            WmsFpStorageNewsSn  wmsFpStorageNewsSn3=new WmsFpStorageNewsSn();
+            wmsFpStorageNewsSn3.setStorageId(IdUtils.fastSimpleUUID());
+            wmsFpStorageNewsSn3.setWhCode(wmsFpStorageNewsSn2.getWhCode());
+            wmsFpStorageNewsSn3.setWaCode(wmsFpStorageNewsSn2.getWaCode());
+            wmsFpStorageNewsSn3.setWlCode(wmsFpStorageNewsSn2.getWlCode());
+            wmsFpStorageNewsSn3.setOrderNo(wmsFpStorageNewsSn2.getOrderNo());
+            wmsFpStorageNewsSn3.setProductCode(wmsFpStorageNewsSn2.getProductCode());
+            wmsFpStorageNewsSn3.setProductName(wmsFpStorageNewsSn2.getProductName());
+            wmsFpStorageNewsSn3.setSn(wmsFpStorageNewsSn2.getSn());
+            wmsFpStorageNewsSn3.setBatchNumber(wmsFpStorageNewsSn2.getBatchNumber());
+            wmsFpStorageNewsSn3.setUserDefined3(wmsFpStorageNewsSn2.getUserDefined3());
+            wmsFpStorageNewsSn3.setCreateTime(new Date());
+            wmsFpStorageNewsSn3.setCreateBy(wmsFpStorageNewsSn2.getCreateBy());
+            wmsFpStorageNewsSn3.setActiveFlag(wmsFpStorageNewsSn2.getActiveFlag());
+            wmsFpStorageNewsSn3.setAmount(wmsFpStorageNewsSn.getAmount());
+            wmsFpStorageNewsSn3.setBarCode(wmsSellOutEmbryo.getId());
+            wmsFpStorageNewsSn3.setFactoryCode(wmsSellOutEmbryo.getFactoryCode());
+            wmsFpStorageNewsSnMapper.insertWmsFpStorageNewsSnRecords(wmsFpStorageNewsSn3);
             WmsFpStorageNews    wmsFpStorageNews=new WmsFpStorageNews();
             wmsFpStorageNews.setActiveFlag("1");
-            wmsFpStorageNews.setWlCode(wmsProductPutTrayCode.getWlCode());
+            wmsFpStorageNews.setWlCode(wmsFpStorageNewsSn2.getWlCode());
             wmsFpStorageNews.setProductCode(wmsSellOutEmbryo1.getProductCode());
+            wmsFpStorageNews.setProductBatch(wmsFpStorageNewsSn2.getBatchNumber());
+            wmsFpStorageNews.setAmount(wmsFpStorageNewsSn.getAmount());
+            wmsFpStorageNews.setWhCode(wmsFpStorageNewsSn2.getWhCode());
+            wmsFpStorageNews.setWaCode(wmsFpStorageNewsSn2.getWaCode());
             wmsFpStorageNewsMapper.updateWmsFpStorageNewsOut(wmsFpStorageNews);
         }
+
         return result1;
     }
 
@@ -919,7 +897,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
         WmsFpStorageNewsSn  wmsFpStorageNewsSn=new WmsFpStorageNewsSn();
         wmsFpStorageNewsSn.setSn(wmsProductPutTrayCode.getSn());
         wmsFpStorageNewsSn.setActiveFlag("1");
-        List<WmsFpStorageNewsSn>    wmsFpStorageNewsSns=   wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnList(wmsFpStorageNewsSn);
+        List<WmsFpStorageNewsSn>    wmsFpStorageNewsSns=   wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnSTList(wmsFpStorageNewsSn);
         return wmsFpStorageNewsSns;
     }
 
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsSellOutEmbryoServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsSellOutEmbryoServiceImpl.java
index bd6ff541a..9888fb8a8 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsSellOutEmbryoServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsSellOutEmbryoServiceImpl.java
@@ -155,7 +155,11 @@ public class WmsSellOutEmbryoServiceImpl implements IWmsSellOutEmbryoService {
         List<WmsSellOutEmbryo>  wmsSellOutEmbryoList=    dayin();
     }
 
-
+    @Override
+    @DS("#header.poolName")
+    public List<WmsSellOutEmbryo> selectWmsSellOutEmbryoREList(WmsSellOutEmbryo wmsSellOutEmbryo) {
+        return wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoREList(wmsSellOutEmbryo);
+    }
 
 
     public List<WmsSellOutEmbryo> dayin(  ) {
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 88f323924..bad947c4a 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
@@ -621,7 +621,8 @@
 			product_date	Plan_Date,
 			prod_type	User_Defined1
 		FROM	mes_prepare
-		WHERE workorder_name LIKE CONCAT('%', #{produceCode}, '%');
+		WHERE workorder_name LIKE CONCAT('%', #{produceCode}, '%')
+		and del_flag='0'
 	</select>
 <select id="selectOdsProcureOutOrderListZUfc"	parameterType="OdsProcureOutOrder" resultMap="OdsProcureOutOrderResult">
 	SELECT
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 f93d5667b..6f4e4bac5 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
@@ -420,7 +420,7 @@
     </delete>
     <update id="updateWmsFpStorageNewsOut">
         update wms_fp_storage_news
-        set amount = COALESCE(amount, 0) - 1
-        where product_code = #{productCode} and wl_code = #{wlCode}  and active_flag='1'
+        set amount = COALESCE(amount, 0) - #{amount}
+        where product_code = #{productCode} and wl_code = #{wlCode} and wh_code = #{whCode} and wa_code = #{waCode}  and active_flag='1'  and  product_batch=#{productBatch}
     </update>
 </mapper>
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 0675a0ea0..d5c54a27c 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
@@ -16,6 +16,7 @@
         <result property="barCode" column="bar_code"/>
         <result property="amount" column="amount"/>
         <result property="batchNumber" column="batch_number"/>
+        <result property="userDefined1" column="user_defined1"/>
         <result property="userDefined2" column="user_defined2"/>
         <result property="userDefined3" column="user_defined3"/>
         <result property="userDefined4" column="user_defined4"/>
@@ -267,7 +268,67 @@
             <if test="sapFactoryCode != null">#{sapFactoryCode},</if>
         </trim>
     </insert>
-
+    <insert id="insertWmsFpStorageNewsSnRecords" parameterType="WmsFpStorageNewsSn">
+        insert into wms_fp_storage_news_sn_records
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="storageId != null">storage_id,</if>
+            <if test="whCode != null">wh_code,</if>
+            <if test="waCode != null">wa_code,</if>
+            <if test="wlCode != null">wl_code,</if>
+            <if test="orderNo != null">order_no,</if>
+            <if test="productName != null">product_name,</if>
+            <if test="productCode != null">product_code,</if>
+            <if test="sn != null">sn,</if>
+            <if test="barCode != null">bar_code,</if>
+            <if test="amount != null">amount,</if>
+            <if test="batchNumber != null">batch_number,</if>
+            <if test="userDefined2 != null">user_defined2,</if>
+            <if test="userDefined3 != null">user_defined3,</if>
+            <if test="userDefined4 != null">user_defined4,</if>
+            <if test="userDefined5 != null">user_defined5,</if>
+            <if test="userDefined6 != null">user_defined6,</if>
+            <if test="userDefined7 != null">user_defined7,</if>
+            <if test="userDefined8 != null">user_defined8,</if>
+            <if test="userDefined9 != null">user_defined9,</if>
+            <if test="userDefined10 != null">user_defined10,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="gmtCreate != null">gmt_create,</if>
+            <if test="lastModifiedBy != null">last_modified_by,</if>
+            <if test="gmtModified != null">gmt_modified,</if>
+            <if test="activeFlag != null">active_flag,</if>
+            <if test="factoryCode != null">factory_code,</if>
+            <if test="sapFactoryCode != null">sap_factory_code,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="storageId != null">#{storageId},</if>
+            <if test="whCode != null">#{whCode},</if>
+            <if test="waCode != null">#{waCode},</if>
+            <if test="wlCode != null">#{wlCode},</if>
+            <if test="orderNo != null">#{orderNo},</if>
+            <if test="productName != null">#{productName},</if>
+            <if test="productCode != null">#{productCode},</if>
+            <if test="sn != null">#{sn},</if>
+            <if test="barCode != null">#{barCode},</if>
+            <if test="amount != null">#{amount},</if>
+            <if test="batchNumber != null">#{batchNumber},</if>
+            <if test="userDefined2 != null">#{userDefined2},</if>
+            <if test="userDefined3 != null">#{userDefined3},</if>
+            <if test="userDefined4 != null">#{userDefined4},</if>
+            <if test="userDefined5 != null">#{userDefined5},</if>
+            <if test="userDefined6 != null">#{userDefined6},</if>
+            <if test="userDefined7 != null">#{userDefined7},</if>
+            <if test="userDefined8 != null">#{userDefined8},</if>
+            <if test="userDefined9 != null">#{userDefined9},</if>
+            <if test="userDefined10 != null">#{userDefined10},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="gmtCreate != null">#{gmtCreate},</if>
+            <if test="lastModifiedBy != null">#{lastModifiedBy},</if>
+            <if test="gmtModified != null">#{gmtModified},</if>
+            <if test="activeFlag != null">#{activeFlag},</if>
+            <if test="factoryCode != null">#{factoryCode},</if>
+            <if test="sapFactoryCode != null">#{sapFactoryCode},</if>
+        </trim>
+    </insert>
     <update id="updateWmsFpStorageNewsSn" parameterType="WmsFpStorageNewsSn">
         update wms_fp_storage_news_sn
         <trim prefix="SET" suffixOverrides=",">
@@ -312,9 +373,10 @@
         </foreach>
     </delete>
     <update id="updateWmsFpStorageNewsSnOut">
-        update wms_fp_storage_news_sn
-        set user_defined2 = #{userDefined2} + 1
-        where storage_id=#{storageId}  and active_flag='1'
+        UPDATE wms_fp_storage_news_sn
+        SET user_defined2 = COALESCE(user_defined2, 0) + #{userDefined2}  -- 如果user_defined2为NULL，则先将其设置为0再进行加法
+        WHERE storage_id = #{storageId}
+          AND active_flag = '1';
     </update>
     <select id="selectwmsFpStorageNews"     resultType="java.lang.String">
         select  DISTINCT user_defined1 from  wms_fp_storage_news  where   product_code=#{productCode} and active_flag='1'
@@ -437,5 +499,67 @@
             </trim>
         </foreach>
     </insert>
-
+    <select id="selectWmsFpStorageNewsSnSTList">
+        SELECT
+        storage_id,
+        wh_code,
+        wa_code,
+        wl_code,
+        order_no,
+        product_name,
+        product_code,
+        sn,
+        bar_code,
+        COALESCE(amount, 0) ,
+        batch_number,
+        COALESCE(user_defined1, 0) AS user_defined1,  -- 如果为空则返回0
+        COALESCE(user_defined2, 0) AS user_defined2,  -- 如果为空则返回0
+        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
+        <where>
+            <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="orderNo != null  and orderNo != ''">and order_no = #{orderNo}</if>
+            <if test="productName != null  and productName != ''">and product_name like concat('%', #{productName},
+                '%')
+            </if>
+            <if test="productCode != null  and productCode != ''">and product_code    like concat('%',#{productCode} ,
+                '%')</if>
+            <if test="sn != null  and sn != ''">and sn = #{sn}</if>
+            <if test="barCode != null  and barCode != ''">and bar_code = #{barCode}</if>
+            <if test="amount != null ">and amount = #{amount}</if>
+            <if test="batchNumber != null  and batchNumber != ''">and batch_number = #{batchNumber}</if>
+            <if test="userDefined2 != null  and userDefined2 != ''">and user_defined2 = #{userDefined2}</if>
+            <if test="userDefined3 != null  and userDefined3 != ''">and user_defined3 = #{userDefined3}</if>
+            <if test="userDefined4 != null  and userDefined4 != ''">and user_defined4 = #{userDefined4}</if>
+            <if test="userDefined5 != null  and userDefined5 != ''">and user_defined5 = #{userDefined5}</if>
+            <if test="userDefined6 != null  and userDefined6 != ''">and user_defined6 = #{userDefined6}</if>
+            <if test="userDefined7 != null  and userDefined7 != ''">and user_defined7 = #{userDefined7}</if>
+            <if test="userDefined8 != null  and userDefined8 != ''">and user_defined8 = #{userDefined8}</if>
+            <if test="userDefined9 != null  and userDefined9 != ''">and user_defined9 = #{userDefined9}</if>
+            <if test="userDefined10 != null  and userDefined10 != ''">and user_defined10 = #{userDefined10}</if>
+            <if test="gmtCreate != null ">and gmt_create = #{gmtCreate}</if>
+            <if test="lastModifiedBy != null  and lastModifiedBy != ''">and last_modified_by = #{lastModifiedBy}</if>
+            <if test="gmtModified != null ">and gmt_modified = #{gmtModified}</if>
+            <if test="activeFlag != null  and activeFlag != ''">and active_flag = #{activeFlag}</if>
+            <if test="factoryCode != null  and factoryCode != ''">and factory_code = #{factoryCode}</if>
+            <if test="sapFactoryCode != null  and sapFactoryCode != ''">and sap_factory_code = #{sapFactoryCode}</if>
+        </where>
+    </select>
 </mapper>
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 c5d826fd4..472676c68 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
@@ -42,6 +42,7 @@
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
         <result property="activeFlag" column="active_flag"/>
+        <result property="stockOrder" column="stockOrder"/>
     </resultMap>
 
     <resultMap type="WmsAllocationOutEmbryo" id="WmsAllocationOutEmbryoResult">
@@ -126,7 +127,89 @@
         </where>
         ORDER BY	create_time	DESC
     </select>
-
+    <select id="selectWmsSellOutEmbryoREList" 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,
+        stock_order stockOrder,
+        remark
+        FROM
+        wms_sell_out_embryo_order
+        <where>
+            <if test="deliveryOrder != null  and deliveryOrder != ''">and delivery_order  like concat('%',#{deliveryOrder},
+                '%')  </if>
+            <if test="stockOrder != null  and stockOrder != ''">and stock_order     like concat('%',#{stockOrder},
+                '%')  </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    like concat('%',#{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>
+        </where>
+        ORDER BY	create_time	DESC
+    </select>
     <select id="selectWmsSellOutEmbryoById" parameterType="String" resultMap="WmsSellOutEmbryoResult">
         <include refid="selectWmsSellOutEmbryoVo"/>
         where id = #{id}