Merge remote-tracking branch 'origin/master'

op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml

@@ -48,7 +48,8 @@
     <select id="selectWmsProductPutList" parameterType="WmsProductPut" resultMap="WmsProductPutResult">
         <include refid="selectWmsProductPutVo"/>
         <where>
-            <if test="workOrder != null  and workOrder != ''">and work_order = #{workOrder}</if>
+            <if test="workOrder != null  and workOrder != ''">and work_order    like concat('%', #{workOrder},
+                '%') </if>
             <if test="factoryCode != null  and factoryCode != ''">and factory_code = #{factoryCode}</if>
             <if test="productOrder != null  and productOrder != ''">and product_order = #{productOrder}</if>
             <if test="whCode != null  and whCode != ''">and wh_code = #{whCode}</if>
@@ -57,7 +58,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="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>