寄存

@@ -18,20 +18,21 @@
       <result column="deposit_start_time" property="depositStartTime" jdbcType="INTEGER" />
       <result column="deposit_end_time" property="depositEndTime" jdbcType="INTEGER" />
       <result column="edit_pid" property="editPid" jdbcType="INTEGER" />
+      <result column="out_type" property="outType" jdbcType="INTEGER" />
     </resultMap>
 
     <sql id="Base_Column_List">
         id, product_id, goods_id, storage_id, deposit_code, shelf_code, owner_uid, order_code, 
         skup, status, order_status, update_time, create_time, deposit_start_time,
-        deposit_end_time, edit_pid
+        deposit_end_time, edit_pid, out_type
     </sql>
     
-    <insert id="insert" parameterType="com.yoho.product.model.StorageDeposit">
+    <insert id="insert" parameterType="com.yoho.order.model.StorageDeposit">
         insert into storage_deposit(id, product_id, goods_id, storage_id, deposit_code, shelf_code, owner_uid, order_code, 
         skup, status, order_status, update_time, create_time, deposit_start_time,
-        deposit_end_time, edit_pid)
+        deposit_end_time, edit_pid, out_type)
         values (#{id}, #{productId}, #{goodsId}, #{storageId}, #{depositCode}, #{shelfCode}, #{ownerUid}, #{orderCode},
-        #{skup}, #{status}, #{orderStatus}, #{updateTime}, #{createTime}, #{depositStartTime}, #{depositEndTime}, #{editPid})
+        #{skup}, #{status}, #{orderStatus}, #{updateTime}, #{createTime}, #{depositStartTime}, #{depositEndTime}, #{editPid}, #{outType})
     </insert>
 
     <select id="bindShelfCode" resultType="java.lang.Integer">
@@ -67,6 +68,9 @@
             #{status}
          </foreach>
      </if>
+     <if test="storageDepositReq.status != null">
+         and a.status = #{storageDepositReq.status}
+     </if>
      <if test="storageDepositReq.depositCode != null and storageDepositReq.depositCode != '' ">
          and a.deposit_code = #{storageDepositReq.depositCode}
      </if>
@@ -75,7 +79,7 @@
      </if>
     </sql>
     
-    <select id="selectByCondition" resultMap="BaseResultMap" parameterType="com.yoho.product.model.StorageDepositReq">
+    <select id="selectByCondition" resultMap="BaseResultMap" parameterType="com.yoho.order.model.StorageDepositReq">
         select a.*
         from storage_deposit a 
         <if test="storageDepositReq.depotNo != null">