天津改造计划-质量管理改造

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

@@ -210,6 +210,7 @@ public class StorageQualitycheckController {
             } finally {
                 modelMap.put("status", "success");
             }
+            modelMap.put("dataid", qualitycheck.getId());
             modelMap.put("status", "success");
         } catch (IOException e) {
             modelMap.put("status", "error");

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

@@ -104,6 +104,7 @@
     <result column="jdrxm" property="jdrxm" jdbcType="VARCHAR" />
     <result column="ypbh" property="ypbh" jdbcType="VARCHAR" />
     <result column="sfzcccnx" property="sfzcccnx" jdbcType="VARCHAR" />
+    <result column="file_route" property="fileRoute" jdbcType="VARCHAR" />
 
   </resultMap>
   <sql id="Example_Where_Clause" >
@@ -181,7 +182,7 @@
     smoke_point, reeze_test, residual_solvent, lead, total_arsenic, aflatoxin, quailtycard_id, 
     butyl_phenol, flag_type,
     jylb,qfrq,ypsl,dbsl,ypdj,
-    qyqy,qydbh,zblb,jdrxm,ypbh,sfzcccnx
+    qyqy,qydbh,zblb,jdrxm,ypbh,sfzcccnx, file_route
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckExample" >
     select
@@ -246,7 +247,7 @@
       lead, total_arsenic, aflatoxin,
       jylb,qfrq,ypsl,dbsl,ypdj,
       qyqy,qydbh,zblb,jdrxm,ypbh,sfzcccnx,
-      quailtycard_id, butyl_phenol, flag_type)
+      quailtycard_id, butyl_phenol, flag_type, file_route)
     values (SEQ_STORAGE_QUALITYCHECK.nextVal, #{depotId,jdbcType=INTEGER}, #{houseId,jdbcType=INTEGER},
       #{warehouseId,jdbcType=INTEGER}, #{typeUpdate,jdbcType=VARCHAR}, #{subType,jdbcType=INTEGER},
       #{subTypeDetailed,jdbcType=INTEGER}, #{checkTime,jdbcType=TIMESTAMP}, #{checkResult,jdbcType=VARCHAR}, 
@@ -279,7 +280,7 @@
       #{lead,jdbcType=VARCHAR}, #{totalArsenic,jdbcType=VARCHAR}, #{aflatoxin,jdbcType=VARCHAR},
       #{jylb,jdbcType=VARCHAR}, #{qfrq,jdbcType=TIMESTAMP},#{ypsl,jdbcType=VARCHAR},#{dbsl,jdbcType=VARCHAR},#{ypdj,jdbcType=VARCHAR},
       #{qyqy,jdbcType=VARCHAR}, #{qydbh,jdbcType=VARCHAR},#{zblb,jdbcType=VARCHAR},#{jdrxm,jdbcType=VARCHAR},#{ypbh,jdbcType=VARCHAR},#{sfzcccnx,jdbcType=VARCHAR},
-      #{quailtycardId,jdbcType=VARCHAR}, #{butylPhenol,jdbcType=VARCHAR}, #{flagType,jdbcType=INTEGER})
+      #{quailtycardId,jdbcType=VARCHAR}, #{butylPhenol,jdbcType=VARCHAR}, #{flagType,jdbcType=INTEGER}, #{fileRoute,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheck" >
     insert into storage_qualitycheck
@@ -586,7 +587,9 @@
       <if test="sfzcccnx != null" >
         sfzcccnx,
       </if>
-
+      <if test="fileRoute != null" >
+        fileRoute,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       SEQ_STORAGE_QUALITYCHECK.nextVal,
@@ -887,6 +890,9 @@
       <if test="sfzcccnx != null" >
         #{sfzcccnx,jdbcType=VARCHAR},
       </if>
+      <if test="fileRoute != null" >
+        #{fileRoute,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckExample" resultType="java.lang.Integer" >
@@ -1198,7 +1204,9 @@
       <if test="record.sfzcccnx != null" >
         sfzcccnx = #{record.sfzcccnx,jdbcType=VARCHAR},
       </if>
-
+      <if test="record.fileRoute != null" >
+        file_route = #{record.fileRoute,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -1305,7 +1313,8 @@
     zblb= #{record.zblb,jdbcType=VARCHAR},
     jdrxm= #{record.jdrxm,jdbcType=VARCHAR},
     ypbh= #{record.ypbh,jdbcType=VARCHAR},
-    sfzcccnx= #{record.sfzcccnx,jdbcType=VARCHAR}
+    sfzcccnx= #{record.sfzcccnx,jdbcType=VARCHAR},
+      file_route = #{record.fileRoute,jdbcType=VARCHAR}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -1610,7 +1619,9 @@
       <if test="sfzcccnx != null" >
         sfzcccnx = #{sfzcccnx,jdbcType=VARCHAR},
       </if>
-
+      <if test="fileRoute != null" >
+        file_route = #{fileRoute,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -1714,7 +1725,8 @@
       jdrxm= #{record.jdrxm,jdbcType=VARCHAR},
       ypbh= #{record.ypbh,jdbcType=VARCHAR},
       sfzcccnx= #{record.sfzcccnx,jdbcType=VARCHAR},
-      ypdj= #{record.ypdj,jdbcType=VARCHAR}
+      ypdj= #{record.ypdj,jdbcType=VARCHAR},
+        file_route = #{fileRoute,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
@@ -1814,7 +1826,7 @@
     sqk.smoke_point, sqk.reeze_test, sqk.residual_solvent, sqk.lead, sqk.total_arsenic, sqk.aflatoxin, sqk.quailtycard_id,
     sqk.butyl_phenol, sqk.flag_type,
     sqk.qyqy,sqk.qydbh,sqk.zblb,sqk.jdrxm,sqk.ypbh,sqk.sfzcccnx,
-     sqk.jylb, sqk.qfrq,sqk.ypsl,sqk.dbsl,sqk.ypdj
+     sqk.jylb, sqk.qfrq,sqk.ypsl,sqk.dbsl,sqk.ypdj, sqk.file_route
   </sql>
 
   <select id="queryPrimaryKey" resultMap="BaseResultMap">

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

@@ -1,5 +1,7 @@
 package com.chinaitop.depot.storage.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
@@ -43,6 +45,7 @@ public class StorageQualitycheck {
 
     private Integer subTypeDetailed;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date checkTime;//检验日期
 
     private String checkResult;//检验结果0:合格  1：不合格
@@ -137,6 +140,7 @@ public class StorageQualitycheck {
 
     private String chooseOrgan;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date chooseTime;
 
     private String boldfatIndex;
@@ -185,6 +189,7 @@ public class StorageQualitycheck {
 
     private String checkTimeType;//春秋普查类型:0:春-3月末库内普查 1：秋-9月末库内普查
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date checkResultTime;//检验报告出具日期zblb
 
     private String storeQuality;//指标结果判定（可多选）
@@ -260,6 +265,8 @@ public class StorageQualitycheck {
 
     private Integer notice;
 
+    private String fileRoute;
+
     List<Integer> typeList = new ArrayList<Integer>();
 
     public String getQyqy() {
@@ -2020,4 +2027,12 @@ public class StorageQualitycheck {
     public void setFlagType(Integer flagType) {
         this.flagType = flagType;
     }
+
+    public String getFileRoute() {
+        return fileRoute;
+    }
+
+    public void setFileRoute(String fileRoute) {
+        this.fileRoute = fileRoute;
+    }
 }

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

@@ -6186,6 +6186,11 @@ public class StorageQualitycheckExample {
             addCriterion("updatetime not between", value1, value2, "updatetime");
             return (Criteria) this;
         }
+
+        public Criteria andFileRouteEqualTo(String value) {
+            addCriterion("file_route =", value, "fileRoute");
+            return (Criteria) this;
+        }
     }
 
     /**

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

@@ -103,7 +103,7 @@ public class StorageChangeStoragehouseRopServiceImpl implements StorageChangeSto
              storageChangeStoragehouseDefault.setOutWarehouse(wareOutHouseId); //倒出货位
              storageChangeStoragehouseDefault.setOutWarehouseName(wareOutHouseName); //倒出货位名称
              //根据仓房、货位、orgId获取粮食品种等信息
-             Map<String, Object> map = feignAgileService.getDateByChHwh(orgId, houseId, wareHouseId);
+             Map<String, Object> map = feignAgileService.getDateByChHwh(orgId, houseOutId, wareOutHouseId);
              Integer  a = (Integer ) map.get("hwxz"); //粮油性质
 			 String grainAttribute = a.toString();
              Integer grainKind = (Integer) map.get("pz"); //品种

src/main/java/com/chinaitop/depot/storage/service/impl/StorageQualitycheckServiceImpl.java

@@ -74,7 +74,7 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
             } else {
                 qualitycheckMapper.updateByPrimaryKeySelective(qualitycheck);// 修改数据
                 //修改质检
-                if(!qualitycheckInspectionJson.equals("null")){
+                if(null != qualitycheckInspectionJson && !qualitycheckInspectionJson.equals("null") && !qualitycheckInspectionJson.equals("")){
                     StorageQualitycheckInspection qualityInspection = (StorageQualitycheckInspection)mapper.readValue(qualitycheckInspectionJson, StorageQualitycheckInspection.class);
                     System.out.println(qualityInspection.getUnitWeight());
                     qualityCheckId = qualitycheck.getId();