Sfoglia il codice sorgente

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

ZeroLiYi 1 anno fa
parent
commit
23259f9864

+ 3 - 3
src/main/java/com/chinaitop/depot/storage/controller/ClearanceConfirmationController.java

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

+ 21 - 5
src/main/java/com/chinaitop/depot/storage/mapper/ClearanceConfirmationMapper.xml

@@ -21,8 +21,11 @@
21
     <result column="updatename" jdbcType="VARCHAR" property="updatename" />
21
     <result column="updatename" jdbcType="VARCHAR" property="updatename" />
22
     <result column="createdate" jdbcType="TIMESTAMP" property="createdate" />
22
     <result column="createdate" jdbcType="TIMESTAMP" property="createdate" />
23
     <result column="updatedate" jdbcType="TIMESTAMP" property="updatedate" />
23
     <result column="updatedate" jdbcType="TIMESTAMP" property="updatedate" />
24
+    <result column="warehouse_id" jdbcType="INTEGER" property="warehouseId" />
25
+    
24
 
26
 
25
     <result column="storehouse_name" jdbcType="VARCHAR" property="storehouseName" />
27
     <result column="storehouse_name" jdbcType="VARCHAR" property="storehouseName" />
28
+    <result column="warehouse_name" jdbcType="VARCHAR" property="warehouseName" /> 
26
     <result column="tyajbm" jdbcType="VARCHAR" property="tyajbm" />
29
     <result column="tyajbm" jdbcType="VARCHAR" property="tyajbm" />
27
     <result column="ajmc" jdbcType="VARCHAR" property="ajmc" />
30
     <result column="ajmc" jdbcType="VARCHAR" property="ajmc" />
28
   </resultMap>
31
   </resultMap>
@@ -89,7 +92,7 @@
89
   <sql id="Base_Column_List">
92
   <sql id="Base_Column_List">
90
     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,
93
     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,
91
 cc.bz bz,cc.czbz czbz,cc.zhgxsj zhgxsj,cc.createname createname,cc.createdate createdate,
94
 cc.bz bz,cc.czbz czbz,cc.zhgxsj zhgxsj,cc.createname createname,cc.createdate createdate,
92
-cc.updatename updatename,cc.updatedate updatedate
95
+cc.updatename updatename,cc.updatedate updatedate,cc.warehouse_id 
93
   </sql>
96
   </sql>
94
 
97
 
95
 
98
 
@@ -111,12 +114,15 @@ cc.updatename updatename,cc.updatedate updatedate
111
     <if test="orgId != null">
114
     <if test="orgId != null">
112
       AND AB.org_id = #{orgId,jdbcType=INTEGER}
115
       AND AB.org_id = #{orgId,jdbcType=INTEGER}
113
     </if>
116
     </if>
117
+    <if test="warehouseId != null">
118
+      AND cc.warehouse_id = #{warehouseId,jdbcType=INTEGER}
119
+    </if>
114
     AND (cc.czbz = 'i' OR cc.czbz = 'u')
120
     AND (cc.czbz = 'i' OR cc.czbz = 'u')
115
     order by cc.id desc
121
     order by cc.id desc
116
   </select>
122
   </select>
117
 
123
 
118
   <select id="findByCleCon" parameterType="java.lang.Integer" resultMap="BaseResultMap">
124
   <select id="findByCleCon" parameterType="java.lang.Integer" resultMap="BaseResultMap">
119
-    select
125
+    <!-- select
120
     <include refid="Base_Column_List" />
126
     <include refid="Base_Column_List" />
121
     ,AB.storehouse_name  storehouseName, AB.ajmc ajmc
127
     ,AB.storehouse_name  storehouseName, AB.ajmc ajmc
122
     from clearance_confirmation cc
128
     from clearance_confirmation cc
@@ -125,6 +131,14 @@ cc.updatename updatename,cc.updatedate updatedate
125
     FROM basic_unit_aisle Bu
131
     FROM basic_unit_aisle Bu
126
     LEFT JOIN basic_storehouse Bs ON Bu.basic_storehouse_id = Bs.storehouse_id
132
     LEFT JOIN basic_storehouse Bs ON Bu.basic_storehouse_id = Bs.storehouse_id
127
     ) AB ON cc.tyajbm = AB.tyajbm
133
     ) AB ON cc.tyajbm = AB.tyajbm
134
+    where cc.id = #{id,jdbcType=INTEGER} -->
135
+    
136
+    select
137
+    <include refid="Base_Column_List" />
138
+    ,Bs.storehouse_name ,w.warehouse_name 
139
+    from clearance_confirmation cc
140
+    INNER JOIN basic_warehouse w ON w.warehouse_id = cc.warehouse_id
141
+    INNER JOIN basic_storehouse Bs ON w.storehouse_id = Bs.storehouse_id
128
     where cc.id = #{id,jdbcType=INTEGER}
142
     where cc.id = #{id,jdbcType=INTEGER}
129
   </select>
143
   </select>
130
 
144
 
@@ -178,7 +192,7 @@ cc.updatename updatename,cc.updatedate updatedate
178
   <insert id="insert" keyProperty="id" useGeneratedKeys="true"  parameterType="com.chinaitop.depot.storage.model.ClearanceConfirmation">
192
   <insert id="insert" keyProperty="id" useGeneratedKeys="true"  parameterType="com.chinaitop.depot.storage.model.ClearanceConfirmation">
179
     insert into clearance_confirmation (id,cqqrdh,ywrq,tyajbm,bgy,sfqs,sfxd,jcyxf,qtsx,sqr,bmsh,dwldsh,
193
     insert into clearance_confirmation (id,cqqrdh,ywrq,tyajbm,bgy,sfqs,sfxd,jcyxf,qtsx,sqr,bmsh,dwldsh,
180
                                   bz,czbz,zhgxsj,createname,createdate,
194
                                   bz,czbz,zhgxsj,createname,createdate,
181
-                                  updatename,updatedate)
195
+                                  updatename,updatedate,warehouse_id)
182
     values (
196
     values (
183
              #{id,jdbcType=INTEGER},
197
              #{id,jdbcType=INTEGER},
184
             #{cqqrdh,jdbcType=VARCHAR},
198
             #{cqqrdh,jdbcType=VARCHAR},
@@ -198,7 +212,8 @@ cc.updatename updatename,cc.updatedate updatedate
198
             #{createname,jdbcType=VARCHAR},
212
             #{createname,jdbcType=VARCHAR},
199
             #{createdate,jdbcType=TIMESTAMP},
213
             #{createdate,jdbcType=TIMESTAMP},
200
             #{updatename,jdbcType=VARCHAR},
214
             #{updatename,jdbcType=VARCHAR},
201
-            #{updatedate,jdbcType=TIMESTAMP})
215
+            #{updatedate,jdbcType=TIMESTAMP},
216
+            #{warehouseId,jdbcType=INTEGER})
202
   </insert>
217
   </insert>
203
 
218
 
204
   <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.storage.model.ClearanceConfirmation">
219
   <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.storage.model.ClearanceConfirmation">
@@ -221,7 +236,8 @@ cc.updatename updatename,cc.updatedate updatedate
221
     createname=#{createname,jdbcType=VARCHAR},
236
     createname=#{createname,jdbcType=VARCHAR},
222
     createdate=#{createdate,jdbcType=TIMESTAMP},
237
     createdate=#{createdate,jdbcType=TIMESTAMP},
223
     updatename=#{updatename,jdbcType=VARCHAR},
238
     updatename=#{updatename,jdbcType=VARCHAR},
224
-    updatedate=#{updatedate,jdbcType=TIMESTAMP}
239
+    updatedate=#{updatedate,jdbcType=TIMESTAMP},
240
+    warehouse_id = #{warehouseId,jdbcType=INTEGER}
225
   where id = #{id,jdbcType=INTEGER}
241
   where id = #{id,jdbcType=INTEGER}
226
   </update>
242
   </update>
227
 </mapper>
243
 </mapper>

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

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

+ 22 - 1
src/main/java/com/chinaitop/depot/storage/model/ClearanceConfirmation.java

@@ -20,6 +20,8 @@ public class ClearanceConfirmation {
20
     private Date updatedate;
20
     private Date updatedate;
21
 
21
 
22
     private String cqqrdh; //出清单确认单号
22
     private String cqqrdh; //出清单确认单号
23
+    
24
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
23
     private Date ywrq;      //业务日期,格式:yyyy-MM-dd
25
     private Date ywrq;      //业务日期,格式:yyyy-MM-dd
24
     private String tyajbm; //统一廒间编码
26
     private String tyajbm; //统一廒间编码
25
     private String bgy;    //保管员
27
     private String bgy;    //保管员
@@ -31,9 +33,28 @@ public class ClearanceConfirmation {
31
     private String bmsh;  //部门审核
33
     private String bmsh;  //部门审核
32
     private String dwldsh;  //单位领导审核
34
     private String dwldsh;  //单位领导审核
33
     private String bz;      //备注
35
     private String bz;      //备注
36
+    private String warehouseId;//货位id
37
+    private String warehouseName;//货位名称
38
+    
34
 
39
 
35
 
40
 
36
-    private String storehouseName;
41
+    public String getWarehouseName() {
42
+		return warehouseName;
43
+	}
44
+
45
+	public void setWarehouseName(String warehouseName) {
46
+		this.warehouseName = warehouseName;
47
+	}
48
+
49
+	public String getWarehouseId() {
50
+		return warehouseId;
51
+	}
52
+
53
+	public void setWarehouseId(String warehouseId) {
54
+		this.warehouseId = warehouseId;
55
+	}
56
+
57
+	private String storehouseName;
37
     private String ajmc; //廒间名称
58
     private String ajmc; //廒间名称
38
 
59
 
39
     public String getStorehouseName() {
60
     public String getStorehouseName() {