Merge branch 'dev' of depot-qinghai/depot-qualitycheck-qinghai into master

src/main/java/com/chinaitop/depot/storage/mapper/ClearanceConfirmationMapper.xml

@@ -21,8 +21,9 @@
     <result column="updatename" jdbcType="VARCHAR" property="updatename" />
     <result column="createdate" jdbcType="TIMESTAMP" property="createdate" />
     <result column="updatedate" jdbcType="TIMESTAMP" property="updatedate" />
-    <result column="warehouse_id" jdbcType="INTEGER" property="warehouseId" />
-    
+    <result column="warehouse_id" jdbcType="VARCHAR" property="warehouseId" />
+    <result column="storehouse_id" jdbcType="VARCHAR" property="storehouseId" />
+
 
     <result column="storehouse_name" jdbcType="VARCHAR" property="storehouseName" />
     <result column="warehouse_name" jdbcType="VARCHAR" property="warehouseName" /> 
@@ -122,20 +123,9 @@ cc.updatename updatename,cc.updatedate updatedate,cc.warehouse_id
   </select>
 
   <select id="findByCleCon" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    <!-- select
-    <include refid="Base_Column_List" />
-    ,AB.storehouse_name  storehouseName, AB.ajmc ajmc
-    from clearance_confirmation cc
-    LEFT JOIN (
-    SELECT Bs.storehouse_name, Bu.ajmc, Bu.tyajbm, Bu.czbz
-    FROM basic_unit_aisle Bu
-    LEFT JOIN basic_storehouse Bs ON Bu.basic_storehouse_id = Bs.storehouse_id
-    ) AB ON cc.tyajbm = AB.tyajbm
-    where cc.id = #{id,jdbcType=INTEGER} -->
-    
     select
     <include refid="Base_Column_List" />
-    ,Bs.storehouse_name ,w.warehouse_name 
+    ,Bs.storehouse_name ,w.warehouse_name,Bs.storehouse_id
     from clearance_confirmation cc
     INNER JOIN basic_warehouse w ON w.warehouse_id = cc.warehouse_id
     INNER JOIN basic_storehouse Bs ON w.storehouse_id = Bs.storehouse_id

src/main/java/com/chinaitop/depot/storage/model/ClearanceConfirmation.java

@@ -33,6 +33,7 @@ public class ClearanceConfirmation {
     private String bmsh;  //部门审核
     private String dwldsh;  //单位领导审核
     private String bz;      //备注
+    private String storehouseId;//货位id
     private String warehouseId;//货位id
     private String warehouseName;//货位名称