物料标识卡生成修改

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);

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> -->

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>