fanxw 1 yıl önce
ebeveyn
işleme
0e1867694a

+ 1 - 1
src/main/java/com/chinaitop/depot/storage/controller/StorageQualitycheckController.java

@@ -154,7 +154,7 @@ public class StorageQualitycheckController {
154
         }else{
154
         }else{
155
         	qualityCheck.setHistoryStatus(0);//0:最新数据  1:历史数据
155
         	qualityCheck.setHistoryStatus(0);//0:最新数据  1:历史数据
156
         }
156
         }
157
-       
157
+
158
         //查询出未封仓的质量管理信息 封仓状态:0:未封仓,1:已封仓
158
         //查询出未封仓的质量管理信息 封仓状态:0:未封仓,1:已封仓
159
         //qualityCheck.setSealStatus("0");
159
         //qualityCheck.setSealStatus("0");
160
         if (pageNum!=null && pageSize!=null) {
160
         if (pageNum!=null && pageSize!=null) {

+ 0 - 1
src/main/java/com/chinaitop/depot/storage/controller/StorageWarterCheckController.java

@@ -107,7 +107,6 @@ public class StorageWarterCheckController {
107
 		/* 查询水分检验相关数据  */
107
 		/* 查询水分检验相关数据  */
108
 		if (null == id || "".equals(id)) {
108
 		if (null == id || "".equals(id)) {
109
 			storageWaterCheck = new StorageWaterCheck();
109
 			storageWaterCheck = new StorageWaterCheck();
110
-			storageWaterCheck.setHyDate(new Date());
111
 			storageWarterFixedPoint_list = new ArrayList<StorageWarterFixedPoint>();
110
 			storageWarterFixedPoint_list = new ArrayList<StorageWarterFixedPoint>();
112
 			storageWarterMobilePoint_list = new ArrayList<StorageWarterMobilePoint>();
111
 			storageWarterMobilePoint_list = new ArrayList<StorageWarterMobilePoint>();
113
 			StorageWarterFixedPoint fixedPoint = new StorageWarterFixedPoint();
112
 			StorageWarterFixedPoint fixedPoint = new StorageWarterFixedPoint();

+ 20 - 5
src/main/java/com/chinaitop/depot/storage/mapper/StorageQualitycheckInspectionMapper.xml

@@ -74,6 +74,7 @@
74
     <result column="rice_yield" property="riceYield" jdbcType="VARCHAR" />
74
     <result column="rice_yield" property="riceYield" jdbcType="VARCHAR" />
75
     <result column="imperfectgrains_scab_qtbl" property="imperfectgrainsScabQtbl" jdbcType="VARCHAR" />
75
     <result column="imperfectgrains_scab_qtbl" property="imperfectgrainsScabQtbl" jdbcType="VARCHAR" />
76
     <result column="color_smell" property="colorSmell" jdbcType="VARCHAR" />
76
     <result column="color_smell" property="colorSmell" jdbcType="VARCHAR" />
77
+    <result column="wgxt" property="wgxt" jdbcType="VARCHAR" />
77
   </resultMap>
78
   </resultMap>
78
   <sql id="Example_Where_Clause" >
79
   <sql id="Example_Where_Clause" >
79
     <where >
80
     <where >
@@ -147,7 +148,7 @@
147
     avg_length, rice_grains, brokenRice_total, brokenRice_big, brokenRice_small, machiningAccuracy, 
148
     avg_length, rice_grains, brokenRice_total, brokenRice_big, brokenRice_small, machiningAccuracy, 
148
     chalkiness, machiningAccuracy_essence, machiningAccuracy_suitable, amylose, ash_content, 
149
     chalkiness, machiningAccuracy_essence, machiningAccuracy_suitable, amylose, ash_content, 
149
     coarseness, gluten, silt_content, magnetic_metal, input_one, input_two, input_three, 
150
     coarseness, gluten, silt_content, magnetic_metal, input_one, input_two, input_three, 
150
-    input_four,sieve_residue,rice_yield,imperfectgrains_scab_qtbl,color_smell
151
+    input_four,sieve_residue,rice_yield,imperfectgrains_scab_qtbl,color_smell,wgxt
151
   </sql>
152
   </sql>
152
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckInspectionExample" >
153
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckInspectionExample" >
153
     select
154
     select
@@ -205,7 +206,7 @@
205
       coarseness, gluten, silt_content, 
206
       coarseness, gluten, silt_content, 
206
       magnetic_metal, input_one, input_two, 
207
       magnetic_metal, input_one, input_two, 
207
       input_three, input_four,
208
       input_three, input_four,
208
-      sieve_residue,rice_yield,imperfectgrains_scab_qtbl,color_smell)
209
+      sieve_residue,rice_yield,imperfectgrains_scab_qtbl,color_smell,wgxt)
209
     values (#{id,jdbcType=INTEGER}, #{qualitycheckId,jdbcType=INTEGER}, #{unitWeight,jdbcType=VARCHAR}, 
210
     values (#{id,jdbcType=INTEGER}, #{qualitycheckId,jdbcType=INTEGER}, #{unitWeight,jdbcType=VARCHAR}, 
210
       #{impurityTotal,jdbcType=VARCHAR}, #{impurityInorganic,jdbcType=VARCHAR}, #{impurityOrganic,jdbcType=VARCHAR}, 
211
       #{impurityTotal,jdbcType=VARCHAR}, #{impurityInorganic,jdbcType=VARCHAR}, #{impurityOrganic,jdbcType=VARCHAR}, 
211
       #{impurityBranPowder,jdbcType=VARCHAR}, #{imperfectgrainsTotal,jdbcType=VARCHAR}, 
212
       #{impurityBranPowder,jdbcType=VARCHAR}, #{imperfectgrainsTotal,jdbcType=VARCHAR}, 
@@ -232,7 +233,7 @@
232
       #{magneticMetal,jdbcType=VARCHAR}, #{inputOne,jdbcType=VARCHAR}, #{inputTwo,jdbcType=VARCHAR}, 
233
       #{magneticMetal,jdbcType=VARCHAR}, #{inputOne,jdbcType=VARCHAR}, #{inputTwo,jdbcType=VARCHAR}, 
233
       #{inputThree,jdbcType=VARCHAR}, #{inputFour,jdbcType=VARCHAR},
234
       #{inputThree,jdbcType=VARCHAR}, #{inputFour,jdbcType=VARCHAR},
234
       #{sieveResidue,jdbcType=VARCHAR}, #{riceYield,jdbcType=VARCHAR}, #{imperfectgrainsScabQtbl,jdbcType=VARCHAR}
235
       #{sieveResidue,jdbcType=VARCHAR}, #{riceYield,jdbcType=VARCHAR}, #{imperfectgrainsScabQtbl,jdbcType=VARCHAR}
235
-      , #{colorSmell,jdbcType=VARCHAR})
236
+      , #{colorSmell,jdbcType=VARCHAR}, #{wgxt,jdbcType=VARCHAR})
236
   </insert>
237
   </insert>
237
   <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckInspection" >
238
   <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckInspection" >
238
     insert into storage_qualitycheck_inspection
239
     insert into storage_qualitycheck_inspection
@@ -451,6 +452,9 @@
451
        <if test="colorSmell != null">
452
        <if test="colorSmell != null">
452
         color_smell,
453
         color_smell,
453
       </if>
454
       </if>
455
+      <if test="wgxt != null">
456
+        wgxt,
457
+      </if>
454
     </trim>
458
     </trim>
455
     <trim prefix="values (" suffix=")" suffixOverrides="," >
459
     <trim prefix="values (" suffix=")" suffixOverrides="," >
456
       SEQ_STORAGE_QUALITYCHECK_INSPECTION.nextVal,
460
       SEQ_STORAGE_QUALITYCHECK_INSPECTION.nextVal,
@@ -667,6 +671,9 @@
667
       <if test="colorSmell != null">
671
       <if test="colorSmell != null">
668
         #{colorSmell,jdbcType=VARCHAR},
672
         #{colorSmell,jdbcType=VARCHAR},
669
       </if>
673
       </if>
674
+      <if test="wgxt != null">
675
+        #{wgxt,jdbcType=VARCHAR},
676
+      </if>
670
     </trim>
677
     </trim>
671
   </insert>
678
   </insert>
672
   <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckInspectionExample" resultType="java.lang.Integer" >
679
   <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckInspectionExample" resultType="java.lang.Integer" >
@@ -894,6 +901,9 @@
894
       <if test="record.colorSmell != null">
901
       <if test="record.colorSmell != null">
895
         color_smell = #{record.colorSmell,jdbcType=VARCHAR},
902
         color_smell = #{record.colorSmell,jdbcType=VARCHAR},
896
       </if>
903
       </if>
904
+      <if test="record.wgxt != null">
905
+        wgxt = #{record.wgxt,jdbcType=VARCHAR},
906
+      </if>
897
     </set>
907
     </set>
898
     <if test="_parameter != null" >
908
     <if test="_parameter != null" >
899
       <include refid="Update_By_Example_Where_Clause" />
909
       <include refid="Update_By_Example_Where_Clause" />
@@ -972,7 +982,8 @@
972
       sieve_residue = #{record.sieveResidue,jdbcType=VARCHAR},
982
       sieve_residue = #{record.sieveResidue,jdbcType=VARCHAR},
973
       rice_yield = #{record.riceYield,jdbcType=VARCHAR},
983
       rice_yield = #{record.riceYield,jdbcType=VARCHAR},
974
       imperfectgrains_scab_qtbl = #{record.imperfectgrainsScabQtbl,jdbcType=VARCHAR},
984
       imperfectgrains_scab_qtbl = #{record.imperfectgrainsScabQtbl,jdbcType=VARCHAR},
975
-      color_smell = #{record.colorSmell,jdbcType=VARCHAR}
985
+      color_smell = #{record.colorSmell,jdbcType=VARCHAR},
986
+      wgxt = #{record.wgxt,jdbcType=VARCHAR}
976
     <if test="_parameter != null" >
987
     <if test="_parameter != null" >
977
       <include refid="Update_By_Example_Where_Clause" />
988
       <include refid="Update_By_Example_Where_Clause" />
978
     </if>
989
     </if>
@@ -1193,6 +1204,9 @@
1193
       <if test="colorSmell != null">
1204
       <if test="colorSmell != null">
1194
         color_smell = #{colorSmell,jdbcType=VARCHAR},
1205
         color_smell = #{colorSmell,jdbcType=VARCHAR},
1195
       </if>
1206
       </if>
1207
+      <if test="wgxt != null">
1208
+        wgxt = #{wgxt,jdbcType=VARCHAR},
1209
+      </if>
1196
     </set>
1210
     </set>
1197
     where id = #{id,jdbcType=INTEGER}
1211
     where id = #{id,jdbcType=INTEGER}
1198
   </update>
1212
   </update>
@@ -1268,7 +1282,8 @@
1268
       sieve_residue = #{sieveResidue,jdbcType=VARCHAR},
1282
       sieve_residue = #{sieveResidue,jdbcType=VARCHAR},
1269
       rice_yield = #{riceYield,jdbcType=VARCHAR},
1283
       rice_yield = #{riceYield,jdbcType=VARCHAR},
1270
       imperfectgrains_scab_qtbl = #{imperfectgrainsScabQtbl,jdbcType=VARCHAR},
1284
       imperfectgrains_scab_qtbl = #{imperfectgrainsScabQtbl,jdbcType=VARCHAR},
1271
-      color_smell = #{colorSmell,jdbcType=VARCHAR}
1285
+      color_smell = #{colorSmell,jdbcType=VARCHAR},
1286
+      wgxt = #{wgxt,jdbcType=VARCHAR}
1272
     where id = #{id,jdbcType=INTEGER}
1287
     where id = #{id,jdbcType=INTEGER}
1273
   </update>
1288
   </update>
1274
 
1289
 

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

@@ -2171,7 +2171,8 @@
2171
       sqi.coarseness,
2171
       sqi.coarseness,
2172
       sqi.gluten,
2172
       sqi.gluten,
2173
       sqi.silt_content,
2173
       sqi.silt_content,
2174
-      sqi.magnetic_metal
2174
+      sqi.magnetic_metal,
2175
+      sqi.wgxt
2175
   FROM
2176
   FROM
2176
       storage_qualitycheck sqk
2177
       storage_qualitycheck sqk
2177
       LEFT JOIN basic_storehouse bs ON bs.storehouse_id = sqk.house_id
2178
       LEFT JOIN basic_storehouse bs ON bs.storehouse_id = sqk.house_id

+ 17 - 0
src/main/java/com/chinaitop/depot/storage/model/StorageQualitycheckInspection.java

@@ -155,6 +155,7 @@ public class StorageQualitycheckInspection {
155
     
155
     
156
     private String imperfectgrainsScabQtbl; //其它病粒%2021-08-19
156
     private String imperfectgrainsScabQtbl; //其它病粒%2021-08-19
157
 
157
 
158
+    private String wgxt;//外观形态
158
 
159
 
159
     public String getSieveResidue() {
160
     public String getSieveResidue() {
160
         return sieveResidue;
161
         return sieveResidue;
@@ -1273,4 +1274,20 @@ public class StorageQualitycheckInspection {
1273
 	public void setImperfectgrainsScabQtbl(String imperfectgrainsScabQtbl) {
1274
 	public void setImperfectgrainsScabQtbl(String imperfectgrainsScabQtbl) {
1274
 		this.imperfectgrainsScabQtbl = imperfectgrainsScabQtbl;
1275
 		this.imperfectgrainsScabQtbl = imperfectgrainsScabQtbl;
1275
 	}
1276
 	}
1277
+
1278
+	/**
1279
+	 * 外观形态
1280
+	 * @return
1281
+	 */
1282
+	public String getWgxt() {
1283
+		return wgxt;
1284
+	}
1285
+
1286
+	/**
1287
+	 * 外观形态
1288
+	 * @param wgxt
1289
+	 */
1290
+	public void setWgxt(String wgxt) {
1291
+		this.wgxt = wgxt;
1292
+	}
1276
 }
1293
 }

+ 3 - 0
src/main/java/com/chinaitop/depot/storage/model/StorageWaterCheck.java

@@ -17,14 +17,17 @@ public class StorageWaterCheck {
17
 
17
 
18
     private Integer lspz;
18
     private Integer lspz;
19
 
19
 
20
+    @JsonFormat(pattern="yyyy-MM-dd", timezone="GMT+8")
20
     private Date hyDate;
21
     private Date hyDate;
21
 
22
 
22
     private String hyPerson;
23
     private String hyPerson;
23
 
24
 
24
     private String remark;
25
     private String remark;
25
 
26
 
27
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
26
     private Date inputTime;
28
     private Date inputTime;
27
 
29
 
30
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
28
     private Date editTime;
31
     private Date editTime;
29
 
32
 
30
     private String dataStatus;
33
     private String dataStatus;