Bläddra i källkod

日常检查新增字段和通风功能新增字段

fanxiongwei 3 år sedan
förälder
incheckning
57a01fe540

+ 191 - 6
src/main/java/com/chinaitop/depot/storage/mapper/StorageDailycheckMapper.xml

@@ -23,6 +23,18 @@
23 23
     <result column="rclamp" property="rclamp" jdbcType="VARCHAR" />
24 24
     <result column="rchygiene" property="rchygiene" jdbcType="VARCHAR" />
25 25
     <result column="rccorridor" property="rccorridor" jdbcType="VARCHAR" />
26
+    <result column="bgy" property="bgy" jdbcType="VARCHAR" />
27
+    <result column="cyry" property="cyry" jdbcType="VARCHAR" />
28
+    <result column="tqqk" property="tqqk" jdbcType="VARCHAR" />
29
+    <result column="lw" property="lw" jdbcType="DECIMAL" />
30
+    <result column="cw" property="cw" jdbcType="VARCHAR" />
31
+    <result column="qw" property="qw" jdbcType="VARCHAR" />
32
+    <result column="cns" property="cns" jdbcType="VARCHAR" />
33
+    <result column="cws" property="cws" jdbcType="VARCHAR" />
34
+    <result column="sfjl" property="sfjl" jdbcType="INTEGER" />
35
+    <result column="lsmbqk" property="lsmbqk" jdbcType="INTEGER" />
36
+    <result column="cfywxl" property="cfywxl" jdbcType="INTEGER" />
37
+    <result column="sffc" property="sffc" jdbcType="INTEGER" />
26 38
   </resultMap>
27 39
   <sql id="Example_Where_Clause" >
28 40
     <where >
@@ -85,7 +97,8 @@
85 97
   <sql id="Base_Column_List" >
86 98
     id, house_id, warehouse_id, org_id, sub_type, check_time, checker, pests_position,
87 99
     pests_density, pests_species, rain_check, ratfinch_check, other_check, find_question,
88
-    flag_type, rcdoor, rcwindow, rclamp, rchygiene, rccorridor
100
+    flag_type, rcdoor, rcwindow, rclamp, rchygiene, rccorridor, bgy, cyry,
101
+    tqqk, lw, cw, qw, cns, cws, sfjl, lsmbqk, cfywxl, sffc
89 102
   </sql>
90 103
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageDailycheckExample" >
91 104
     select
@@ -123,15 +136,19 @@
123 136
       checker, pests_position, pests_density,
124 137
       pests_species, rain_check, ratfinch_check,
125 138
       other_check, find_question, flag_type,
126
-      rcdoor, rcwindow,rclamp, rchygiene, rccorridor
139
+      rcdoor, rcwindow,rclamp, rchygiene, rccorridor, bgy, cyry,
140
+      tqqk, lw, cw, qw, cns, cws, sfjl, lsmbqk, cfywxl, sffc
127 141
       )
128 142
     values (#{id,jdbcType=INTEGER}, #{houseId,jdbcType=INTEGER}, #{warehouseId,jdbcType=INTEGER},
129 143
       #{orgId,jdbcType=INTEGER}, #{subType,jdbcType=INTEGER}, #{checkTime,jdbcType=TIMESTAMP},
130 144
       #{checker,jdbcType=VARCHAR}, #{pestsPosition,jdbcType=VARCHAR}, #{pestsDensity,jdbcType=INTEGER},
131 145
       #{pestsSpecies,jdbcType=INTEGER}, #{rainCheck,jdbcType=VARCHAR}, #{ratfinchCheck,jdbcType=VARCHAR},
132 146
       #{otherCheck,jdbcType=VARCHAR}, #{findQuestion,jdbcType=VARCHAR}, #{flagType,jdbcType=INTEGER},
133
-      #{rcdoor,jdbcType=VARCHAR}, #{rcwindow,jdbcType=VARCHAR}, #{rclamp,jdbcType=VARCHAR}, #{rchygiene,jdbcType=VARCHAR},#{rccorridor,jdbcType=INTEGER}
134
-      )
147
+      #{rcdoor,jdbcType=VARCHAR}, #{rcwindow,jdbcType=VARCHAR}, #{rclamp,jdbcType=VARCHAR}, #{rchygiene,jdbcType=VARCHAR},#{rccorridor,jdbcType=INTEGER},
148
+      #{bgy,jdbcType=VARCHAR}, #{cyry,jdbcType=VARCHAR}, #{tqqk,jdbcType=VARCHAR}, #{lw,jdbcType=DECIMAL},
149
+      #{cw,jdbcType=VARCHAR}, #{qw,jdbcType=VARCHAR}, #{cns,jdbcType=VARCHAR}, #{cws,jdbcType=VARCHAR},
150
+      #{sfjl,jdbcType=INTEGER}, #{lsmbqk,jdbcType=INTEGER}, #{cfywxl,jdbcType=INTEGER},
151
+      #{sffc,jdbcType=INTEGER})
135 152
   </insert>
136 153
   <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageDailycheck" >
137 154
     insert into storage_dailycheck
@@ -197,6 +214,42 @@
197 214
       <if test="rccorridor != null" >
198 215
         rccorridor,
199 216
       </if>
217
+      <if test="bgy != null" >
218
+        bgy,
219
+      </if>
220
+      <if test="cyry != null" >
221
+        cyry,
222
+      </if>
223
+      <if test="tqqk != null" >
224
+        tqqk,
225
+      </if>
226
+      <if test="lw != null" >
227
+        lw,
228
+      </if>
229
+      <if test="cw != null" >
230
+        cw,
231
+      </if>
232
+      <if test="qw != null" >
233
+        qw,
234
+      </if>
235
+      <if test="cns != null" >
236
+        cns,
237
+      </if>
238
+      <if test="cws != null" >
239
+        cws,
240
+      </if>
241
+      <if test="sfjl != null" >
242
+        sfjl,
243
+      </if>
244
+      <if test="lsmbqk != null" >
245
+        lsmbqk,
246
+      </if>
247
+      <if test="cfywxl != null" >
248
+        cfywxl,
249
+      </if>
250
+      <if test="sffc != null" >
251
+        sffc,
252
+      </if>
200 253
     </trim>
201 254
     <trim prefix="values (" suffix=")" suffixOverrides="," >
202 255
       SEQ_STORAGE_DAILYCHECK.nextVal,
@@ -260,6 +313,42 @@
260 313
       <if test="rccorridor != null" >
261 314
         #{rccorridor,jdbcType=VARCHAR},
262 315
       </if>
316
+      <if test="bgy != null" >
317
+        #{bgy,jdbcType=VARCHAR},
318
+      </if>
319
+      <if test="cyry != null" >
320
+        #{cyry,jdbcType=VARCHAR},
321
+      </if>
322
+      <if test="tqqk != null" >
323
+        #{tqqk,jdbcType=VARCHAR},
324
+      </if>
325
+      <if test="lw != null" >
326
+        #{lw,jdbcType=DECIMAL},
327
+      </if>
328
+      <if test="cw != null" >
329
+        #{cw,jdbcType=VARCHAR},
330
+      </if>
331
+      <if test="qw != null" >
332
+        #{qw,jdbcType=VARCHAR},
333
+      </if>
334
+      <if test="cns != null" >
335
+        #{cns,jdbcType=VARCHAR},
336
+      </if>
337
+      <if test="cws != null" >
338
+        #{cws,jdbcType=VARCHAR},
339
+      </if>
340
+      <if test="sfjl != null" >
341
+        #{sfjl,jdbcType=INTEGER},
342
+      </if>
343
+      <if test="lsmbqk != null" >
344
+        #{lsmbqk,jdbcType=INTEGER},
345
+      </if>
346
+      <if test="cfywxl != null" >
347
+        #{cfywxl,jdbcType=INTEGER},
348
+      </if>
349
+      <if test="sffc != null" >
350
+        #{sffc,jdbcType=INTEGER},
351
+      </if>
263 352
     </trim>
264 353
   </insert>
265 354
   <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageDailycheckExample" resultType="java.lang.Integer" >
@@ -334,6 +423,42 @@
334 423
       <if test="record.rccorridor != null" >
335 424
         rccorridor = #{record.rccorridor,jdbcType=INTEGER},
336 425
       </if>
426
+      <if test="record.bgy != null" >
427
+        bgy = #{record.bgy,jdbcType=VARCHAR},
428
+      </if>
429
+      <if test="record.cyry != null" >
430
+        cyry = #{record.cyry,jdbcType=VARCHAR},
431
+      </if>
432
+      <if test="record.tqqk != null" >
433
+        tqqk = #{record.tqqk,jdbcType=VARCHAR},
434
+      </if>
435
+      <if test="record.lw != null" >
436
+        lw = #{record.lw,jdbcType=DECIMAL},
437
+      </if>
438
+      <if test="record.cw != null" >
439
+        cw = #{record.cw,jdbcType=VARCHAR},
440
+      </if>
441
+      <if test="record.qw != null" >
442
+        qw = #{record.qw,jdbcType=VARCHAR},
443
+      </if>
444
+      <if test="record.cns != null" >
445
+        cns = #{record.cns,jdbcType=VARCHAR},
446
+      </if>
447
+      <if test="record.cws != null" >
448
+        cws = #{record.cws,jdbcType=VARCHAR},
449
+      </if>
450
+      <if test="record.sfjl != null" >
451
+        sfjl = #{record.sfjl,jdbcType=INTEGER},
452
+      </if>
453
+      <if test="record.lsmbqk != null" >
454
+        lsmbqk = #{record.lsmbqk,jdbcType=INTEGER},
455
+      </if>
456
+      <if test="record.cfywxl != null" >
457
+        cfywxl = #{record.cfywxl,jdbcType=INTEGER},
458
+      </if>
459
+      <if test="record.sffc != null" >
460
+        sffc = #{record.sffc,jdbcType=INTEGER},
461
+      </if>
337 462
     </set>
338 463
     <if test="_parameter != null" >
339 464
       <include refid="Update_By_Example_Where_Clause" />
@@ -360,7 +485,19 @@
360 485
     rcwindow = #{record.rcwindow,jdbcType=VARCHAR},
361 486
     rclamp = #{record.rclamp,jdbcType=VARCHAR},
362 487
     rchygiene = #{record.rchygiene,jdbcType=VARCHAR},
363
-    rccorridor = #{record.rccorridor,jdbcType=VARCHAR}
488
+    rccorridor = #{record.rccorridor,jdbcType=VARCHAR},
489
+    bgy = #{record.bgy,jdbcType=VARCHAR},
490
+    cyry = #{record.cyry,jdbcType=VARCHAR},
491
+    tqqk = #{record.tqqk,jdbcType=VARCHAR},
492
+    lw = #{record.lw,jdbcType=DECIMAL},
493
+    cw = #{record.cw,jdbcType=VARCHAR},
494
+    qw = #{record.qw,jdbcType=VARCHAR},
495
+    cns = #{record.cns,jdbcType=VARCHAR},
496
+    cws = #{record.cws,jdbcType=VARCHAR},
497
+    sfjl = #{record.sfjl,jdbcType=INTEGER},
498
+    lsmbqk = #{record.lsmbqk,jdbcType=INTEGER},
499
+    cfywxl = #{record.cfywxl,jdbcType=INTEGER},
500
+    sffc = #{record.sffc,jdbcType=INTEGER}
364 501
     <if test="_parameter != null" >
365 502
       <include refid="Update_By_Example_Where_Clause" />
366 503
     </if>
@@ -428,6 +565,42 @@
428 565
       <if test="rccorridor != null" >
429 566
         rccorridor = #{rccorridor,jdbcType=VARCHAR},
430 567
       </if>
568
+      <if test="bgy != null" >
569
+        bgy = #{bgy,jdbcType=VARCHAR},
570
+      </if>
571
+      <if test="cyry != null" >
572
+        cyry = #{cyry,jdbcType=VARCHAR},
573
+      </if>
574
+      <if test="tqqk != null" >
575
+        tqqk = #{tqqk,jdbcType=VARCHAR},
576
+      </if>
577
+      <if test="lw != null" >
578
+        lw = #{lw,jdbcType=DECIMAL},
579
+      </if>
580
+      <if test="cw != null" >
581
+        cw = #{cw,jdbcType=VARCHAR},
582
+      </if>
583
+      <if test="qw != null" >
584
+        qw = #{qw,jdbcType=VARCHAR},
585
+      </if>
586
+      <if test="cns != null" >
587
+        cns = #{cns,jdbcType=VARCHAR},
588
+      </if>
589
+      <if test="cws != null" >
590
+        cws = #{cws,jdbcType=VARCHAR},
591
+      </if>
592
+      <if test="sfjl != null" >
593
+        sfjl = #{sfjl,jdbcType=INTEGER},
594
+      </if>
595
+      <if test="lsmbqk != null" >
596
+        lsmbqk = #{lsmbqk,jdbcType=INTEGER},
597
+      </if>
598
+      <if test="cfywxl != null" >
599
+        cfywxl = #{cfywxl,jdbcType=INTEGER},
600
+      </if>
601
+      <if test="sffc != null" >
602
+        sffc = #{sffc,jdbcType=INTEGER},
603
+      </if>
431 604
     </set>
432 605
     where id = #{id,jdbcType=INTEGER}
433 606
   </update>
@@ -451,7 +624,19 @@
451 624
       rclamp = #{rclamp,jdbcType=VARCHAR},
452 625
       rchygiene = #{rchygiene,jdbcType=VARCHAR},
453 626
       rccorridor = #{rccorridor,jdbcType=VARCHAR},
454
-      flag_type = #{flagType,jdbcType=INTEGER}
627
+      flag_type = #{flagType,jdbcType=INTEGER},
628
+      bgy = #{bgy,jdbcType=VARCHAR},
629
+      cyry = #{cyry,jdbcType=VARCHAR},
630
+      tqqk = #{tqqk,jdbcType=VARCHAR},
631
+      lw = #{lw,jdbcType=DECIMAL},
632
+      cw = #{cw,jdbcType=VARCHAR},
633
+      qw = #{qw,jdbcType=VARCHAR},
634
+      cns = #{cns,jdbcType=VARCHAR},
635
+      cws = #{cws,jdbcType=VARCHAR},
636
+      sfjl = #{sfjl,jdbcType=INTEGER},
637
+      lsmbqk = #{lsmbqk,jdbcType=INTEGER},
638
+      cfywxl = #{cfywxl,jdbcType=INTEGER},
639
+      sffc = #{sffc,jdbcType=INTEGER}
455 640
     where id = #{id,jdbcType=INTEGER}
456 641
   </update>
457 642
 

+ 51 - 5
src/main/java/com/chinaitop/depot/storage/mapper/TVentilationOperationMapper.xml

@@ -97,6 +97,9 @@
97 97
     <result column="tfhlhq" property="tfhlhq" jdbcType="VARCHAR" />
98 98
     <result column="bz" property="bz" jdbcType="VARCHAR" />
99 99
     <result column="org_id" property="orgId" jdbcType="INTEGER" />
100
+    <result column="fdxs" jdbcType="VARCHAR" property="fdxs" />
101
+    <result column="zfdzcd" jdbcType="DECIMAL" property="zfdzcd" />
102
+    <result column="zfdjmj_zhi" jdbcType="DECIMAL" property="zfdjmjZhi" />
100 103
   </resultMap>
101 104
   <sql id="Example_Where_Clause" >
102 105
     <!--
@@ -180,7 +183,7 @@
180 183
     four_pjqs, four_zysc, tfqpjlw, tfhpjlw, jwfd, dljwnh, sslssl, tfqpjsf, tfhpjsf, jsfd, 
181 184
     dljsnh, bsxgpjjg, jyxzx, jyxsc, jyxzc, jyxxc, tfqcnw, tfqcns, tfqcww, tfqcws, tfqzglw, 
182 185
     tfqzdlw, tfhcnw, tfhcns, tfhcww, tfhcws, tfhzglw, tfhzdlw, tfqyq, tfqeyht, tfqlhq, 
183
-    tfhyq, tfheyht, tfhlhq, bz, org_id
186
+    tfhyq, tfheyht, tfhlhq, bz, org_id, fdxs, zfdzcd, zfdjmj_zhi
184 187
   </sql>
185 188
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.TVentilationOperationExample" >
186 189
     <!--
@@ -266,7 +269,7 @@
266 269
       tfhzglw, tfhzdlw, tfqyq, 
267 270
       tfqeyht, tfqlhq, tfhyq, 
268 271
       tfheyht, tfhlhq, bz, 
269
-      org_id)
272
+      org_id, fdxs, zfdzcd, zfdjmj_zhi)
270 273
     values (#{id,jdbcType=VARCHAR}, #{cfbh,jdbcType=VARCHAR}, #{cfmc,jdbcType=VARCHAR}, 
271 274
       #{cflx,jdbcType=VARCHAR}, #{cncd,jdbcType=VARCHAR}, #{cnkd,jdbcType=VARCHAR}, #{zjnj,jdbcType=VARCHAR}, 
272 275
       #{sjclxgd,jdbcType=VARCHAR}, #{pz,jdbcType=INTEGER}, #{sl,jdbcType=VARCHAR}, #{kxd,jdbcType=VARCHAR}, 
@@ -295,7 +298,8 @@
295 298
       #{tfhzglw,jdbcType=VARCHAR}, #{tfhzdlw,jdbcType=VARCHAR}, #{tfqyq,jdbcType=VARCHAR}, 
296 299
       #{tfqeyht,jdbcType=VARCHAR}, #{tfqlhq,jdbcType=VARCHAR}, #{tfhyq,jdbcType=VARCHAR}, 
297 300
       #{tfheyht,jdbcType=VARCHAR}, #{tfhlhq,jdbcType=VARCHAR}, #{bz,jdbcType=VARCHAR}, 
298
-      #{orgId,jdbcType=INTEGER})
301
+      #{orgId,jdbcType=INTEGER}, #{fdxs,jdbcType=VARCHAR}, #{zfdzcd,jdbcType=DECIMAL},
302
+    #{zfdjmjZhi,jdbcType=DECIMAL})
299 303
   </insert>
300 304
   <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.TVentilationOperation" >
301 305
     <!--
@@ -575,6 +579,15 @@
575 579
       <if test="orgId != null" >
576 580
         org_id,
577 581
       </if>
582
+      <if test="fdxs != null">
583
+        fdxs,
584
+      </if>
585
+      <if test="zfdzcd != null">
586
+        zfdzcd,
587
+      </if>
588
+      <if test="zfdjmjZhi != null">
589
+        zfdjmj_zhi,
590
+      </if>
578 591
     </trim>
579 592
     <trim prefix="values (" suffix=")" suffixOverrides="," >
580 593
       <if test="id != null" >
@@ -847,6 +860,15 @@
847 860
       <if test="orgId != null" >
848 861
         #{orgId,jdbcType=INTEGER},
849 862
       </if>
863
+      <if test="fdxs != null">
864
+        #{fdxs,jdbcType=VARCHAR},
865
+      </if>
866
+      <if test="zfdzcd != null">
867
+        #{zfdzcd,jdbcType=DECIMAL},
868
+      </if>
869
+      <if test="zfdjmjZhi != null">
870
+        #{zfdjmjZhi,jdbcType=DECIMAL},
871
+      </if>
850 872
     </trim>
851 873
   </insert>
852 874
   <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.TVentilationOperationExample" resultType="java.lang.Integer" >
@@ -1138,6 +1160,15 @@
1138 1160
       <if test="record.orgId != null" >
1139 1161
         org_id = #{record.orgId,jdbcType=INTEGER},
1140 1162
       </if>
1163
+      <if test="record.fdxs != null">
1164
+        fdxs = #{record.fdxs,jdbcType=VARCHAR},
1165
+      </if>
1166
+      <if test="record.zfdzcd != null">
1167
+        zfdzcd = #{record.zfdzcd,jdbcType=DECIMAL},
1168
+      </if>
1169
+      <if test="record.zfdjmjZhi != null">
1170
+        zfdjmj_zhi = #{record.zfdjmjZhi,jdbcType=DECIMAL},
1171
+      </if>
1141 1172
     </set>
1142 1173
     <if test="_parameter != null" >
1143 1174
       <include refid="Update_By_Example_Where_Clause" />
@@ -1239,7 +1270,10 @@
1239 1270
       tfheyht = #{record.tfheyht,jdbcType=VARCHAR},
1240 1271
       tfhlhq = #{record.tfhlhq,jdbcType=VARCHAR},
1241 1272
       bz = #{record.bz,jdbcType=VARCHAR},
1242
-      org_id = #{record.orgId,jdbcType=INTEGER}
1273
+      org_id = #{record.orgId,jdbcType=INTEGER},
1274
+      fdxs = #{record.fdxs,jdbcType=VARCHAR},
1275
+      zfdzcd = #{record.zfdzcd,jdbcType=DECIMAL},
1276
+      zfdjmj_zhi = #{record.zfdjmjZhi,jdbcType=DECIMAL}
1243 1277
     <if test="_parameter != null" >
1244 1278
       <include refid="Update_By_Example_Where_Clause" />
1245 1279
     </if>
@@ -1519,6 +1553,15 @@
1519 1553
       <if test="orgId != null" >
1520 1554
         org_id = #{orgId,jdbcType=INTEGER},
1521 1555
       </if>
1556
+      <if test="fdxs != null">
1557
+        fdxs = #{fdxs,jdbcType=VARCHAR},
1558
+      </if>
1559
+      <if test="zfdzcd != null">
1560
+        zfdzcd = #{zfdzcd,jdbcType=DECIMAL},
1561
+      </if>
1562
+      <if test="zfdjmjZhi != null">
1563
+        zfdjmj_zhi = #{zfdjmjZhi,jdbcType=DECIMAL},
1564
+      </if>
1522 1565
     </set>
1523 1566
     where id = #{id,jdbcType=VARCHAR}
1524 1567
   </update>
@@ -1617,7 +1660,10 @@
1617 1660
       tfheyht = #{tfheyht,jdbcType=VARCHAR},
1618 1661
       tfhlhq = #{tfhlhq,jdbcType=VARCHAR},
1619 1662
       bz = #{bz,jdbcType=VARCHAR},
1620
-      org_id = #{orgId,jdbcType=INTEGER}
1663
+      org_id = #{orgId,jdbcType=INTEGER},
1664
+      fdxs = #{fdxs,jdbcType=VARCHAR},
1665
+      zfdzcd = #{zfdzcd,jdbcType=DECIMAL},
1666
+      zfdjmj_zhi = #{zfdjmjZhi,jdbcType=DECIMAL}
1621 1667
     where id = #{id,jdbcType=VARCHAR}
1622 1668
   </update>
1623 1669
 </mapper>

+ 121 - 0
src/main/java/com/chinaitop/depot/storage/model/StorageDailycheck.java

@@ -1,5 +1,6 @@
1 1
 package com.chinaitop.depot.storage.model;
2 2
 
3
+import java.math.BigDecimal;
3 4
 import java.util.Date;
4 5
 
5 6
 public class StorageDailycheck {
@@ -15,6 +16,30 @@ public class StorageDailycheck {
15 16
 
16 17
     private String rccorridor;//查粮走道
17 18
 
19
+    private String bgy;
20
+
21
+    private String cyry;
22
+
23
+    private String tqqk;
24
+
25
+    private BigDecimal lw;
26
+
27
+    private String cw;
28
+
29
+    private String qw;
30
+
31
+    private String cns;
32
+
33
+    private String cws;
34
+
35
+    private Integer sfjl;
36
+
37
+    private Integer lsmbqk;
38
+
39
+    private Integer cfywxl;
40
+
41
+    private Integer sffc;
42
+
18 43
     public String getRcdoor() {
19 44
         return rcdoor;
20 45
     }
@@ -334,4 +359,100 @@ public class StorageDailycheck {
334 359
     public void setDailycardId(String dailycardId) {
335 360
         this.dailycardId = dailycardId;
336 361
     }
362
+
363
+    public String getBgy() {
364
+        return bgy;
365
+    }
366
+
367
+    public void setBgy(String bgy) {
368
+        this.bgy = bgy;
369
+    }
370
+
371
+    public String getCyry() {
372
+        return cyry;
373
+    }
374
+
375
+    public void setCyry(String cyry) {
376
+        this.cyry = cyry;
377
+    }
378
+
379
+    public String getTqqk() {
380
+        return tqqk;
381
+    }
382
+
383
+    public void setTqqk(String tqqk) {
384
+        this.tqqk = tqqk;
385
+    }
386
+
387
+    public BigDecimal getLw() {
388
+        return lw;
389
+    }
390
+
391
+    public void setLw(BigDecimal lw) {
392
+        this.lw = lw;
393
+    }
394
+
395
+    public String getCw() {
396
+        return cw;
397
+    }
398
+
399
+    public void setCw(String cw) {
400
+        this.cw = cw;
401
+    }
402
+
403
+    public String getQw() {
404
+        return qw;
405
+    }
406
+
407
+    public void setQw(String qw) {
408
+        this.qw = qw;
409
+    }
410
+
411
+    public String getCns() {
412
+        return cns;
413
+    }
414
+
415
+    public void setCns(String cns) {
416
+        this.cns = cns;
417
+    }
418
+
419
+    public String getCws() {
420
+        return cws;
421
+    }
422
+
423
+    public void setCws(String cws) {
424
+        this.cws = cws;
425
+    }
426
+
427
+    public Integer getSfjl() {
428
+        return sfjl;
429
+    }
430
+
431
+    public void setSfjl(Integer sfjl) {
432
+        this.sfjl = sfjl;
433
+    }
434
+
435
+    public Integer getLsmbqk() {
436
+        return lsmbqk;
437
+    }
438
+
439
+    public void setLsmbqk(Integer lsmbqk) {
440
+        this.lsmbqk = lsmbqk;
441
+    }
442
+
443
+    public Integer getCfywxl() {
444
+        return cfywxl;
445
+    }
446
+
447
+    public void setCfywxl(Integer cfywxl) {
448
+        this.cfywxl = cfywxl;
449
+    }
450
+
451
+    public Integer getSffc() {
452
+        return sffc;
453
+    }
454
+
455
+    public void setSffc(Integer sffc) {
456
+        this.sffc = sffc;
457
+    }
337 458
 }

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1213 - 2
src/main/java/com/chinaitop/depot/storage/model/StorageDailycheckExample.java


+ 55 - 0
src/main/java/com/chinaitop/depot/storage/model/TVentilationOperation.java

@@ -1,5 +1,6 @@
1 1
 package com.chinaitop.depot.storage.model;
2 2
 
3
+import java.math.BigDecimal;
3 4
 import java.util.Date;
4 5
 
5 6
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -740,6 +741,12 @@ public class TVentilationOperation {
740 741
      */
741 742
     private Integer orgId;
742 743
 
744
+    private String fdxs;
745
+
746
+    private BigDecimal zfdzcd;
747
+
748
+    private BigDecimal zfdjmjZhi;
749
+
743 750
     /**
744 751
      * This method was generated by MyBatis Generator.
745 752
      * This method returns the value of the database column t_ventilation_operation.id
@@ -2899,4 +2906,52 @@ public class TVentilationOperation {
2899 2906
     public void setOrgId(Integer orgId) {
2900 2907
         this.orgId = orgId;
2901 2908
     }
2909
+
2910
+    /**
2911
+     * null
2912
+     * @return fdxs null
2913
+     */
2914
+    public String getFdxs() {
2915
+        return fdxs;
2916
+    }
2917
+
2918
+    /**
2919
+     * null
2920
+     * @param fdxs null
2921
+     */
2922
+    public void setFdxs(String fdxs) {
2923
+        this.fdxs = fdxs == null ? null : fdxs.trim();
2924
+    }
2925
+
2926
+    /**
2927
+     * null
2928
+     * @return zfdzcd null
2929
+     */
2930
+    public BigDecimal getZfdzcd() {
2931
+        return zfdzcd;
2932
+    }
2933
+
2934
+    /**
2935
+     * null
2936
+     * @param zfdzcd null
2937
+     */
2938
+    public void setZfdzcd(BigDecimal zfdzcd) {
2939
+        this.zfdzcd = zfdzcd;
2940
+    }
2941
+
2942
+    /**
2943
+     * null
2944
+     * @return zfdjmj_zhi null
2945
+     */
2946
+    public BigDecimal getZfdjmjZhi() {
2947
+        return zfdjmjZhi;
2948
+    }
2949
+
2950
+    /**
2951
+     * null
2952
+     * @param zfdjmjZhi null
2953
+     */
2954
+    public void setZfdjmjZhi(BigDecimal zfdjmjZhi) {
2955
+        this.zfdjmjZhi = zfdjmjZhi;
2956
+    }
2902 2957
 }

+ 197 - 90
src/main/java/com/chinaitop/depot/storage/model/TVentilationOperationExample.java

@@ -1,5 +1,6 @@
1 1
 package com.chinaitop.depot.storage.model;
2 2
 
3
+import java.math.BigDecimal;
3 4
 import java.util.ArrayList;
4 5
 import java.util.Date;
5 6
 import java.util.Iterator;
@@ -7,117 +8,54 @@ import java.util.List;
7 8
 
8 9
 public class TVentilationOperationExample {
9 10
     /**
10
-     * This field was generated by MyBatis Generator.
11
-     * This field corresponds to the database table t_ventilation_operation
12
-     *
13
-     * @mbggenerated Sun Jun 28 17:44:27 CST 2020
11
+     * t_ventilation_operation
14 12
      */
15 13
     protected String orderByClause;
16 14
 
17 15
     /**
18
-     * This field was generated by MyBatis Generator.
19
-     * This field corresponds to the database table t_ventilation_operation
20
-     *
21
-     * @mbggenerated Sun Jun 28 17:44:27 CST 2020
16
+     * t_ventilation_operation
22 17
      */
23 18
     protected boolean distinct;
24 19
 
25 20
     /**
26
-     * This field was generated by MyBatis Generator.
27
-     * This field corresponds to the database table t_ventilation_operation
28
-     *
29
-     * @mbggenerated Sun Jun 28 17:44:27 CST 2020
21
+     * t_ventilation_operation
30 22
      */
31 23
     protected List<Criteria> oredCriteria;
32 24
 
33
-    /**
34
-     * This method was generated by MyBatis Generator.
35
-     * This method corresponds to the database table t_ventilation_operation
36
-     *
37
-     * @mbggenerated Sun Jun 28 17:44:27 CST 2020
38
-     */
39 25
     public TVentilationOperationExample() {
40 26
         oredCriteria = new ArrayList<Criteria>();
41 27
     }
42 28
 
43
-    /**
44
-     * This method was generated by MyBatis Generator.
45
-     * This method corresponds to the database table t_ventilation_operation
46
-     *
47
-     * @mbggenerated Sun Jun 28 17:44:27 CST 2020
48
-     */
49 29
     public void setOrderByClause(String orderByClause) {
50 30
         this.orderByClause = orderByClause;
51 31
     }
52 32
 
53
-    /**
54
-     * This method was generated by MyBatis Generator.
55
-     * This method corresponds to the database table t_ventilation_operation
56
-     *
57
-     * @mbggenerated Sun Jun 28 17:44:27 CST 2020
58
-     */
59 33
     public String getOrderByClause() {
60 34
         return orderByClause;
61 35
     }
62 36
 
63
-    /**
64
-     * This method was generated by MyBatis Generator.
65
-     * This method corresponds to the database table t_ventilation_operation
66
-     *
67
-     * @mbggenerated Sun Jun 28 17:44:27 CST 2020
68
-     */
69 37
     public void setDistinct(boolean distinct) {
70 38
         this.distinct = distinct;
71 39
     }
72 40
 
73
-    /**
74
-     * This method was generated by MyBatis Generator.
75
-     * This method corresponds to the database table t_ventilation_operation
76
-     *
77
-     * @mbggenerated Sun Jun 28 17:44:27 CST 2020
78
-     */
79 41
     public boolean isDistinct() {
80 42
         return distinct;
81 43
     }
82 44
 
83
-    /**
84
-     * This method was generated by MyBatis Generator.
85
-     * This method corresponds to the database table t_ventilation_operation
86
-     *
87
-     * @mbggenerated Sun Jun 28 17:44:27 CST 2020
88
-     */
89 45
     public List<Criteria> getOredCriteria() {
90 46
         return oredCriteria;
91 47
     }
92 48
 
93
-    /**
94
-     * This method was generated by MyBatis Generator.
95
-     * This method corresponds to the database table t_ventilation_operation
96
-     *
97
-     * @mbggenerated Sun Jun 28 17:44:27 CST 2020
98
-     */
99 49
     public void or(Criteria criteria) {
100 50
         oredCriteria.add(criteria);
101 51
     }
102 52
 
103
-    /**
104
-     * This method was generated by MyBatis Generator.
105
-     * This method corresponds to the database table t_ventilation_operation
106
-     *
107
-     * @mbggenerated Sun Jun 28 17:44:27 CST 2020
108
-     */
109 53
     public Criteria or() {
110 54
         Criteria criteria = createCriteriaInternal();
111 55
         oredCriteria.add(criteria);
112 56
         return criteria;
113 57
     }
114 58
 
115
-    /**
116
-     * This method was generated by MyBatis Generator.
117
-     * This method corresponds to the database table t_ventilation_operation
118
-     *
119
-     * @mbggenerated Sun Jun 28 17:44:27 CST 2020
120
-     */
121 59
     public Criteria createCriteria() {
122 60
         Criteria criteria = createCriteriaInternal();
123 61
         if (oredCriteria.size() == 0) {
@@ -126,23 +64,11 @@ public class TVentilationOperationExample {
126 64
         return criteria;
127 65
     }
128 66
 
129
-    /**
130
-     * This method was generated by MyBatis Generator.
131
-     * This method corresponds to the database table t_ventilation_operation
132
-     *
133
-     * @mbggenerated Sun Jun 28 17:44:27 CST 2020
134
-     */
135 67
     protected Criteria createCriteriaInternal() {
136 68
         Criteria criteria = new Criteria();
137 69
         return criteria;
138 70
     }
139 71
 
140
-    /**
141
-     * This method was generated by MyBatis Generator.
142
-     * This method corresponds to the database table t_ventilation_operation
143
-     *
144
-     * @mbggenerated Sun Jun 28 17:44:27 CST 2020
145
-     */
146 72
     public void clear() {
147 73
         oredCriteria.clear();
148 74
         orderByClause = null;
@@ -150,10 +76,7 @@ public class TVentilationOperationExample {
150 76
     }
151 77
 
152 78
     /**
153
-     * This class was generated by MyBatis Generator.
154
-     * This class corresponds to the database table t_ventilation_operation
155
-     *
156
-     * @mbggenerated Sun Jun 28 17:44:27 CST 2020
79
+     * t_ventilation_operation 2022-03-29
157 80
      */
158 81
     protected abstract static class GeneratedCriteria {
159 82
         protected List<Criterion> criteria;
@@ -6471,13 +6394,200 @@ public class TVentilationOperationExample {
6471 6394
             addCriterion("org_id not between", value1, value2, "orgId");
6472 6395
             return (Criteria) this;
6473 6396
         }
6397
+
6398
+        public Criteria andFdxsIsNull() {
6399
+            addCriterion("fdxs is null");
6400
+            return (Criteria) this;
6401
+        }
6402
+
6403
+        public Criteria andFdxsIsNotNull() {
6404
+            addCriterion("fdxs is not null");
6405
+            return (Criteria) this;
6406
+        }
6407
+
6408
+        public Criteria andFdxsEqualTo(String value) {
6409
+            addCriterion("fdxs =", value, "fdxs");
6410
+            return (Criteria) this;
6411
+        }
6412
+
6413
+        public Criteria andFdxsNotEqualTo(String value) {
6414
+            addCriterion("fdxs <>", value, "fdxs");
6415
+            return (Criteria) this;
6416
+        }
6417
+
6418
+        public Criteria andFdxsGreaterThan(String value) {
6419
+            addCriterion("fdxs >", value, "fdxs");
6420
+            return (Criteria) this;
6421
+        }
6422
+
6423
+        public Criteria andFdxsGreaterThanOrEqualTo(String value) {
6424
+            addCriterion("fdxs >=", value, "fdxs");
6425
+            return (Criteria) this;
6426
+        }
6427
+
6428
+        public Criteria andFdxsLessThan(String value) {
6429
+            addCriterion("fdxs <", value, "fdxs");
6430
+            return (Criteria) this;
6431
+        }
6432
+
6433
+        public Criteria andFdxsLessThanOrEqualTo(String value) {
6434
+            addCriterion("fdxs <=", value, "fdxs");
6435
+            return (Criteria) this;
6436
+        }
6437
+
6438
+        public Criteria andFdxsLike(String value) {
6439
+            addCriterion("fdxs like", value, "fdxs");
6440
+            return (Criteria) this;
6441
+        }
6442
+
6443
+        public Criteria andFdxsNotLike(String value) {
6444
+            addCriterion("fdxs not like", value, "fdxs");
6445
+            return (Criteria) this;
6446
+        }
6447
+
6448
+        public Criteria andFdxsIn(List<String> values) {
6449
+            addCriterion("fdxs in", values, "fdxs");
6450
+            return (Criteria) this;
6451
+        }
6452
+
6453
+        public Criteria andFdxsNotIn(List<String> values) {
6454
+            addCriterion("fdxs not in", values, "fdxs");
6455
+            return (Criteria) this;
6456
+        }
6457
+
6458
+        public Criteria andFdxsBetween(String value1, String value2) {
6459
+            addCriterion("fdxs between", value1, value2, "fdxs");
6460
+            return (Criteria) this;
6461
+        }
6462
+
6463
+        public Criteria andFdxsNotBetween(String value1, String value2) {
6464
+            addCriterion("fdxs not between", value1, value2, "fdxs");
6465
+            return (Criteria) this;
6466
+        }
6467
+
6468
+        public Criteria andZfdzcdIsNull() {
6469
+            addCriterion("zfdzcd is null");
6470
+            return (Criteria) this;
6471
+        }
6472
+
6473
+        public Criteria andZfdzcdIsNotNull() {
6474
+            addCriterion("zfdzcd is not null");
6475
+            return (Criteria) this;
6476
+        }
6477
+
6478
+        public Criteria andZfdzcdEqualTo(BigDecimal value) {
6479
+            addCriterion("zfdzcd =", value, "zfdzcd");
6480
+            return (Criteria) this;
6481
+        }
6482
+
6483
+        public Criteria andZfdzcdNotEqualTo(BigDecimal value) {
6484
+            addCriterion("zfdzcd <>", value, "zfdzcd");
6485
+            return (Criteria) this;
6486
+        }
6487
+
6488
+        public Criteria andZfdzcdGreaterThan(BigDecimal value) {
6489
+            addCriterion("zfdzcd >", value, "zfdzcd");
6490
+            return (Criteria) this;
6491
+        }
6492
+
6493
+        public Criteria andZfdzcdGreaterThanOrEqualTo(BigDecimal value) {
6494
+            addCriterion("zfdzcd >=", value, "zfdzcd");
6495
+            return (Criteria) this;
6496
+        }
6497
+
6498
+        public Criteria andZfdzcdLessThan(BigDecimal value) {
6499
+            addCriterion("zfdzcd <", value, "zfdzcd");
6500
+            return (Criteria) this;
6501
+        }
6502
+
6503
+        public Criteria andZfdzcdLessThanOrEqualTo(BigDecimal value) {
6504
+            addCriterion("zfdzcd <=", value, "zfdzcd");
6505
+            return (Criteria) this;
6506
+        }
6507
+
6508
+        public Criteria andZfdzcdIn(List<BigDecimal> values) {
6509
+            addCriterion("zfdzcd in", values, "zfdzcd");
6510
+            return (Criteria) this;
6511
+        }
6512
+
6513
+        public Criteria andZfdzcdNotIn(List<BigDecimal> values) {
6514
+            addCriterion("zfdzcd not in", values, "zfdzcd");
6515
+            return (Criteria) this;
6516
+        }
6517
+
6518
+        public Criteria andZfdzcdBetween(BigDecimal value1, BigDecimal value2) {
6519
+            addCriterion("zfdzcd between", value1, value2, "zfdzcd");
6520
+            return (Criteria) this;
6521
+        }
6522
+
6523
+        public Criteria andZfdzcdNotBetween(BigDecimal value1, BigDecimal value2) {
6524
+            addCriterion("zfdzcd not between", value1, value2, "zfdzcd");
6525
+            return (Criteria) this;
6526
+        }
6527
+
6528
+        public Criteria andZfdjmjZhiIsNull() {
6529
+            addCriterion("zfdjmj_zhi is null");
6530
+            return (Criteria) this;
6531
+        }
6532
+
6533
+        public Criteria andZfdjmjZhiIsNotNull() {
6534
+            addCriterion("zfdjmj_zhi is not null");
6535
+            return (Criteria) this;
6536
+        }
6537
+
6538
+        public Criteria andZfdjmjZhiEqualTo(BigDecimal value) {
6539
+            addCriterion("zfdjmj_zhi =", value, "zfdjmjZhi");
6540
+            return (Criteria) this;
6541
+        }
6542
+
6543
+        public Criteria andZfdjmjZhiNotEqualTo(BigDecimal value) {
6544
+            addCriterion("zfdjmj_zhi <>", value, "zfdjmjZhi");
6545
+            return (Criteria) this;
6546
+        }
6547
+
6548
+        public Criteria andZfdjmjZhiGreaterThan(BigDecimal value) {
6549
+            addCriterion("zfdjmj_zhi >", value, "zfdjmjZhi");
6550
+            return (Criteria) this;
6551
+        }
6552
+
6553
+        public Criteria andZfdjmjZhiGreaterThanOrEqualTo(BigDecimal value) {
6554
+            addCriterion("zfdjmj_zhi >=", value, "zfdjmjZhi");
6555
+            return (Criteria) this;
6556
+        }
6557
+
6558
+        public Criteria andZfdjmjZhiLessThan(BigDecimal value) {
6559
+            addCriterion("zfdjmj_zhi <", value, "zfdjmjZhi");
6560
+            return (Criteria) this;
6561
+        }
6562
+
6563
+        public Criteria andZfdjmjZhiLessThanOrEqualTo(BigDecimal value) {
6564
+            addCriterion("zfdjmj_zhi <=", value, "zfdjmjZhi");
6565
+            return (Criteria) this;
6566
+        }
6567
+
6568
+        public Criteria andZfdjmjZhiIn(List<BigDecimal> values) {
6569
+            addCriterion("zfdjmj_zhi in", values, "zfdjmjZhi");
6570
+            return (Criteria) this;
6571
+        }
6572
+
6573
+        public Criteria andZfdjmjZhiNotIn(List<BigDecimal> values) {
6574
+            addCriterion("zfdjmj_zhi not in", values, "zfdjmjZhi");
6575
+            return (Criteria) this;
6576
+        }
6577
+
6578
+        public Criteria andZfdjmjZhiBetween(BigDecimal value1, BigDecimal value2) {
6579
+            addCriterion("zfdjmj_zhi between", value1, value2, "zfdjmjZhi");
6580
+            return (Criteria) this;
6581
+        }
6582
+
6583
+        public Criteria andZfdjmjZhiNotBetween(BigDecimal value1, BigDecimal value2) {
6584
+            addCriterion("zfdjmj_zhi not between", value1, value2, "zfdjmjZhi");
6585
+            return (Criteria) this;
6586
+        }
6474 6587
     }
6475 6588
 
6476 6589
     /**
6477
-     * This class was generated by MyBatis Generator.
6478
-     * This class corresponds to the database table t_ventilation_operation
6479
-     *
6480
-     * @mbggenerated do_not_delete_during_merge Sun Jun 28 17:44:27 CST 2020
6590
+     * t_ventilation_operation
6481 6591
      */
6482 6592
     public static class Criteria extends GeneratedCriteria {
6483 6593
 
@@ -6487,10 +6597,7 @@ public class TVentilationOperationExample {
6487 6597
     }
6488 6598
 
6489 6599
     /**
6490
-     * This class was generated by MyBatis Generator.
6491
-     * This class corresponds to the database table t_ventilation_operation
6492
-     *
6493
-     * @mbggenerated Sun Jun 28 17:44:27 CST 2020
6600
+     * t_ventilation_operation 2022-03-29
6494 6601
      */
6495 6602
     public static class Criterion {
6496 6603
         private String condition;

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

@@ -83,10 +83,10 @@ public class StorageChangeStoragehouseRopServiceImpl implements StorageChangeSto
83 83
              String wareHouseName = (String) inWareDataMap.get("warehouseName");
84 84
              Integer orgId = (Integer) inWareDataMap.get("orgId");
85 85
              storageChangeStoragehouseDefault.setIntoStorehouse(houseId); //倒入仓房
86
-             storageChangeStoragehouseDefault.setIntoStorehouseName(inStorehouseName); //倒仓房名称
86
+             storageChangeStoragehouseDefault.setIntoStorehouseName(inStorehouseName); //倒仓房名称
87 87
              //货位
88 88
              storageChangeStoragehouseDefault.setIntoWarehouse(wareHouseId); //倒入货位
89
-             storageChangeStoragehouseDefault.setIntoWarehouseName(wareHouseName); //倒货位名称
89
+             storageChangeStoragehouseDefault.setIntoWarehouseName(wareHouseName); //倒货位名称
90 90
              storageChangeStoragehouseDefault.setOrgId(orgId);  //组织id
91 91
              //根据倒出仓房编码查询倒出仓房、货位、组织机构数据 
92 92
              String hwbmout = jsonObject.getString("cfbmout");

+ 1 - 0
src/main/java/com/chinaitop/depot/storage/utils/GeneratorSqlmap.java

@@ -29,6 +29,7 @@ public class GeneratorSqlmap {
29 29
 		try {
30 30
 			GeneratorSqlmap generatorSqlmap = new GeneratorSqlmap();
31 31
 			generatorSqlmap.generator();
32
+			System.out.println("成功");
32 33
 		} catch (Exception e) {
33 34
 			e.printStackTrace();
34 35
 		}