退货流程 出库异常流程 平库盘点流程

ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordMapper.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.check.difference.mapper.CheckDifferenceRecordMapper">
-    
+
     <resultMap type="CheckDifferenceRecord" id="CheckDifferenceRecordResult">
         <result property="checkGuid"    column="check_guid"    />
         <result property="checkStockDetailId"    column="check_stock_detail_id"    />
@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectCheckDifferenceRecordList" parameterType="CheckDifferenceRecord" resultMap="CheckDifferenceRecordResult">
         <include refid="selectCheckDifferenceRecordVo"/>
-        <where>  
+        <where>
             <if test="checkStockDetailId != null  and checkStockDetailId != ''"> and check_stock_detail_id = #{checkStockDetailId}</if>
             <if test="stockId != null  and stockId != ''"> and stock_id = #{stockId}</if>
             <if test="trayCode != null  and trayCode != ''"> and tray_code = #{trayCode}</if>
@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="productGuid != null  and productGuid != ''"> and product_guid = #{productGuid}</if>
         </where>
     </select>
-    
+
     <select id="selectCheckDifferenceRecordByCheckGuid" parameterType="String" resultMap="CheckDifferenceRecordResult">
         <include refid="selectCheckDifferenceRecordVo"/>
         where check_guid = #{checkGuid}
@@ -65,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="recordType != null">record_type,</if>
             <if test="createTime != null">create_time,</if>
             <if test="productGuid != null">product_guid,</if>
+            <if test="status != null">status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="checkGuid != null">#{checkGuid},</if>
@@ -81,6 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="recordType != null">#{recordType},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="productGuid != null">#{productGuid},</if>
+            <if test="status != null">#{status},</if>
          </trim>
     </insert>
 
@@ -109,9 +111,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteCheckDifferenceRecordByCheckGuids" parameterType="String">
-        delete from check_difference_record where check_guid in 
+        delete from check_difference_record where check_guid in
         <foreach item="checkGuid" collection="array" open="(" separator="," close=")">
             #{checkGuid}
         </foreach>
     </delete>
-</mapper>
+</mapper>

ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml

@@ -87,6 +87,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare5 != null  and spare5 != ''"> and bs.spare5 = #{spare5}</if>
             <if test="spare6 != null  and spare6 != ''"> and bs.spare6 = #{spare6}</if>
             <if test="cargoSpaceStockStatus != null  and cargoSpaceStockStatus != ''"> and bcs.status = #{cargoSpaceStockStatus}</if>
+            <if test="typeData != null and typeData.size()>0">
+                and bw.warehouse_type in
+                <foreach item="item" index="index" collection="typeData" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
     </select>