后台、质检版 过滤虚拟库存的类型

@@ -53,7 +53,7 @@
     <select id="selectCountByStatusAndDepotNo" resultType="java.lang.Integer">
     <select id="selectCountByStatusAndDepotNo" resultType="java.lang.Integer">
         select count(1)   
         select count(1)   
         from storage_deposit 
         from storage_deposit 
-        where del_status=0 
+        where del_status=0 AND deposit_type = 0
         <if test="status != null">
         <if test="status != null">
            and status = #{status}
            and status = #{status}
         </if>
         </if>
@@ -81,7 +81,7 @@
         LEFT JOIN buyer_order b
         LEFT JOIN buyer_order b
         ON( b.order_code=a.order_code) 
         ON( b.order_code=a.order_code) 
         </if>
         </if>
-        where a.del_status=0 
+        where a.del_status=0  AND deposit_type = 0
         <include refid="Query_Order_Sql" />
         <include refid="Query_Order_Sql" />
         <if test="storageDepositReq.status != null and storageDepositReq.status== 0">
         <if test="storageDepositReq.status != null and storageDepositReq.status== 0">
            order by b.create_time 
            order by b.create_time 
@@ -99,7 +99,7 @@
 
 
     <select id="selectNeddRemindDeposit" resultMap="BaseResultMap">
     <select id="selectNeddRemindDeposit" resultMap="BaseResultMap">
         select <include refid="Base_Column_List"></include> 
         select <include refid="Base_Column_List"></include> 
-        from storage_deposit WHERE del_status = 0 and deposit_end_time &lt;= #{curTime} and remind_status in
+        from storage_deposit WHERE del_status = 0  AND deposit_type = 0 and deposit_end_time &lt;= #{curTime} and remind_status in
         <foreach collection="remindStatus" item="item" open="(" close=")" separator=",">
         <foreach collection="remindStatus" item="item" open="(" close=")" separator=",">
             #{item}
             #{item}
         </foreach>
         </foreach>
@@ -112,7 +112,7 @@
 
 
     <select id="selectNeddDownDeposit" resultMap="BaseResultMap">
     <select id="selectNeddDownDeposit" resultMap="BaseResultMap">
         select <include refid="Base_Column_List"></include>
         select <include refid="Base_Column_List"></include>
-        from storage_deposit WHERE del_status = 0 and deposit_end_time &lt;= #{curTime} AND status = 1 limit 500
+        from storage_deposit WHERE del_status = 0  AND deposit_type = 0 and deposit_end_time &lt;= #{curTime} AND status = 1 limit 500
     </select>
     </select>
 
 
     <update id="updateStatus">
     <update id="updateStatus">
@@ -122,7 +122,7 @@
     <select id="selectShelfCodeCnt" resultType="java.lang.Integer">
     <select id="selectShelfCodeCnt" resultType="java.lang.Integer">
         select count(distinct shelf_code)   
         select count(distinct shelf_code)   
         from storage_deposit 
         from storage_deposit 
-        where 1=1 and del_status=0 
+        where 1=1 and del_status=0  AND deposit_type = 0
         <if test="status != null">
         <if test="status != null">
            and status = #{status}
            and status = #{status}
         </if>
         </if>
@@ -131,7 +131,7 @@
     <select id="selectShelfCodeList" resultType="java.lang.String" parameterType="com.yoho.order.model.StorageDepositReq">
     <select id="selectShelfCodeList" resultType="java.lang.String" parameterType="com.yoho.order.model.StorageDepositReq">
         select distinct a.shelf_code 
         select distinct a.shelf_code 
         from storage_deposit a   
         from storage_deposit a   
-        where a.del_status=0 
+        where a.del_status=0  AND deposit_type = 0
         <include refid="Query_Order_Sql" /> 
         <include refid="Query_Order_Sql" /> 
         order by a.order_no  
         order by a.order_no  
         <if test="storageDepositReq.start!=null and storageDepositReq.size != null">
         <if test="storageDepositReq.start!=null and storageDepositReq.size != null">
@@ -142,7 +142,7 @@
     <select id="selectByShelfCodeList" resultMap="BaseResultMap">
     <select id="selectByShelfCodeList" resultMap="BaseResultMap">
         select <include refid="Base_Column_List"></include> 
         select <include refid="Base_Column_List"></include> 
         from storage_deposit 
         from storage_deposit 
-        where del_status=0 
+        where del_status=0  AND deposit_type = 0
         <if test="list != null and list.size()>0">
         <if test="list != null and list.size()>0">
            and shelf_code in 
            and shelf_code in 
         <foreach collection="list" item="shelfCode" open="(" close=")" separator=",">
         <foreach collection="list" item="shelfCode" open="(" close=")" separator=",">
@@ -158,7 +158,7 @@
     <select id="selectByDepositCodeList" resultMap="BaseResultMap">
     <select id="selectByDepositCodeList" resultMap="BaseResultMap">
         select <include refid="Base_Column_List"></include> 
         select <include refid="Base_Column_List"></include> 
         from storage_deposit 
         from storage_deposit 
-        where del_status=0 
+        where del_status=0  AND deposit_type = 0
         <if test="list != null and list.size()>0">
         <if test="list != null and list.size()>0">
            and deposit_code in 
            and deposit_code in 
         <foreach collection="list" item="depositCode" open="(" close=")" separator=",">
         <foreach collection="list" item="depositCode" open="(" close=")" separator=",">
@@ -170,7 +170,7 @@
     <select id="selectHistoryByDepositCodeList" resultMap="BaseResultMap">
     <select id="selectHistoryByDepositCodeList" resultMap="BaseResultMap">
         select <include refid="Base_Column_List"></include>
         select <include refid="Base_Column_List"></include>
         from storage_deposit
         from storage_deposit
-        where  deposit_code in
+        where   deposit_type = 0  AND deposit_code in
             <foreach collection="list" item="depositCode" open="(" close=")" separator=",">
             <foreach collection="list" item="depositCode" open="(" close=")" separator=",">
                 #{depositCode}
                 #{depositCode}
             </foreach>
             </foreach>
@@ -187,27 +187,27 @@
     
     
     <select id="selectByOrderCode" resultMap="BaseResultMap">
     <select id="selectByOrderCode" resultMap="BaseResultMap">
         select <include refid="Base_Column_List"></include> 
         select <include refid="Base_Column_List"></include> 
-        from storage_deposit 
+        from storage_deposit  AND deposit_type = 0
         where order_code=#{orderCode} and del_status=0 limit 1
         where order_code=#{orderCode} and del_status=0 limit 1
     </select>
     </select>
 
 
     <select id="selectByNewSkup" resultMap="BaseResultMap">
     <select id="selectByNewSkup" resultMap="BaseResultMap">
         select <include refid="Base_Column_List"></include>
         select <include refid="Base_Column_List"></include>
         from storage_deposit
         from storage_deposit
-        where new_skup=#{newSkup} limit 1
+        where new_skup=#{newSkup}  AND deposit_type = 0 limit 1
     </select>
     </select>
 
 
     <select id="selectDepositList" resultMap="BaseResultMap">
     <select id="selectDepositList" resultMap="BaseResultMap">
         select <include refid="Base_Column_List"></include>
         select <include refid="Base_Column_List"></include>
         from storage_deposit
         from storage_deposit
-        where del_status = 0
+        where del_status = 0  AND deposit_type = 0
         <include refid="deposit_list_where"></include>
         <include refid="deposit_list_where"></include>
         order by id desc limit #{start},#{size}
         order by id desc limit #{start},#{size}
     </select>
     </select>
     <select id="selectDepositListCount" resultType="java.lang.Integer">
     <select id="selectDepositListCount" resultType="java.lang.Integer">
         select count(*)
         select count(*)
         from storage_deposit
         from storage_deposit
-        where del_status = 0
+        where del_status = 0  AND deposit_type = 0
         <include refid="deposit_list_where"></include>
         <include refid="deposit_list_where"></include>
     </select>
     </select>