larry 5 yıl önce
ebeveyn
işleme
d69ca2d477

+ 1 - 1
src/main/java/com/chinaitop/depot/storage/mapper/StorageChangeStoragehouseDefaultMapper.java

@@ -21,6 +21,6 @@ public interface StorageChangeStoragehouseDefaultMapper {
21
     int updateByExampleSelective(@Param("record") StorageChangeStoragehouseDefault record, @Param("example") StorageChangeStoragehouseDefaultExample example);
21
     int updateByExampleSelective(@Param("record") StorageChangeStoragehouseDefault record, @Param("example") StorageChangeStoragehouseDefaultExample example);
22
 
22
 
23
     int updateByExample(@Param("record") StorageChangeStoragehouseDefault record, @Param("example") StorageChangeStoragehouseDefaultExample example);
23
     int updateByExample(@Param("record") StorageChangeStoragehouseDefault record, @Param("example") StorageChangeStoragehouseDefaultExample example);
24
-    
24
+
25
     List<Map<String,Object>> contractData(Map<String,Object> map);
25
     List<Map<String,Object>> contractData(Map<String,Object> map);
26
 }
26
 }

+ 31 - 20
src/main/java/com/chinaitop/depot/storage/mapper/StorageChangeStoragehouseDefaultMapper.xml

@@ -16,6 +16,7 @@
16
     <result column="out_before" property="outBefore" jdbcType="VARCHAR" />
16
     <result column="out_before" property="outBefore" jdbcType="VARCHAR" />
17
     <result column="apply_firm" property="applyFirm" jdbcType="VARCHAR" />
17
     <result column="apply_firm" property="applyFirm" jdbcType="VARCHAR" />
18
     <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
18
     <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
19
+    <result column="over_time" property="overTime" jdbcType="TIMESTAMP" />
19
     <result column="into_storehouse" property="intoStorehouse" jdbcType="INTEGER" />
20
     <result column="into_storehouse" property="intoStorehouse" jdbcType="INTEGER" />
20
     <result column="into_storehouse_name" property="intoStorehouseName" jdbcType="VARCHAR" />
21
     <result column="into_storehouse_name" property="intoStorehouseName" jdbcType="VARCHAR" />
21
     <result column="into_warehouse" property="intoWarehouse" jdbcType="INTEGER" />
22
     <result column="into_warehouse" property="intoWarehouse" jdbcType="INTEGER" />
@@ -86,8 +87,8 @@
86
   <sql id="Base_Column_List" >
87
   <sql id="Base_Column_List" >
87
     changehouse_no, org_id, apply_no, apply_time, out_storehouse, out_storehouse_name, 
88
     changehouse_no, org_id, apply_no, apply_time, out_storehouse, out_storehouse_name, 
88
     out_warehouse, out_warehouse_name, food_war, food_nature, bit_weigh, out_before, 
89
     out_warehouse, out_warehouse_name, food_war, food_nature, bit_weigh, out_before, 
89
-    apply_firm, create_time, into_storehouse, into_storehouse_name, into_warehouse, into_warehouse_name, 
90
-    detail_war, food_number, out_after, oper_staff
90
+    apply_firm, create_time, over_time, into_storehouse, into_storehouse_name, into_warehouse, 
91
+    into_warehouse_name, detail_war, food_number, out_after, oper_staff
91
   </sql>
92
   </sql>
92
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseDefaultExample" >
93
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseDefaultExample" >
93
     select
94
     select
@@ -114,18 +115,18 @@
114
       apply_time, out_storehouse, out_storehouse_name, 
115
       apply_time, out_storehouse, out_storehouse_name, 
115
       out_warehouse, out_warehouse_name, food_war, 
116
       out_warehouse, out_warehouse_name, food_war, 
116
       food_nature, bit_weigh, out_before, 
117
       food_nature, bit_weigh, out_before, 
117
-      apply_firm, create_time, into_storehouse, 
118
-      into_storehouse_name, into_warehouse, into_warehouse_name, 
119
-      detail_war, food_number, out_after, 
120
-      oper_staff)
118
+      apply_firm, create_time, over_time, 
119
+      into_storehouse, into_storehouse_name, into_warehouse, 
120
+      into_warehouse_name, detail_war, food_number, 
121
+      out_after, oper_staff)
121
     values (#{changehouseNo,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, #{applyNo,jdbcType=VARCHAR}, 
122
     values (#{changehouseNo,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, #{applyNo,jdbcType=VARCHAR}, 
122
       #{applyTime,jdbcType=TIMESTAMP}, #{outStorehouse,jdbcType=INTEGER}, #{outStorehouseName,jdbcType=VARCHAR}, 
123
       #{applyTime,jdbcType=TIMESTAMP}, #{outStorehouse,jdbcType=INTEGER}, #{outStorehouseName,jdbcType=VARCHAR}, 
123
       #{outWarehouse,jdbcType=INTEGER}, #{outWarehouseName,jdbcType=VARCHAR}, #{foodWar,jdbcType=INTEGER}, 
124
       #{outWarehouse,jdbcType=INTEGER}, #{outWarehouseName,jdbcType=VARCHAR}, #{foodWar,jdbcType=INTEGER}, 
124
       #{foodNature,jdbcType=VARCHAR}, #{bitWeigh,jdbcType=VARCHAR}, #{outBefore,jdbcType=VARCHAR}, 
125
       #{foodNature,jdbcType=VARCHAR}, #{bitWeigh,jdbcType=VARCHAR}, #{outBefore,jdbcType=VARCHAR}, 
125
-      #{applyFirm,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{intoStorehouse,jdbcType=INTEGER}, 
126
-      #{intoStorehouseName,jdbcType=VARCHAR}, #{intoWarehouse,jdbcType=INTEGER}, #{intoWarehouseName,jdbcType=VARCHAR}, 
127
-      #{detailWar,jdbcType=INTEGER}, #{foodNumber,jdbcType=DECIMAL}, #{outAfter,jdbcType=VARCHAR}, 
128
-      #{operStaff,jdbcType=VARCHAR})
126
+      #{applyFirm,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{overTime,jdbcType=TIMESTAMP}, 
127
+      #{intoStorehouse,jdbcType=INTEGER}, #{intoStorehouseName,jdbcType=VARCHAR}, #{intoWarehouse,jdbcType=INTEGER}, 
128
+      #{intoWarehouseName,jdbcType=VARCHAR}, #{detailWar,jdbcType=INTEGER}, #{foodNumber,jdbcType=DECIMAL}, 
129
+      #{outAfter,jdbcType=VARCHAR}, #{operStaff,jdbcType=VARCHAR})
129
   </insert>
130
   </insert>
130
   <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseDefault" >
131
   <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseDefault" >
131
     insert into storage_change_storagehouse_default
132
     insert into storage_change_storagehouse_default
@@ -172,6 +173,9 @@
172
       <if test="createTime != null" >
173
       <if test="createTime != null" >
173
         create_time,
174
         create_time,
174
       </if>
175
       </if>
176
+      <if test="overTime != null" >
177
+        over_time,
178
+      </if>
175
       <if test="intoStorehouse != null" >
179
       <if test="intoStorehouse != null" >
176
         into_storehouse,
180
         into_storehouse,
177
       </if>
181
       </if>
@@ -240,6 +244,9 @@
240
       <if test="createTime != null" >
244
       <if test="createTime != null" >
241
         #{createTime,jdbcType=TIMESTAMP},
245
         #{createTime,jdbcType=TIMESTAMP},
242
       </if>
246
       </if>
247
+      <if test="overTime != null" >
248
+        #{overTime,jdbcType=TIMESTAMP},
249
+      </if>
243
       <if test="intoStorehouse != null" >
250
       <if test="intoStorehouse != null" >
244
         #{intoStorehouse,jdbcType=INTEGER},
251
         #{intoStorehouse,jdbcType=INTEGER},
245
       </if>
252
       </if>
@@ -317,6 +324,9 @@
317
       <if test="record.createTime != null" >
324
       <if test="record.createTime != null" >
318
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
325
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
319
       </if>
326
       </if>
327
+      <if test="record.overTime != null" >
328
+        over_time = #{record.overTime,jdbcType=TIMESTAMP},
329
+      </if>
320
       <if test="record.intoStorehouse != null" >
330
       <if test="record.intoStorehouse != null" >
321
         into_storehouse = #{record.intoStorehouse,jdbcType=INTEGER},
331
         into_storehouse = #{record.intoStorehouse,jdbcType=INTEGER},
322
       </if>
332
       </if>
@@ -362,6 +372,7 @@
362
       out_before = #{record.outBefore,jdbcType=VARCHAR},
372
       out_before = #{record.outBefore,jdbcType=VARCHAR},
363
       apply_firm = #{record.applyFirm,jdbcType=VARCHAR},
373
       apply_firm = #{record.applyFirm,jdbcType=VARCHAR},
364
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
374
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
375
+      over_time = #{record.overTime,jdbcType=TIMESTAMP},
365
       into_storehouse = #{record.intoStorehouse,jdbcType=INTEGER},
376
       into_storehouse = #{record.intoStorehouse,jdbcType=INTEGER},
366
       into_storehouse_name = #{record.intoStorehouseName,jdbcType=VARCHAR},
377
       into_storehouse_name = #{record.intoStorehouseName,jdbcType=VARCHAR},
367
       into_warehouse = #{record.intoWarehouse,jdbcType=INTEGER},
378
       into_warehouse = #{record.intoWarehouse,jdbcType=INTEGER},
@@ -376,18 +387,18 @@
376
   </update>
387
   </update>
377
   <select id="contractData" parameterType="java.util.Map" resultType="java.util.HashMap">
388
   <select id="contractData" parameterType="java.util.Map" resultType="java.util.HashMap">
378
     SELECT DISTINCT
389
     SELECT DISTINCT
379
-        storagehouse.*
390
+    storagehouse.*
380
     FROM
391
     FROM
381
-      storage_change_storagehouse_default storagehouse
392
+    storage_change_storagehouse_default storagehouse
382
     INNER JOIN (
393
     INNER JOIN (
383
-        SELECT
384
-          changehouse_no,
385
-          max(create_time) maxTime
386
-        FROM
387
-          storage_change_storagehouse_default
388
-        GROUP BY
389
-        changehouse_no
390
-      ) AS b ON storagehouse.changehouse_no = b.changehouse_no AND storagehouse.create_time = b.maxTime
394
+    SELECT
395
+    changehouse_no,
396
+    max(create_time) maxTime
397
+    FROM
398
+    storage_change_storagehouse_default
399
+    GROUP BY
400
+    changehouse_no
401
+    ) AS b ON storagehouse.changehouse_no = b.changehouse_no AND storagehouse.create_time = b.maxTime
391
     WHERE 1=1
402
     WHERE 1=1
392
     <if test="orgId != null" >
403
     <if test="orgId != null" >
393
       AND storagehouse.org_id = #{orgId,jdbcType=INTEGER}
404
       AND storagehouse.org_id = #{orgId,jdbcType=INTEGER}

+ 1 - 1
src/main/java/com/chinaitop/depot/storage/mapper/StorageChangeStoragehouseRopMapper.java

@@ -19,6 +19,6 @@ public interface StorageChangeStoragehouseRopMapper {
19
     int updateByExampleSelective(@Param("record") StorageChangeStoragehouseRop record, @Param("example") StorageChangeStoragehouseRopExample example);
19
     int updateByExampleSelective(@Param("record") StorageChangeStoragehouseRop record, @Param("example") StorageChangeStoragehouseRopExample example);
20
 
20
 
21
     int updateByExample(@Param("record") StorageChangeStoragehouseRop record, @Param("example") StorageChangeStoragehouseRopExample example);
21
     int updateByExample(@Param("record") StorageChangeStoragehouseRop record, @Param("example") StorageChangeStoragehouseRopExample example);
22
-    
22
+
23
     int updateByPrimaryKeySelective(StorageChangeStoragehouseRop record);
23
     int updateByPrimaryKeySelective(StorageChangeStoragehouseRop record);
24
 }
24
 }

+ 21 - 20
src/main/java/com/chinaitop/depot/storage/mapper/StorageChangeStoragehouseRopMapper.xml

@@ -17,6 +17,7 @@
17
     <result column="out_before" property="outBefore" jdbcType="VARCHAR" />
17
     <result column="out_before" property="outBefore" jdbcType="VARCHAR" />
18
     <result column="apply_firm" property="applyFirm" jdbcType="VARCHAR" />
18
     <result column="apply_firm" property="applyFirm" jdbcType="VARCHAR" />
19
     <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
19
     <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
20
+    <result column="over_time" property="overTime" jdbcType="TIMESTAMP" />
20
     <result column="into_storehouse" property="intoStorehouse" jdbcType="INTEGER" />
21
     <result column="into_storehouse" property="intoStorehouse" jdbcType="INTEGER" />
21
     <result column="into_storehouse_name" property="intoStorehouseName" jdbcType="VARCHAR" />
22
     <result column="into_storehouse_name" property="intoStorehouseName" jdbcType="VARCHAR" />
22
     <result column="into_warehouse" property="intoWarehouse" jdbcType="INTEGER" />
23
     <result column="into_warehouse" property="intoWarehouse" jdbcType="INTEGER" />
@@ -25,7 +26,6 @@
25
     <result column="food_number" property="foodNumber" jdbcType="DECIMAL" />
26
     <result column="food_number" property="foodNumber" jdbcType="DECIMAL" />
26
     <result column="goal_number" property="goalNumber" jdbcType="DECIMAL" />
27
     <result column="goal_number" property="goalNumber" jdbcType="DECIMAL" />
27
     <result column="out_after" property="outAfter" jdbcType="VARCHAR" />
28
     <result column="out_after" property="outAfter" jdbcType="VARCHAR" />
28
-    <result column="oper_staff" property="operStaff" jdbcType="VARCHAR" />
29
   </resultMap>
29
   </resultMap>
30
   <sql id="Example_Where_Clause" >
30
   <sql id="Example_Where_Clause" >
31
     <where >
31
     <where >
@@ -88,8 +88,8 @@
88
   <sql id="Base_Column_List" >
88
   <sql id="Base_Column_List" >
89
     changehouse_no, org_id, apply_no, apply_time, out_storehouse, out_storehouse_name, 
89
     changehouse_no, org_id, apply_no, apply_time, out_storehouse, out_storehouse_name, 
90
     out_warehouse, out_warehouse_name, food_war, food_status, food_nature, bit_weigh, 
90
     out_warehouse, out_warehouse_name, food_war, food_status, food_nature, bit_weigh, 
91
-    out_before, apply_firm, create_time, into_storehouse, into_storehouse_name, into_warehouse, 
92
-    into_warehouse_name, detail_war, food_number, goal_number, out_after, oper_staff
91
+    out_before, apply_firm, create_time, over_time, into_storehouse, into_storehouse_name, 
92
+    into_warehouse, into_warehouse_name, detail_war, food_number, goal_number, out_after
93
   </sql>
93
   </sql>
94
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseRopExample" >
94
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseRopExample" >
95
     select
95
     select
@@ -117,18 +117,18 @@
117
       out_warehouse, out_warehouse_name, food_war, 
117
       out_warehouse, out_warehouse_name, food_war, 
118
       food_status, food_nature, bit_weigh, 
118
       food_status, food_nature, bit_weigh, 
119
       out_before, apply_firm, create_time, 
119
       out_before, apply_firm, create_time, 
120
-      into_storehouse, into_storehouse_name, into_warehouse, 
121
-      into_warehouse_name, detail_war, food_number, 
122
-      goal_number, out_after, oper_staff
120
+      over_time, into_storehouse, into_storehouse_name, 
121
+      into_warehouse, into_warehouse_name, detail_war, 
122
+      food_number, goal_number, out_after
123
       )
123
       )
124
     values (#{changehouseNo,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, #{applyNo,jdbcType=VARCHAR}, 
124
     values (#{changehouseNo,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, #{applyNo,jdbcType=VARCHAR}, 
125
       #{applyTime,jdbcType=TIMESTAMP}, #{outStorehouse,jdbcType=INTEGER}, #{outStorehouseName,jdbcType=VARCHAR}, 
125
       #{applyTime,jdbcType=TIMESTAMP}, #{outStorehouse,jdbcType=INTEGER}, #{outStorehouseName,jdbcType=VARCHAR}, 
126
       #{outWarehouse,jdbcType=INTEGER}, #{outWarehouseName,jdbcType=VARCHAR}, #{foodWar,jdbcType=INTEGER}, 
126
       #{outWarehouse,jdbcType=INTEGER}, #{outWarehouseName,jdbcType=VARCHAR}, #{foodWar,jdbcType=INTEGER}, 
127
       #{foodStatus,jdbcType=VARCHAR}, #{foodNature,jdbcType=VARCHAR}, #{bitWeigh,jdbcType=VARCHAR}, 
127
       #{foodStatus,jdbcType=VARCHAR}, #{foodNature,jdbcType=VARCHAR}, #{bitWeigh,jdbcType=VARCHAR}, 
128
       #{outBefore,jdbcType=VARCHAR}, #{applyFirm,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
128
       #{outBefore,jdbcType=VARCHAR}, #{applyFirm,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
129
-      #{intoStorehouse,jdbcType=INTEGER}, #{intoStorehouseName,jdbcType=VARCHAR}, #{intoWarehouse,jdbcType=INTEGER}, 
130
-      #{intoWarehouseName,jdbcType=VARCHAR}, #{detailWar,jdbcType=INTEGER}, #{foodNumber,jdbcType=DECIMAL}, 
131
-      #{goalNumber,jdbcType=DECIMAL}, #{outAfter,jdbcType=VARCHAR}, #{operStaff,jdbcType=VARCHAR}
129
+      #{overTime,jdbcType=TIMESTAMP}, #{intoStorehouse,jdbcType=INTEGER}, #{intoStorehouseName,jdbcType=VARCHAR}, 
130
+      #{intoWarehouse,jdbcType=INTEGER}, #{intoWarehouseName,jdbcType=VARCHAR}, #{detailWar,jdbcType=INTEGER}, 
131
+      #{foodNumber,jdbcType=DECIMAL}, #{goalNumber,jdbcType=DECIMAL}, #{outAfter,jdbcType=VARCHAR}
132
       )
132
       )
133
   </insert>
133
   </insert>
134
   <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseRop" >
134
   <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseRop" >
@@ -179,6 +179,9 @@
179
       <if test="createTime != null" >
179
       <if test="createTime != null" >
180
         create_time,
180
         create_time,
181
       </if>
181
       </if>
182
+      <if test="overTime != null" >
183
+        over_time,
184
+      </if>
182
       <if test="intoStorehouse != null" >
185
       <if test="intoStorehouse != null" >
183
         into_storehouse,
186
         into_storehouse,
184
       </if>
187
       </if>
@@ -203,9 +206,6 @@
203
       <if test="outAfter != null" >
206
       <if test="outAfter != null" >
204
         out_after,
207
         out_after,
205
       </if>
208
       </if>
206
-      <if test="operStaff != null" >
207
-        oper_staff,
208
-      </if>
209
     </trim>
209
     </trim>
210
     <trim prefix="values (" suffix=")" suffixOverrides="," >
210
     <trim prefix="values (" suffix=")" suffixOverrides="," >
211
       <if test="changehouseNo != null" >
211
       <if test="changehouseNo != null" >
@@ -253,6 +253,9 @@
253
       <if test="createTime != null" >
253
       <if test="createTime != null" >
254
         #{createTime,jdbcType=TIMESTAMP},
254
         #{createTime,jdbcType=TIMESTAMP},
255
       </if>
255
       </if>
256
+      <if test="overTime != null" >
257
+        #{overTime,jdbcType=TIMESTAMP},
258
+      </if>
256
       <if test="intoStorehouse != null" >
259
       <if test="intoStorehouse != null" >
257
         #{intoStorehouse,jdbcType=INTEGER},
260
         #{intoStorehouse,jdbcType=INTEGER},
258
       </if>
261
       </if>
@@ -277,9 +280,6 @@
277
       <if test="outAfter != null" >
280
       <if test="outAfter != null" >
278
         #{outAfter,jdbcType=VARCHAR},
281
         #{outAfter,jdbcType=VARCHAR},
279
       </if>
282
       </if>
280
-      <if test="operStaff != null" >
281
-        #{operStaff,jdbcType=VARCHAR},
282
-      </if>
283
     </trim>
283
     </trim>
284
   </insert>
284
   </insert>
285
   <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseRopExample" resultType="java.lang.Integer" >
285
   <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseRopExample" resultType="java.lang.Integer" >
@@ -336,6 +336,9 @@
336
       <if test="record.createTime != null" >
336
       <if test="record.createTime != null" >
337
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
337
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
338
       </if>
338
       </if>
339
+      <if test="record.overTime != null" >
340
+        over_time = #{record.overTime,jdbcType=TIMESTAMP},
341
+      </if>
339
       <if test="record.intoStorehouse != null" >
342
       <if test="record.intoStorehouse != null" >
340
         into_storehouse = #{record.intoStorehouse,jdbcType=INTEGER},
343
         into_storehouse = #{record.intoStorehouse,jdbcType=INTEGER},
341
       </if>
344
       </if>
@@ -360,9 +363,6 @@
360
       <if test="record.outAfter != null" >
363
       <if test="record.outAfter != null" >
361
         out_after = #{record.outAfter,jdbcType=VARCHAR},
364
         out_after = #{record.outAfter,jdbcType=VARCHAR},
362
       </if>
365
       </if>
363
-      <if test="record.operStaff != null" >
364
-        oper_staff = #{record.operStaff,jdbcType=VARCHAR},
365
-      </if>
366
     </set>
366
     </set>
367
     <if test="_parameter != null" >
367
     <if test="_parameter != null" >
368
       <include refid="Update_By_Example_Where_Clause" />
368
       <include refid="Update_By_Example_Where_Clause" />
@@ -385,6 +385,7 @@
385
       out_before = #{record.outBefore,jdbcType=VARCHAR},
385
       out_before = #{record.outBefore,jdbcType=VARCHAR},
386
       apply_firm = #{record.applyFirm,jdbcType=VARCHAR},
386
       apply_firm = #{record.applyFirm,jdbcType=VARCHAR},
387
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
387
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
388
+      over_time = #{record.overTime,jdbcType=TIMESTAMP},
388
       into_storehouse = #{record.intoStorehouse,jdbcType=INTEGER},
389
       into_storehouse = #{record.intoStorehouse,jdbcType=INTEGER},
389
       into_storehouse_name = #{record.intoStorehouseName,jdbcType=VARCHAR},
390
       into_storehouse_name = #{record.intoStorehouseName,jdbcType=VARCHAR},
390
       into_warehouse = #{record.intoWarehouse,jdbcType=INTEGER},
391
       into_warehouse = #{record.intoWarehouse,jdbcType=INTEGER},
@@ -392,12 +393,12 @@
392
       detail_war = #{record.detailWar,jdbcType=INTEGER},
393
       detail_war = #{record.detailWar,jdbcType=INTEGER},
393
       food_number = #{record.foodNumber,jdbcType=DECIMAL},
394
       food_number = #{record.foodNumber,jdbcType=DECIMAL},
394
       goal_number = #{record.goalNumber,jdbcType=DECIMAL},
395
       goal_number = #{record.goalNumber,jdbcType=DECIMAL},
395
-      out_after = #{record.outAfter,jdbcType=VARCHAR},
396
-      oper_staff = #{record.operStaff,jdbcType=VARCHAR}
396
+      out_after = #{record.outAfter,jdbcType=VARCHAR}
397
     <if test="_parameter != null" >
397
     <if test="_parameter != null" >
398
       <include refid="Update_By_Example_Where_Clause" />
398
       <include refid="Update_By_Example_Where_Clause" />
399
     </if>
399
     </if>
400
   </update>
400
   </update>
401
+
401
   <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseRop" >
402
   <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseRop" >
402
     update storage_change_storagehouse_rop
403
     update storage_change_storagehouse_rop
403
     <set >
404
     <set >

+ 24 - 6
src/main/java/com/chinaitop/depot/storage/model/StorageChangeStoragehouseDefault.java

@@ -1,19 +1,19 @@
1
 package com.chinaitop.depot.storage.model;
1
 package com.chinaitop.depot.storage.model;
2
 
2
 
3
+import com.fasterxml.jackson.annotation.JsonFormat;
4
+
3
 import java.math.BigDecimal;
5
 import java.math.BigDecimal;
4
 import java.util.Date;
6
 import java.util.Date;
5
 
7
 
6
-import com.fasterxml.jackson.annotation.JsonFormat;
7
-
8
 public class StorageChangeStoragehouseDefault {
8
 public class StorageChangeStoragehouseDefault {
9
     private String changehouseNo;
9
     private String changehouseNo;
10
 
10
 
11
     private Integer orgId;
11
     private Integer orgId;
12
 
12
 
13
     private String applyNo;
13
     private String applyNo;
14
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
15
-    private Date applyTime;
16
 
14
 
15
+    private Date applyTime;
16
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
17
     private Integer outStorehouse;
17
     private Integer outStorehouse;
18
 
18
 
19
     private String outStorehouseName;
19
     private String outStorehouseName;
@@ -31,9 +31,11 @@ public class StorageChangeStoragehouseDefault {
31
     private String outBefore;
31
     private String outBefore;
32
 
32
 
33
     private String applyFirm;
33
     private String applyFirm;
34
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
35
-    private Date createTime;
36
 
34
 
35
+    private Date createTime;
36
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
37
+    private Date overTime;
38
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
37
     private Integer intoStorehouse;
39
     private Integer intoStorehouse;
38
 
40
 
39
     private String intoStorehouseName;
41
     private String intoStorehouseName;
@@ -275,6 +277,22 @@ public class StorageChangeStoragehouseDefault {
275
     }
277
     }
276
 
278
 
277
     /**
279
     /**
280
+     * 结束日期
281
+     * @return over_time 结束日期
282
+     */
283
+    public Date getOverTime() {
284
+        return overTime;
285
+    }
286
+
287
+    /**
288
+     * 结束日期
289
+     * @param overTime 结束日期
290
+     */
291
+    public void setOverTime(Date overTime) {
292
+        this.overTime = overTime;
293
+    }
294
+
295
+    /**
278
      * 倒入仓房
296
      * 倒入仓房
279
      * @return into_storehouse 倒入仓房
297
      * @return into_storehouse 倒入仓房
280
      */
298
      */

+ 62 - 2
src/main/java/com/chinaitop/depot/storage/model/StorageChangeStoragehouseDefaultExample.java

@@ -75,7 +75,7 @@ public class StorageChangeStoragehouseDefaultExample {
75
     }
75
     }
76
 
76
 
77
     /**
77
     /**
78
-     * storage_change_storagehouse_default 2020-06-28
78
+     * storage_change_storagehouse_default 2020-09-07
79
      */
79
      */
80
     protected abstract static class GeneratedCriteria {
80
     protected abstract static class GeneratedCriteria {
81
         protected List<Criterion> criteria;
81
         protected List<Criterion> criteria;
@@ -1038,6 +1038,66 @@ public class StorageChangeStoragehouseDefaultExample {
1038
             return (Criteria) this;
1038
             return (Criteria) this;
1039
         }
1039
         }
1040
 
1040
 
1041
+        public Criteria andOverTimeIsNull() {
1042
+            addCriterion("over_time is null");
1043
+            return (Criteria) this;
1044
+        }
1045
+
1046
+        public Criteria andOverTimeIsNotNull() {
1047
+            addCriterion("over_time is not null");
1048
+            return (Criteria) this;
1049
+        }
1050
+
1051
+        public Criteria andOverTimeEqualTo(Date value) {
1052
+            addCriterion("over_time =", value, "overTime");
1053
+            return (Criteria) this;
1054
+        }
1055
+
1056
+        public Criteria andOverTimeNotEqualTo(Date value) {
1057
+            addCriterion("over_time <>", value, "overTime");
1058
+            return (Criteria) this;
1059
+        }
1060
+
1061
+        public Criteria andOverTimeGreaterThan(Date value) {
1062
+            addCriterion("over_time >", value, "overTime");
1063
+            return (Criteria) this;
1064
+        }
1065
+
1066
+        public Criteria andOverTimeGreaterThanOrEqualTo(Date value) {
1067
+            addCriterion("over_time >=", value, "overTime");
1068
+            return (Criteria) this;
1069
+        }
1070
+
1071
+        public Criteria andOverTimeLessThan(Date value) {
1072
+            addCriterion("over_time <", value, "overTime");
1073
+            return (Criteria) this;
1074
+        }
1075
+
1076
+        public Criteria andOverTimeLessThanOrEqualTo(Date value) {
1077
+            addCriterion("over_time <=", value, "overTime");
1078
+            return (Criteria) this;
1079
+        }
1080
+
1081
+        public Criteria andOverTimeIn(List<Date> values) {
1082
+            addCriterion("over_time in", values, "overTime");
1083
+            return (Criteria) this;
1084
+        }
1085
+
1086
+        public Criteria andOverTimeNotIn(List<Date> values) {
1087
+            addCriterion("over_time not in", values, "overTime");
1088
+            return (Criteria) this;
1089
+        }
1090
+
1091
+        public Criteria andOverTimeBetween(Date value1, Date value2) {
1092
+            addCriterion("over_time between", value1, value2, "overTime");
1093
+            return (Criteria) this;
1094
+        }
1095
+
1096
+        public Criteria andOverTimeNotBetween(Date value1, Date value2) {
1097
+            addCriterion("over_time not between", value1, value2, "overTime");
1098
+            return (Criteria) this;
1099
+        }
1100
+
1041
         public Criteria andIntoStorehouseIsNull() {
1101
         public Criteria andIntoStorehouseIsNull() {
1042
             addCriterion("into_storehouse is null");
1102
             addCriterion("into_storehouse is null");
1043
             return (Criteria) this;
1103
             return (Criteria) this;
@@ -1570,7 +1630,7 @@ public class StorageChangeStoragehouseDefaultExample {
1570
     }
1630
     }
1571
 
1631
 
1572
     /**
1632
     /**
1573
-     * storage_change_storagehouse_default 2020-06-28
1633
+     * storage_change_storagehouse_default 2020-09-07
1574
      */
1634
      */
1575
     public static class Criterion {
1635
     public static class Criterion {
1576
         private String condition;
1636
         private String condition;

+ 24 - 24
src/main/java/com/chinaitop/depot/storage/model/StorageChangeStoragehouseRop.java

@@ -1,19 +1,19 @@
1
 package com.chinaitop.depot.storage.model;
1
 package com.chinaitop.depot.storage.model;
2
 
2
 
3
+import com.fasterxml.jackson.annotation.JsonFormat;
4
+
3
 import java.math.BigDecimal;
5
 import java.math.BigDecimal;
4
 import java.util.Date;
6
 import java.util.Date;
5
 
7
 
6
-import com.fasterxml.jackson.annotation.JsonFormat;
7
-
8
 public class StorageChangeStoragehouseRop {
8
 public class StorageChangeStoragehouseRop {
9
     private String changehouseNo;
9
     private String changehouseNo;
10
 
10
 
11
     private Integer orgId;
11
     private Integer orgId;
12
 
12
 
13
     private String applyNo;
13
     private String applyNo;
14
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
15
-    private Date applyTime;
16
 
14
 
15
+    private Date applyTime;
16
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
17
     private Integer outStorehouse;
17
     private Integer outStorehouse;
18
 
18
 
19
     private String outStorehouseName;
19
     private String outStorehouseName;
@@ -33,9 +33,11 @@ public class StorageChangeStoragehouseRop {
33
     private String outBefore;
33
     private String outBefore;
34
 
34
 
35
     private String applyFirm;
35
     private String applyFirm;
36
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
37
-    private Date createTime;
38
 
36
 
37
+    private Date createTime;
38
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
39
+    private Date overTime;
40
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
39
     private Integer intoStorehouse;
41
     private Integer intoStorehouse;
40
 
42
 
41
     private String intoStorehouseName;
43
     private String intoStorehouseName;
@@ -52,8 +54,6 @@ public class StorageChangeStoragehouseRop {
52
 
54
 
53
     private String outAfter;
55
     private String outAfter;
54
 
56
 
55
-    private String operStaff;
56
-
57
     /**
57
     /**
58
      * 倒仓通知单编号
58
      * 倒仓通知单编号
59
      * @return changehouse_no 倒仓通知单编号
59
      * @return changehouse_no 倒仓通知单编号
@@ -295,6 +295,22 @@ public class StorageChangeStoragehouseRop {
295
     }
295
     }
296
 
296
 
297
     /**
297
     /**
298
+     * 结束日期
299
+     * @return over_time 结束日期
300
+     */
301
+    public Date getOverTime() {
302
+        return overTime;
303
+    }
304
+
305
+    /**
306
+     * 结束日期
307
+     * @param overTime 结束日期
308
+     */
309
+    public void setOverTime(Date overTime) {
310
+        this.overTime = overTime;
311
+    }
312
+
313
+    /**
298
      * 倒入仓房
314
      * 倒入仓房
299
      * @return into_storehouse 倒入仓房
315
      * @return into_storehouse 倒入仓房
300
      */
316
      */
@@ -421,20 +437,4 @@ public class StorageChangeStoragehouseRop {
421
     public void setOutAfter(String outAfter) {
437
     public void setOutAfter(String outAfter) {
422
         this.outAfter = outAfter == null ? null : outAfter.trim();
438
         this.outAfter = outAfter == null ? null : outAfter.trim();
423
     }
439
     }
424
-
425
-    /**
426
-     * 操作人员
427
-     * @return oper_staff 操作人员
428
-     */
429
-    public String getOperStaff() {
430
-        return operStaff;
431
-    }
432
-
433
-    /**
434
-     * 操作人员
435
-     * @param operStaff 操作人员
436
-     */
437
-    public void setOperStaff(String operStaff) {
438
-        this.operStaff = operStaff == null ? null : operStaff.trim();
439
-    }
440
 }
440
 }

+ 62 - 72
src/main/java/com/chinaitop/depot/storage/model/StorageChangeStoragehouseRopExample.java

@@ -75,7 +75,7 @@ public class StorageChangeStoragehouseRopExample {
75
     }
75
     }
76
 
76
 
77
     /**
77
     /**
78
-     * storage_change_storagehouse_rop 2020-06-28
78
+     * storage_change_storagehouse_rop 2020-09-07
79
      */
79
      */
80
     protected abstract static class GeneratedCriteria {
80
     protected abstract static class GeneratedCriteria {
81
         protected List<Criterion> criteria;
81
         protected List<Criterion> criteria;
@@ -1108,6 +1108,66 @@ public class StorageChangeStoragehouseRopExample {
1108
             return (Criteria) this;
1108
             return (Criteria) this;
1109
         }
1109
         }
1110
 
1110
 
1111
+        public Criteria andOverTimeIsNull() {
1112
+            addCriterion("over_time is null");
1113
+            return (Criteria) this;
1114
+        }
1115
+
1116
+        public Criteria andOverTimeIsNotNull() {
1117
+            addCriterion("over_time is not null");
1118
+            return (Criteria) this;
1119
+        }
1120
+
1121
+        public Criteria andOverTimeEqualTo(Date value) {
1122
+            addCriterion("over_time =", value, "overTime");
1123
+            return (Criteria) this;
1124
+        }
1125
+
1126
+        public Criteria andOverTimeNotEqualTo(Date value) {
1127
+            addCriterion("over_time <>", value, "overTime");
1128
+            return (Criteria) this;
1129
+        }
1130
+
1131
+        public Criteria andOverTimeGreaterThan(Date value) {
1132
+            addCriterion("over_time >", value, "overTime");
1133
+            return (Criteria) this;
1134
+        }
1135
+
1136
+        public Criteria andOverTimeGreaterThanOrEqualTo(Date value) {
1137
+            addCriterion("over_time >=", value, "overTime");
1138
+            return (Criteria) this;
1139
+        }
1140
+
1141
+        public Criteria andOverTimeLessThan(Date value) {
1142
+            addCriterion("over_time <", value, "overTime");
1143
+            return (Criteria) this;
1144
+        }
1145
+
1146
+        public Criteria andOverTimeLessThanOrEqualTo(Date value) {
1147
+            addCriterion("over_time <=", value, "overTime");
1148
+            return (Criteria) this;
1149
+        }
1150
+
1151
+        public Criteria andOverTimeIn(List<Date> values) {
1152
+            addCriterion("over_time in", values, "overTime");
1153
+            return (Criteria) this;
1154
+        }
1155
+
1156
+        public Criteria andOverTimeNotIn(List<Date> values) {
1157
+            addCriterion("over_time not in", values, "overTime");
1158
+            return (Criteria) this;
1159
+        }
1160
+
1161
+        public Criteria andOverTimeBetween(Date value1, Date value2) {
1162
+            addCriterion("over_time between", value1, value2, "overTime");
1163
+            return (Criteria) this;
1164
+        }
1165
+
1166
+        public Criteria andOverTimeNotBetween(Date value1, Date value2) {
1167
+            addCriterion("over_time not between", value1, value2, "overTime");
1168
+            return (Criteria) this;
1169
+        }
1170
+
1111
         public Criteria andIntoStorehouseIsNull() {
1171
         public Criteria andIntoStorehouseIsNull() {
1112
             addCriterion("into_storehouse is null");
1172
             addCriterion("into_storehouse is null");
1113
             return (Criteria) this;
1173
             return (Criteria) this;
@@ -1617,76 +1677,6 @@ public class StorageChangeStoragehouseRopExample {
1617
             addCriterion("out_after not between", value1, value2, "outAfter");
1677
             addCriterion("out_after not between", value1, value2, "outAfter");
1618
             return (Criteria) this;
1678
             return (Criteria) this;
1619
         }
1679
         }
1620
-
1621
-        public Criteria andOperStaffIsNull() {
1622
-            addCriterion("oper_staff is null");
1623
-            return (Criteria) this;
1624
-        }
1625
-
1626
-        public Criteria andOperStaffIsNotNull() {
1627
-            addCriterion("oper_staff is not null");
1628
-            return (Criteria) this;
1629
-        }
1630
-
1631
-        public Criteria andOperStaffEqualTo(String value) {
1632
-            addCriterion("oper_staff =", value, "operStaff");
1633
-            return (Criteria) this;
1634
-        }
1635
-
1636
-        public Criteria andOperStaffNotEqualTo(String value) {
1637
-            addCriterion("oper_staff <>", value, "operStaff");
1638
-            return (Criteria) this;
1639
-        }
1640
-
1641
-        public Criteria andOperStaffGreaterThan(String value) {
1642
-            addCriterion("oper_staff >", value, "operStaff");
1643
-            return (Criteria) this;
1644
-        }
1645
-
1646
-        public Criteria andOperStaffGreaterThanOrEqualTo(String value) {
1647
-            addCriterion("oper_staff >=", value, "operStaff");
1648
-            return (Criteria) this;
1649
-        }
1650
-
1651
-        public Criteria andOperStaffLessThan(String value) {
1652
-            addCriterion("oper_staff <", value, "operStaff");
1653
-            return (Criteria) this;
1654
-        }
1655
-
1656
-        public Criteria andOperStaffLessThanOrEqualTo(String value) {
1657
-            addCriterion("oper_staff <=", value, "operStaff");
1658
-            return (Criteria) this;
1659
-        }
1660
-
1661
-        public Criteria andOperStaffLike(String value) {
1662
-            addCriterion("oper_staff like", value, "operStaff");
1663
-            return (Criteria) this;
1664
-        }
1665
-
1666
-        public Criteria andOperStaffNotLike(String value) {
1667
-            addCriterion("oper_staff not like", value, "operStaff");
1668
-            return (Criteria) this;
1669
-        }
1670
-
1671
-        public Criteria andOperStaffIn(List<String> values) {
1672
-            addCriterion("oper_staff in", values, "operStaff");
1673
-            return (Criteria) this;
1674
-        }
1675
-
1676
-        public Criteria andOperStaffNotIn(List<String> values) {
1677
-            addCriterion("oper_staff not in", values, "operStaff");
1678
-            return (Criteria) this;
1679
-        }
1680
-
1681
-        public Criteria andOperStaffBetween(String value1, String value2) {
1682
-            addCriterion("oper_staff between", value1, value2, "operStaff");
1683
-            return (Criteria) this;
1684
-        }
1685
-
1686
-        public Criteria andOperStaffNotBetween(String value1, String value2) {
1687
-            addCriterion("oper_staff not between", value1, value2, "operStaff");
1688
-            return (Criteria) this;
1689
-        }
1690
     }
1680
     }
1691
 
1681
 
1692
     /**
1682
     /**
@@ -1700,7 +1690,7 @@ public class StorageChangeStoragehouseRopExample {
1700
     }
1690
     }
1701
 
1691
 
1702
     /**
1692
     /**
1703
-     * storage_change_storagehouse_rop 2020-06-28
1693
+     * storage_change_storagehouse_rop 2020-09-07
1704
      */
1694
      */
1705
     public static class Criterion {
1695
     public static class Criterion {
1706
         private String condition;
1696
         private String condition;

+ 2 - 1
src/main/java/com/chinaitop/depot/storage/service/impl/StorageChangeStoragehouseRopServiceImpl.java

@@ -65,6 +65,7 @@ public class StorageChangeStoragehouseRopServiceImpl implements StorageChangeSto
65
         	storageChangeStoragehouseDefault.setApplyTime(jsonObject.getDate("apply_time")); //申请倒仓时间
65
         	storageChangeStoragehouseDefault.setApplyTime(jsonObject.getDate("apply_time")); //申请倒仓时间
66
         	storageChangeStoragehouseDefault.setBitWeigh("需要称重"); //  是否称重
66
         	storageChangeStoragehouseDefault.setBitWeigh("需要称重"); //  是否称重
67
         	storageChangeStoragehouseDefault.setCreateTime(jsonObject.getDate("createTime")); //接收时间
67
         	storageChangeStoragehouseDefault.setCreateTime(jsonObject.getDate("createTime")); //接收时间
68
+            storageChangeStoragehouseDefault.setOverTime(jsonObject.getDate("createTime"));  //结束时间
68
         	storageChangeStoragehouseDefault.setFoodNumber(jsonObject.getBigDecimal("foodNumber")); //粮食数量
69
         	storageChangeStoragehouseDefault.setFoodNumber(jsonObject.getBigDecimal("foodNumber")); //粮食数量
69
             storageChangeStoragehouseDefault.setOperStaff(jsonObject.getString("operStaff")); //操作人员
70
             storageChangeStoragehouseDefault.setOperStaff(jsonObject.getString("operStaff")); //操作人员
70
         	storageChangeStoragehouseDefault.setOutAfter(jsonObject.getString("out_after")); //倒出后保管方式
71
         	storageChangeStoragehouseDefault.setOutAfter(jsonObject.getString("out_after")); //倒出后保管方式
@@ -85,7 +86,7 @@ public class StorageChangeStoragehouseRopServiceImpl implements StorageChangeSto
85
              //货位
86
              //货位
86
              storageChangeStoragehouseDefault.setIntoWarehouse(wareHouseId); //倒入货位
87
              storageChangeStoragehouseDefault.setIntoWarehouse(wareHouseId); //倒入货位
87
              storageChangeStoragehouseDefault.setIntoWarehouseName(wareHouseName); //倒出货位名称
88
              storageChangeStoragehouseDefault.setIntoWarehouseName(wareHouseName); //倒出货位名称
88
-             storageChangeStoragehouseDefault.setOrgId(orgId);  //组织id
89
+             storageChangeStoragehouseDefault.setOrgId(jsonObject.getInteger("org_id"));  //组织id
89
              //根据倒出仓房编码查询倒出仓房、货位、组织机构数据 
90
              //根据倒出仓房编码查询倒出仓房、货位、组织机构数据 
90
              String hwbmout = jsonObject.getString("cfbmout");
91
              String hwbmout = jsonObject.getString("cfbmout");
91
              Map<String, Object> outwareDataMap = feignBasicService.getWareDataByHwbm(hwbmout);
92
              Map<String, Object> outwareDataMap = feignBasicService.getWareDataByHwbm(hwbmout);