质检

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

@@ -414,6 +414,13 @@ public class StorageQualitycheckController {
                 foodbasicinfo.setPrice(list.get(0).getPrice());
                 foodbasicinfo.setStorageLocation(list.get(0).getDepotName());
                 foodbasicinfo.setPlaceOfOrigin(String.valueOf(list.get(0).getLocation()));
+                foodbasicinfo.setSubType(list.get(0).getSubType());//粮食品种
+                foodbasicinfo.setNumber(Double.valueOf(list.get(0).getNumber()));//数量
+                foodbasicinfo.setQuality(list.get(0).getQuality());//数量
+                foodbasicinfo.setGrowYear(list.get(0).getHarvestTime());//收货年度
+                foodbasicinfo.setLevel(String.valueOf(list.get(0).getLevel()));//d等级
+                foodbasicinfo.setInputYear(list.get(0).getInputTime());//ruca入仓时间
+                foodbasicinfo.setKeeperNames(list.get(0).getKeeper());//b保管员
             }
 
         } catch (Exception e) {

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

@@ -95,7 +95,7 @@ public interface StorageQualitycheckMapper {
      * @mbggenerated Mon Jun 22 17:29:08 CST 2020
      */
     int updateByPrimaryKey(StorageQualitycheck record);
-    
+    void updateByFlagType(StorageQualitycheck qualitycheck);
     
     /**
      * @param qualitycheck

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

@@ -106,6 +106,8 @@
     <result column="ypsl" property="ypsl" jdbcType="VARCHAR" />
     <result column="dbsl" property="dbsl" jdbcType="VARCHAR" />
     <result column="ypdj" property="ypdj" jdbcType="VARCHAR" />
+    <result column="ypdj" property="ypdj" jdbcType="VARCHAR" />
+    <result column="flag_type" property="flagType" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <!--
@@ -196,7 +198,7 @@
     intermixing_rate, smelltaste, transparency, peroxide_value, smoke_point, reeze_test, 
     residual_solvent, lead, total_arsenic, aflatoxin, butyl_phenol, updatetime, zblb, 
     qydbh, qyqy, jdrxm, ypbh, sfzcccnx, qysj,
-    jylb,qfrq,ypsl,dbsl,ypdj
+    jylb,qfrq,ypsl,dbsl,ypdj, flag_type
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckExample" >
     <!--
@@ -287,7 +289,7 @@
       updatetime, zblb, qydbh, 
       qyqy, jdrxm, ypbh,
       jylb,qfrq,ypsl,dbsl,ypdj,
-      sfzcccnx, qysj)
+      sfzcccnx, qysj,flag_type)
     values (#{id,jdbcType=INTEGER}, #{tankId,jdbcType=VARCHAR}, #{houseId,jdbcType=INTEGER}, 
       #{warehouseId,jdbcType=INTEGER}, #{type,jdbcType=VARCHAR}, #{subType,jdbcType=INTEGER}, 
       #{subTypeDetailed,jdbcType=INTEGER}, #{checkTime,jdbcType=TIMESTAMP}, #{checkResult,jdbcType=VARCHAR}, 
@@ -321,7 +323,7 @@
       #{updatetime,jdbcType=TIMESTAMP}, #{zblb,jdbcType=VARCHAR}, #{qydbh,jdbcType=VARCHAR}, 
       #{qyqy,jdbcType=VARCHAR}, #{jdrxm,jdbcType=VARCHAR}, #{ypbh,jdbcType=VARCHAR},
     #{jylb,jdbcType=VARCHAR},#{qfrq,jdbcType=TIMESTAMP},#{ypsl,jdbcType=VARCHAR},#{dbsl,jdbcType=VARCHAR},#{ypdj,jdbcType=VARCHAR},
-    #{sfzcccnx,jdbcType=VARCHAR}, #{qysj,jdbcType=TIMESTAMP})
+    #{sfzcccnx,jdbcType=VARCHAR}, #{qysj,jdbcType=TIMESTAMP},#{flag_type,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheck" >
     <!--
@@ -628,6 +630,9 @@
       <if test="ypdj != null" >
         ypdj,
       </if>
+      <if test="flagType != null" >
+        flag_type,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -927,6 +932,9 @@
       <if test="ypdj != null" >
         #{ypdj,jdbcType=VARCHAR},
       </if>
+      <if test="flagType != null" >
+        #{flagType,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckExample" resultType="java.lang.Integer" >
@@ -1772,7 +1780,11 @@
       ypdj= #{record.ypdj,jdbcType=VARCHAR}
       where id = #{id,jdbcType=INTEGER}
   </update>
-  
+  <update id="updateByFlagType" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheck" >
+    update storage_qualitycheck
+    set flag_type = 1
+    where house_id = #{houseId} and warehouse_id = #{warehouseId} and type = 0
+  </update>
   <select id="getHouseIdList" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheck" resultMap="BaseResultMap">
     SELECT a.id id, a.house_id house_id, a.level level, a.sub_type_detailed sub_type_detailed
     FROM
@@ -1876,7 +1888,7 @@
     sqk.check_result_time, sqk.store_quality, sqk.is_pest, sqk.inspection_standard_basis, sqk.quality, sqk.seal_date,
     sqk.seal_status, sqk.auth_code, sqk.org_id, sqk.history_status, sqk.smoke_point, sqk.residual_solvent, sqk.transparency,
     sqk.zblb,sqk.qydbh,sqk.qysj,sqk.qyqy,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.flag_type
     <!--云南新增的字段，先注释掉方便调试-->
     /*, sqk.intermixing_rate,sqk.smelltaste,sqk.transparency,sqk.peroxide_value,
     sqk.smoke_point,sqk.reeze_test,sqk.residual_solvent,sqk.lead,sqk.total_arsenic,sqk.aflatoxin,sqk.butyl_phenol*/
@@ -1922,6 +1934,9 @@
       <if test="type !=null">
         and sqk.type = #{type}
       </if>
+      <if test="flagType !=null">
+        and sqk.flag_type is null
+      </if>
       <if test="subTypeDetailed !=null">
         and sqk.sub_type_detailed = #{subTypeDetailed}
       </if>
@@ -1999,6 +2014,13 @@
   <select id="queryByExampleDataTank" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheck" resultMap="BaseResultMap">
     select
     sqk.id,
+    sqk.number,
+    sqk.sub_type,
+    sqk.harvest_time,
+    sqk.quality,
+    sqk.input_time,
+    sqk.level,
+    sqk.keeper,
     bt.height height,
     bt.tank_capacity disperseCapacity,
     /*bs.keeping_way keepMethod,
@@ -2042,6 +2064,13 @@
     select
     sqk.id,
     sqk.house_id, sqk.warehouse_id,sqk.location,
+    sqk.number,
+    sqk.sub_type,
+    sqk.harvest_time,
+    sqk.quality,
+    sqk.input_time,
+    sqk.level,
+    sqk.keeper,
     bs.storeHouse_name storehouseName,
     bs.keeping_way keepMethod,
     bs.grain_heigth height,

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

@@ -5,6 +5,18 @@ import java.math.BigDecimal;
 
 
 public class StorageQualitycheck {
+    /*2021.01新增字段*/
+    //0 初检，1验收
+    private Integer flagType;
+
+    public Integer getFlagType() {
+        return flagType;
+    }
+
+    public void setFlagType(Integer flagType) {
+        this.flagType = flagType;
+    }
+
     /*2020.11新增字段*/
     private String jylb;//01.入仓验收;02.出仓检验;03.3 月末普检;04.9 月末普检;05.入仓初检;06.月度检查;07.3 月末库内普查;08.9 月末库内普查)
     private Date qfrq;//签发日期

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

@@ -47,6 +47,10 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
         }
 		if (qualitycheck.getId() == null) {
 			qualitycheckMapper.insertSelective(qualitycheck);// 新增数据
+            //如果验收，把页面验收隐藏
+            if("1".equals(qualitycheck.getType())){
+                qualitycheckMapper.updateByFlagType(qualitycheck);
+            }
             qualityCheckId = qualitycheck.getId();
         } else {
             qualitycheckMapper.updateByPrimaryKeySelective(qualitycheck);// 修改数据