wms出库流程测试修改

ruoyi-admin/src/main/resources/mapper/bas/BasTagMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.bas.tag.mapper.BasTagMapper">
-    
+
     <resultMap type="BasTag" id="BasTagResult">
         <result property="id"    column="id"    />
         <result property="ip"    column="ip"    />
@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectBasTagList" parameterType="BasTag" resultMap="BasTagResult">
         <include refid="selectBasTagVo"/>
-        <where>  
+        <where>
             <if test="ip != null  and ip != ''"> and ip = #{ip}</if>
             <if test="pickAdd != null  and pickAdd != ''"> and pick_add = #{pickAdd}</if>
             <if test="trayCode != null  and trayCode != ''"> and tray_code = #{trayCode}</if>
@@ -33,11 +33,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare3 != null  and spare3 != ''"> and spare3 = #{spare3}</if>
         </where>
     </select>
-    
+
     <select id="selectBasTagById" parameterType="Long" resultMap="BasTagResult">
         <include refid="selectBasTagVo"/>
         where id = #{id}
     </select>
+    <select id="selectBasTagByTrayCode" resultMap="BasTagResult">
+        <include refid="selectBasTagVo"/>
+        where tray_code = #{trayCode}
+    </select>
 
     <insert id="insertBasTag" parameterType="BasTag" useGeneratedKeys="true" keyProperty="id">
         insert into bas_tag
@@ -83,9 +87,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteBasTagByIds" parameterType="String">
-        delete from bas_tag where id in 
+        delete from bas_tag where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-</mapper>
+</mapper>

ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml

@@ -88,6 +88,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inOut != null  and inOut != '' and inOut =='1'.toString "> and mj.in_or_out &lt; 20</if>
             <if test="inOut != null  and inOut != '' and inOut =='3'.toString "> and mj.in_or_out in (5,6)</if>
             <if test="inOut != null  and inOut != '' and inOut =='4'.toString "> and mj.in_or_out in (25,26)</if>
+            <if test = "inOutIds !=null and inOutIds.size() > 0">
+                and mj.in_or_out in
+                <foreach item="item" index="index" collection="inOutIds" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+
+
             <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
                 ${params.warehouseDataScope}
             </if>