Merge remote-tracking branch 'origin/master'

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

@@ -48,7 +48,8 @@
         <where>
             <if test="siteCode != null  and siteCode != ''">and Site_code = #{siteCode}</if>
             <if test="procureCode != null  and procureCode != ''">and Procure_Code = #{procureCode}</if>
-            <if test="materialCode != null  and materialCode != ''">and Material_Code = #{materialCode}</if>
+            <if test="materialCode != null  and materialCode != ''">and Material_Code    like concat('%', #{materialCode},
+                '%') </if>
             <if test="materialDesc != null  and materialDesc != ''">and Material_Desc = #{materialDesc}</if>
             <if test="planDate != null ">and Plan_Date = #{planDate}</if>
             <if test="planNumber != null ">and Plan_Number = #{planNumber}</if>