From 5ff83afa3144aa4b2ffd3834dc8991e4c28a144c Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Thu, 29 Aug 2024 17:59:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=A0=87=E8=AF=86=E5=8D=A1?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/wms/service/impl/OdsProcureOrderServiceImpl.java    | 2 +-
 .../src/main/resources/mapper/wms/OdsProcureOrderMapper.xml    | 3 ++-
 .../src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

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 42ea8130..6df4db65 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
@@ -1157,7 +1157,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
                         }
                         pw.setCardNum(String.valueOf(i++));
                         String  dateString = pw.getUserDefined11().replace("-", "");
-                        pw.setUserDefined1(pw.getProcureCode()+"-"+pw.getUserDefined3()+"-"+pw.getUserDefined8()+"-"+dateString+"-"+pw.getCardNum());//采购单+行项目+类型+日期+板次
+                        pw.setUserDefined1(pw.getProcureCode()+"-"+pw.getUserDefined3()+"-"+pw.getUserDefined8()+"-"+dateString+"-"+odsProcureOrder.getID()+"-"+pw.getCardNum());//采购单+行项目+类型+日期+板次
                         pw.setCreateTime(nowDate);
                         pw.setActive("1");
                         dtos.add(pw);
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml
index e8e3e833..35c83d5e 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml
@@ -289,7 +289,8 @@
             COALESCE ( Operation_Number, 0 ) Operation_Number
         FROM
             ods_procure_order_card
-        where Procure_Code=#{procureCode}   and  User_Defined3= #{userDefined3}  and User_Defined8= #{userDefined8}  and User_Defined11= #{userDefined11}
+        where Procure_Code=#{procureCode}   and  User_Defined3= #{userDefined3}  and User_Defined8= #{userDefined8}  and User_Defined11= #{userDefined11}   and  User_Defined7= #{userDefined7}
+          and   User_Defined4=#{ID}
         ORDER BY	card_num
     </select>
     <!-- 定义一个插入操作，ID为addBatchPallet，参数类型为List<OdsProcureOrder> -->
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 7f1e7995..5560f277 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
@@ -48,7 +48,8 @@
             <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="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>