Merge branch 'dev' of http://101.36.160.140:21044/depot-qinghai/depot-qualitycheck-qinghai into dev

src/main/java/com/chinaitop/depot/storage/controller/ClearanceConfirmationController.java

@@ -60,7 +60,7 @@ public class ClearanceConfirmationController {
     })
     public PageInfo<ClearanceConfirmation> getCleConList(Integer pageNum, Integer pageSize,
                                                      String storeName,
-                                                     String ajmc, Integer orgId) {
+                                                     Integer warehouseId, Integer orgId) {
         Map<String, Object> modelMap = new HashMap<String, Object>();
         if (pageNum != null && pageSize != null) {
             PageHelper.startPage(pageNum, pageSize);
@@ -71,8 +71,8 @@ public class ClearanceConfirmationController {
             if (null != storeName && !"".equals(storeName)) {
                 modelMap.put("storehouseName", storeName);
             }
-            if (null != ajmc && !"".equals(ajmc)) {
-                modelMap.put("ajmc", ajmc);
+            if (null != warehouseId && !"".equals(warehouseId)) {
+                modelMap.put("warehouseId", warehouseId);
             }
             /* 只能查询当前单位的数据  */
             if (null != orgId) {

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

@@ -21,8 +21,11 @@
     <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="storehouse_name" jdbcType="VARCHAR" property="storehouseName" />
+    <result column="warehouse_name" jdbcType="VARCHAR" property="warehouseName" /> 
     <result column="tyajbm" jdbcType="VARCHAR" property="tyajbm" />
     <result column="ajmc" jdbcType="VARCHAR" property="ajmc" />
   </resultMap>
@@ -89,7 +92,7 @@
   <sql id="Base_Column_List">
     cc.id id,cc.cqqrdh cqqrdh,cc.ywrq ywrq,cc.tyajbm tyajbm,cc.bgy bgy,cc.sfqs sfqs,cc.sfxd sfxd,cc.jcyxf jcyxf,cc.qtsx qtsx,cc.sqr,cc.bmsh bmsh,cc.dwldsh dwldsh,
 cc.bz bz,cc.czbz czbz,cc.zhgxsj zhgxsj,cc.createname createname,cc.createdate createdate,
-cc.updatename updatename,cc.updatedate updatedate
+cc.updatename updatename,cc.updatedate updatedate,cc.warehouse_id 
   </sql>
 
 
@@ -111,12 +114,15 @@ cc.updatename updatename,cc.updatedate updatedate
     <if test="orgId != null">
       AND AB.org_id = #{orgId,jdbcType=INTEGER}
     </if>
+    <if test="warehouseId != null">
+      AND cc.warehouse_id = #{warehouseId,jdbcType=INTEGER}
+    </if>
     AND (cc.czbz = 'i' OR cc.czbz = 'u')
     order by cc.id desc
   </select>
 
   <select id="findByCleCon" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select
+    <!-- select
     <include refid="Base_Column_List" />
     ,AB.storehouse_name  storehouseName, AB.ajmc ajmc
     from clearance_confirmation cc
@@ -125,6 +131,14 @@ cc.updatename updatename,cc.updatedate updatedate
     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 
+    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
     where cc.id = #{id,jdbcType=INTEGER}
   </select>
 
@@ -178,7 +192,7 @@ cc.updatename updatename,cc.updatedate updatedate
   <insert id="insert" keyProperty="id" useGeneratedKeys="true"  parameterType="com.chinaitop.depot.storage.model.ClearanceConfirmation">
     insert into clearance_confirmation (id,cqqrdh,ywrq,tyajbm,bgy,sfqs,sfxd,jcyxf,qtsx,sqr,bmsh,dwldsh,
                                   bz,czbz,zhgxsj,createname,createdate,
-                                  updatename,updatedate)
+                                  updatename,updatedate,warehouse_id)
     values (
              #{id,jdbcType=INTEGER},
             #{cqqrdh,jdbcType=VARCHAR},
@@ -198,7 +212,8 @@ cc.updatename updatename,cc.updatedate updatedate
             #{createname,jdbcType=VARCHAR},
             #{createdate,jdbcType=TIMESTAMP},
             #{updatename,jdbcType=VARCHAR},
-            #{updatedate,jdbcType=TIMESTAMP})
+            #{updatedate,jdbcType=TIMESTAMP},
+            #{warehouseId,jdbcType=INTEGER})
   </insert>
 
   <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.storage.model.ClearanceConfirmation">
@@ -221,7 +236,8 @@ cc.updatename updatename,cc.updatedate updatedate
     createname=#{createname,jdbcType=VARCHAR},
     createdate=#{createdate,jdbcType=TIMESTAMP},
     updatename=#{updatename,jdbcType=VARCHAR},
-    updatedate=#{updatedate,jdbcType=TIMESTAMP}
+    updatedate=#{updatedate,jdbcType=TIMESTAMP},
+    warehouse_id = #{warehouseId,jdbcType=INTEGER}
   where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>

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

@@ -359,8 +359,8 @@
 	  plan.execute_type,
 	  jkqyq.is_Upload
 	  FROM depot_qh.storage_overhead_set overhead 
-	  LEFT JOIN crk_qh.data_kcgl_fcbgz_default fcbgz ON overhead.lsxz = fcbgz.hwxz
-	  LEFT JOIN crk_qh.data_kcgl_xckc_default xckc ON fcbgz.DataID = xckc.DataID
+	  LEFT JOIN data_kcgl_fcbgz_default fcbgz ON overhead.lsxz = fcbgz.hwxz
+	  LEFT JOIN data_kcgl_xckc_default xckc ON fcbgz.DataID = xckc.DataID
 	  LEFT JOIN depot_qh.business_delivery_storage_notice notice ON xckc.tzdh = notice.bill_number
 	  LEFT JOIN depot_qh.business_plan plan ON notice.plan_number = plan.plan_number
 	  LEFT JOIN depot_qh.storage_kcgl_jkqyq_apply_default jkqyq ON fcbgz.ch = jkqyq.ch  

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

@@ -20,6 +20,8 @@ public class ClearanceConfirmation {
     private Date updatedate;
 
     private String cqqrdh; //出清单确认单号
+    
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date ywrq;      //业务日期，格式：yyyy-MM-dd
     private String tyajbm; //统一廒间编码
     private String bgy;    //保管员
@@ -31,9 +33,28 @@ public class ClearanceConfirmation {
     private String bmsh;  //部门审核
     private String dwldsh;  //单位领导审核
     private String bz;      //备注
+    private String warehouseId;//货位id
+    private String warehouseName;//货位名称
+    
 
 
-    private String storehouseName;
+    public String getWarehouseName() {
+		return warehouseName;
+	}
+
+	public void setWarehouseName(String warehouseName) {
+		this.warehouseName = warehouseName;
+	}
+
+	public String getWarehouseId() {
+		return warehouseId;
+	}
+
+	public void setWarehouseId(String warehouseId) {
+		this.warehouseId = warehouseId;
+	}
+
+	private String storehouseName;
     private String ajmc; //廒间名称
 
     public String getStorehouseName() {