Merge remote-tracking branch 'remotes/origin/dev-1.1' into dev

# Conflicts:
#	pom.xml
#	src/main/resources/bootstrap.yml

pom.xml

@@ -153,6 +153,10 @@
 		    <artifactId>fastjson</artifactId>
 		    <version>1.2.4</version>
 		</dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>

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

@@ -1,7 +1,10 @@
 package com.chinaitop.depot.storage.controller;
 
 
+import com.chinaitop.depot.storage.model.ClearanceConfirmation;
+import com.chinaitop.depot.storage.model.StorageStorehouseBusiness;
 import com.chinaitop.depot.storage.model.WarehouseSealingRecord;
+import com.chinaitop.depot.storage.model.vo.WareHouseVO;
 import com.chinaitop.depot.storage.service.WarehouseSealingRecordService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -23,7 +26,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 封仓确认单Controller
+ * 封仓确认单控制类
  *
  * @author User
  *
@@ -159,8 +162,60 @@ public class WarehouseSealingRecordController {
         }
         return modelMap;
     }
+    /**
+     * 查询当前库区做过检验的仓房
+     *
+     * @param orgId
+     * @return
+     */
+    @RequestMapping(value = "/findStorehouse",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
+    public List<StorageStorehouseBusiness> findStorehouse(Integer orgId) {
+        List<StorageStorehouseBusiness> storageStorehouseBusinessList = null;
+        try {
+
+                storageStorehouseBusinessList = WarehouseSealingRecordService.findStorehouse(orgId);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return storageStorehouseBusinessList;
+    }
+
+    /**
+     * 根据basicStorehouseId查询货位
+     * @param storehouseId
+     * @return
+     */
+    @RequestMapping(value = "/findWareHouse",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
+    public List<WareHouseVO> findWareHouse(Integer storehouseId) {
+        List<WareHouseVO> wareHouseVOList = null;
+        try {
+
+           wareHouseVOList = WarehouseSealingRecordService.findWareHouse(storehouseId);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return wareHouseVOList;
+    }
+    /**
+     * 根据货位查询库存
+     * @param warehouseId
+     * @return
+     */
+    @RequestMapping(value = "/findkcsw",produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.GET)
+    public WareHouseVO findkcsw(Integer warehouseId) {
+        WareHouseVO wareHouseVO = null;
+        try {
+            wareHouseVO = WarehouseSealingRecordService.findkcsw(warehouseId);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return wareHouseVO;
+    }
+
 
 
-    
 
 }

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

@@ -0,0 +1,31 @@
+package com.chinaitop.depot.storage.mapper;
+
+import com.chinaitop.depot.storage.model.GrainSituationCard;
+import com.chinaitop.depot.storage.model.GrainSituationCardExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface GrainSituationCardMapper {
+    int countByExample(GrainSituationCardExample example);
+
+    int deleteByExample(GrainSituationCardExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(GrainSituationCard record);
+
+    int insertSelective(GrainSituationCard record);
+
+    List<GrainSituationCard> selectByExample(GrainSituationCardExample example);
+
+    GrainSituationCard selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") GrainSituationCard record, @Param("example") GrainSituationCardExample example);
+
+    int updateByExample(@Param("record") GrainSituationCard record, @Param("example") GrainSituationCardExample example);
+
+    int updateByPrimaryKeySelective(GrainSituationCard record);
+
+    int updateByPrimaryKey(GrainSituationCard record);
+}

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

@@ -0,0 +1,769 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.chinaitop.depot.storage.mapper.GrainSituationCardMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.storage.model.GrainSituationCard" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="createname" property="createname" jdbcType="VARCHAR" />
+    <result column="createdate" property="createdate" jdbcType="TIMESTAMP" />
+    <result column="updatename" property="updatename" jdbcType="VARCHAR" />
+    <result column="updatedate" property="updatedate" jdbcType="TIMESTAMP" />
+    <result column="warehouse_sealing_record_id" property="warehouseSealingRecordId" jdbcType="INTEGER" />
+    <result column="fill_org_id" property="fillOrgId" jdbcType="INTEGER" />
+    <result column="keep_org_id" property="keepOrgId" jdbcType="INTEGER" />
+    <result column="basic_storehouse_id" property="basicStorehouseId" jdbcType="INTEGER" />
+    <result column="basic_unit_aisle_id" property="basicUnitAisleId" jdbcType="INTEGER" />
+    <result column="warehouse_id" property="warehouseId" jdbcType="INTEGER" />
+    <result column="storehouse_type" property="storehouseType" jdbcType="INTEGER" />
+    <result column="design_capacity" property="designCapacity" jdbcType="DECIMAL" />
+    <result column="grain_variety_id" property="grainVarietyId" jdbcType="INTEGER" />
+    <result column="grain_nature_id" property="grainNatureId" jdbcType="INTEGER" />
+    <result column="lssl" property="lssl" jdbcType="DECIMAL" />
+    <result column="grain_area_id" property="grainAreaId" jdbcType="INTEGER" />
+    <result column="shnd" property="shnd" jdbcType="DATE" />
+    <result column="rcsj" property="rcsj" jdbcType="DATE" />
+    <result column="form_warehouse_time" property="formWarehouseTime" jdbcType="TIMESTAMP" />
+    <result column="grain_grade_id" property="grainGradeId" jdbcType="INTEGER" />
+    <result column="temperature_measure_type" property="temperatureMeasureType" jdbcType="TINYINT" />
+    <result column="drafttype" property="drafttype" jdbcType="INTEGER" />
+    <result column="glfs" property="glfs" jdbcType="VARCHAR" />
+    <result column="storage_org_id" property="storageOrgId" jdbcType="INTEGER" />
+    <result column="keeping_way" property="keepingWay" jdbcType="INTEGER" />
+    <result column="volume" property="volume" jdbcType="DECIMAL" />
+    <result column="length" property="length" jdbcType="DECIMAL" />
+    <result column="width" property="width" jdbcType="DECIMAL" />
+    <result column="trapezoid_upper_length" property="trapezoidUpperLength" jdbcType="DECIMAL" />
+    <result column="trapezoid_lower_length" property="trapezoidLowerLength" jdbcType="DECIMAL" />
+    <result column="trapezoid_upper_width" property="trapezoidUpperWidth" jdbcType="DECIMAL" />
+    <result column="trapezoid_lower_width" property="trapezoidLowerWidth" jdbcType="DECIMAL" />
+    <result column="flat_storage_height" property="flatStorageHeight" jdbcType="DECIMAL" />
+    <result column="trapezoid_height" property="trapezoidHeight" jdbcType="DECIMAL" />
+    <result column="silo_inner_diameter" property="siloInnerDiameter" jdbcType="DECIMAL" />
+    <result column="silo_grain_height" property="siloGrainHeight" jdbcType="DECIMAL" />
+    <result column="packaged_count" property="packagedCount" jdbcType="INTEGER" />
+    <result column="average_weight" property="averageWeight" jdbcType="DECIMAL" />
+    <result column="check_record_ids" property="checkRecordIds" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, createname, createdate, updatename, updatedate, warehouse_sealing_record_id, 
+    fill_org_id, keep_org_id, basic_storehouse_id, basic_unit_aisle_id, warehouse_id, 
+    storehouse_type, design_capacity, grain_variety_id, grain_nature_id, lssl, grain_area_id, 
+    shnd, rcsj, form_warehouse_time, grain_grade_id, temperature_measure_type, drafttype, 
+    glfs, storage_org_id, keeping_way, volume, length, width, trapezoid_upper_length, 
+    trapezoid_lower_length, trapezoid_upper_width, trapezoid_lower_width, flat_storage_height, 
+    trapezoid_height, silo_inner_diameter, silo_grain_height, packaged_count, average_weight, 
+    check_record_ids
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.GrainSituationCardExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from grain_situation_card
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from grain_situation_card
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from grain_situation_card
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.storage.model.GrainSituationCardExample" >
+    delete from grain_situation_card
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.storage.model.GrainSituationCard" >
+    insert into grain_situation_card (id, createname, createdate, 
+      updatename, updatedate, warehouse_sealing_record_id, 
+      fill_org_id, keep_org_id, basic_storehouse_id, 
+      basic_unit_aisle_id, warehouse_id, storehouse_type, 
+      design_capacity, grain_variety_id, grain_nature_id, 
+      lssl, grain_area_id, shnd, 
+      rcsj, form_warehouse_time, grain_grade_id, 
+      temperature_measure_type, drafttype, glfs, 
+      storage_org_id, keeping_way, volume, 
+      length, width, trapezoid_upper_length, 
+      trapezoid_lower_length, trapezoid_upper_width, 
+      trapezoid_lower_width, flat_storage_height, 
+      trapezoid_height, silo_inner_diameter, silo_grain_height, 
+      packaged_count, average_weight, check_record_ids
+      )
+    values (#{id,jdbcType=INTEGER}, #{createname,jdbcType=VARCHAR}, #{createdate,jdbcType=TIMESTAMP}, 
+      #{updatename,jdbcType=VARCHAR}, #{updatedate,jdbcType=TIMESTAMP}, #{warehouseSealingRecordId,jdbcType=INTEGER}, 
+      #{fillOrgId,jdbcType=INTEGER}, #{keepOrgId,jdbcType=INTEGER}, #{basicStorehouseId,jdbcType=INTEGER}, 
+      #{basicUnitAisleId,jdbcType=INTEGER}, #{warehouseId,jdbcType=INTEGER}, #{storehouseType,jdbcType=INTEGER}, 
+      #{designCapacity,jdbcType=DECIMAL}, #{grainVarietyId,jdbcType=INTEGER}, #{grainNatureId,jdbcType=INTEGER}, 
+      #{lssl,jdbcType=DECIMAL}, #{grainAreaId,jdbcType=INTEGER}, #{shnd,jdbcType=DATE}, 
+      #{rcsj,jdbcType=DATE}, #{formWarehouseTime,jdbcType=TIMESTAMP}, #{grainGradeId,jdbcType=INTEGER}, 
+      #{temperatureMeasureType,jdbcType=TINYINT}, #{drafttype,jdbcType=INTEGER}, #{glfs,jdbcType=VARCHAR}, 
+      #{storageOrgId,jdbcType=INTEGER}, #{keepingWay,jdbcType=INTEGER}, #{volume,jdbcType=DECIMAL}, 
+      #{length,jdbcType=DECIMAL}, #{width,jdbcType=DECIMAL}, #{trapezoidUpperLength,jdbcType=DECIMAL}, 
+      #{trapezoidLowerLength,jdbcType=DECIMAL}, #{trapezoidUpperWidth,jdbcType=DECIMAL}, 
+      #{trapezoidLowerWidth,jdbcType=DECIMAL}, #{flatStorageHeight,jdbcType=DECIMAL}, 
+      #{trapezoidHeight,jdbcType=DECIMAL}, #{siloInnerDiameter,jdbcType=DECIMAL}, #{siloGrainHeight,jdbcType=DECIMAL}, 
+      #{packagedCount,jdbcType=INTEGER}, #{averageWeight,jdbcType=DECIMAL}, #{checkRecordIds,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.GrainSituationCard" >
+    insert into grain_situation_card
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="createname != null" >
+        createname,
+      </if>
+      <if test="createdate != null" >
+        createdate,
+      </if>
+      <if test="updatename != null" >
+        updatename,
+      </if>
+      <if test="updatedate != null" >
+        updatedate,
+      </if>
+      <if test="warehouseSealingRecordId != null" >
+        warehouse_sealing_record_id,
+      </if>
+      <if test="fillOrgId != null" >
+        fill_org_id,
+      </if>
+      <if test="keepOrgId != null" >
+        keep_org_id,
+      </if>
+      <if test="basicStorehouseId != null" >
+        basic_storehouse_id,
+      </if>
+      <if test="basicUnitAisleId != null" >
+        basic_unit_aisle_id,
+      </if>
+      <if test="warehouseId != null" >
+        warehouse_id,
+      </if>
+      <if test="storehouseType != null" >
+        storehouse_type,
+      </if>
+      <if test="designCapacity != null" >
+        design_capacity,
+      </if>
+      <if test="grainVarietyId != null" >
+        grain_variety_id,
+      </if>
+      <if test="grainNatureId != null" >
+        grain_nature_id,
+      </if>
+      <if test="lssl != null" >
+        lssl,
+      </if>
+      <if test="grainAreaId != null" >
+        grain_area_id,
+      </if>
+      <if test="shnd != null" >
+        shnd,
+      </if>
+      <if test="rcsj != null" >
+        rcsj,
+      </if>
+      <if test="formWarehouseTime != null" >
+        form_warehouse_time,
+      </if>
+      <if test="grainGradeId != null" >
+        grain_grade_id,
+      </if>
+      <if test="temperatureMeasureType != null" >
+        temperature_measure_type,
+      </if>
+      <if test="drafttype != null" >
+        drafttype,
+      </if>
+      <if test="glfs != null" >
+        glfs,
+      </if>
+      <if test="storageOrgId != null" >
+        storage_org_id,
+      </if>
+      <if test="keepingWay != null" >
+        keeping_way,
+      </if>
+      <if test="volume != null" >
+        volume,
+      </if>
+      <if test="length != null" >
+        length,
+      </if>
+      <if test="width != null" >
+        width,
+      </if>
+      <if test="trapezoidUpperLength != null" >
+        trapezoid_upper_length,
+      </if>
+      <if test="trapezoidLowerLength != null" >
+        trapezoid_lower_length,
+      </if>
+      <if test="trapezoidUpperWidth != null" >
+        trapezoid_upper_width,
+      </if>
+      <if test="trapezoidLowerWidth != null" >
+        trapezoid_lower_width,
+      </if>
+      <if test="flatStorageHeight != null" >
+        flat_storage_height,
+      </if>
+      <if test="trapezoidHeight != null" >
+        trapezoid_height,
+      </if>
+      <if test="siloInnerDiameter != null" >
+        silo_inner_diameter,
+      </if>
+      <if test="siloGrainHeight != null" >
+        silo_grain_height,
+      </if>
+      <if test="packagedCount != null" >
+        packaged_count,
+      </if>
+      <if test="averageWeight != null" >
+        average_weight,
+      </if>
+      <if test="checkRecordIds != null" >
+        check_record_ids,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="createname != null" >
+        #{createname,jdbcType=VARCHAR},
+      </if>
+      <if test="createdate != null" >
+        #{createdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatename != null" >
+        #{updatename,jdbcType=VARCHAR},
+      </if>
+      <if test="updatedate != null" >
+        #{updatedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="warehouseSealingRecordId != null" >
+        #{warehouseSealingRecordId,jdbcType=INTEGER},
+      </if>
+      <if test="fillOrgId != null" >
+        #{fillOrgId,jdbcType=INTEGER},
+      </if>
+      <if test="keepOrgId != null" >
+        #{keepOrgId,jdbcType=INTEGER},
+      </if>
+      <if test="basicStorehouseId != null" >
+        #{basicStorehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="basicUnitAisleId != null" >
+        #{basicUnitAisleId,jdbcType=INTEGER},
+      </if>
+      <if test="warehouseId != null" >
+        #{warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="storehouseType != null" >
+        #{storehouseType,jdbcType=INTEGER},
+      </if>
+      <if test="designCapacity != null" >
+        #{designCapacity,jdbcType=DECIMAL},
+      </if>
+      <if test="grainVarietyId != null" >
+        #{grainVarietyId,jdbcType=INTEGER},
+      </if>
+      <if test="grainNatureId != null" >
+        #{grainNatureId,jdbcType=INTEGER},
+      </if>
+      <if test="lssl != null" >
+        #{lssl,jdbcType=DECIMAL},
+      </if>
+      <if test="grainAreaId != null" >
+        #{grainAreaId,jdbcType=INTEGER},
+      </if>
+      <if test="shnd != null" >
+        #{shnd,jdbcType=DATE},
+      </if>
+      <if test="rcsj != null" >
+        #{rcsj,jdbcType=DATE},
+      </if>
+      <if test="formWarehouseTime != null" >
+        #{formWarehouseTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="grainGradeId != null" >
+        #{grainGradeId,jdbcType=INTEGER},
+      </if>
+      <if test="temperatureMeasureType != null" >
+        #{temperatureMeasureType,jdbcType=TINYINT},
+      </if>
+      <if test="drafttype != null" >
+        #{drafttype,jdbcType=INTEGER},
+      </if>
+      <if test="glfs != null" >
+        #{glfs,jdbcType=VARCHAR},
+      </if>
+      <if test="storageOrgId != null" >
+        #{storageOrgId,jdbcType=INTEGER},
+      </if>
+      <if test="keepingWay != null" >
+        #{keepingWay,jdbcType=INTEGER},
+      </if>
+      <if test="volume != null" >
+        #{volume,jdbcType=DECIMAL},
+      </if>
+      <if test="length != null" >
+        #{length,jdbcType=DECIMAL},
+      </if>
+      <if test="width != null" >
+        #{width,jdbcType=DECIMAL},
+      </if>
+      <if test="trapezoidUpperLength != null" >
+        #{trapezoidUpperLength,jdbcType=DECIMAL},
+      </if>
+      <if test="trapezoidLowerLength != null" >
+        #{trapezoidLowerLength,jdbcType=DECIMAL},
+      </if>
+      <if test="trapezoidUpperWidth != null" >
+        #{trapezoidUpperWidth,jdbcType=DECIMAL},
+      </if>
+      <if test="trapezoidLowerWidth != null" >
+        #{trapezoidLowerWidth,jdbcType=DECIMAL},
+      </if>
+      <if test="flatStorageHeight != null" >
+        #{flatStorageHeight,jdbcType=DECIMAL},
+      </if>
+      <if test="trapezoidHeight != null" >
+        #{trapezoidHeight,jdbcType=DECIMAL},
+      </if>
+      <if test="siloInnerDiameter != null" >
+        #{siloInnerDiameter,jdbcType=DECIMAL},
+      </if>
+      <if test="siloGrainHeight != null" >
+        #{siloGrainHeight,jdbcType=DECIMAL},
+      </if>
+      <if test="packagedCount != null" >
+        #{packagedCount,jdbcType=INTEGER},
+      </if>
+      <if test="averageWeight != null" >
+        #{averageWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="checkRecordIds != null" >
+        #{checkRecordIds,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.GrainSituationCardExample" resultType="java.lang.Integer" >
+    select count(*) from grain_situation_card
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update grain_situation_card
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.createname != null" >
+        createname = #{record.createname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createdate != null" >
+        createdate = #{record.createdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatename != null" >
+        updatename = #{record.updatename,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updatedate != null" >
+        updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.warehouseSealingRecordId != null" >
+        warehouse_sealing_record_id = #{record.warehouseSealingRecordId,jdbcType=INTEGER},
+      </if>
+      <if test="record.fillOrgId != null" >
+        fill_org_id = #{record.fillOrgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.keepOrgId != null" >
+        keep_org_id = #{record.keepOrgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.basicStorehouseId != null" >
+        basic_storehouse_id = #{record.basicStorehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.basicUnitAisleId != null" >
+        basic_unit_aisle_id = #{record.basicUnitAisleId,jdbcType=INTEGER},
+      </if>
+      <if test="record.warehouseId != null" >
+        warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.storehouseType != null" >
+        storehouse_type = #{record.storehouseType,jdbcType=INTEGER},
+      </if>
+      <if test="record.designCapacity != null" >
+        design_capacity = #{record.designCapacity,jdbcType=DECIMAL},
+      </if>
+      <if test="record.grainVarietyId != null" >
+        grain_variety_id = #{record.grainVarietyId,jdbcType=INTEGER},
+      </if>
+      <if test="record.grainNatureId != null" >
+        grain_nature_id = #{record.grainNatureId,jdbcType=INTEGER},
+      </if>
+      <if test="record.lssl != null" >
+        lssl = #{record.lssl,jdbcType=DECIMAL},
+      </if>
+      <if test="record.grainAreaId != null" >
+        grain_area_id = #{record.grainAreaId,jdbcType=INTEGER},
+      </if>
+      <if test="record.shnd != null" >
+        shnd = #{record.shnd,jdbcType=DATE},
+      </if>
+      <if test="record.rcsj != null" >
+        rcsj = #{record.rcsj,jdbcType=DATE},
+      </if>
+      <if test="record.formWarehouseTime != null" >
+        form_warehouse_time = #{record.formWarehouseTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.grainGradeId != null" >
+        grain_grade_id = #{record.grainGradeId,jdbcType=INTEGER},
+      </if>
+      <if test="record.temperatureMeasureType != null" >
+        temperature_measure_type = #{record.temperatureMeasureType,jdbcType=TINYINT},
+      </if>
+      <if test="record.drafttype != null" >
+        drafttype = #{record.drafttype,jdbcType=INTEGER},
+      </if>
+      <if test="record.glfs != null" >
+        glfs = #{record.glfs,jdbcType=VARCHAR},
+      </if>
+      <if test="record.storageOrgId != null" >
+        storage_org_id = #{record.storageOrgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.keepingWay != null" >
+        keeping_way = #{record.keepingWay,jdbcType=INTEGER},
+      </if>
+      <if test="record.volume != null" >
+        volume = #{record.volume,jdbcType=DECIMAL},
+      </if>
+      <if test="record.length != null" >
+        length = #{record.length,jdbcType=DECIMAL},
+      </if>
+      <if test="record.width != null" >
+        width = #{record.width,jdbcType=DECIMAL},
+      </if>
+      <if test="record.trapezoidUpperLength != null" >
+        trapezoid_upper_length = #{record.trapezoidUpperLength,jdbcType=DECIMAL},
+      </if>
+      <if test="record.trapezoidLowerLength != null" >
+        trapezoid_lower_length = #{record.trapezoidLowerLength,jdbcType=DECIMAL},
+      </if>
+      <if test="record.trapezoidUpperWidth != null" >
+        trapezoid_upper_width = #{record.trapezoidUpperWidth,jdbcType=DECIMAL},
+      </if>
+      <if test="record.trapezoidLowerWidth != null" >
+        trapezoid_lower_width = #{record.trapezoidLowerWidth,jdbcType=DECIMAL},
+      </if>
+      <if test="record.flatStorageHeight != null" >
+        flat_storage_height = #{record.flatStorageHeight,jdbcType=DECIMAL},
+      </if>
+      <if test="record.trapezoidHeight != null" >
+        trapezoid_height = #{record.trapezoidHeight,jdbcType=DECIMAL},
+      </if>
+      <if test="record.siloInnerDiameter != null" >
+        silo_inner_diameter = #{record.siloInnerDiameter,jdbcType=DECIMAL},
+      </if>
+      <if test="record.siloGrainHeight != null" >
+        silo_grain_height = #{record.siloGrainHeight,jdbcType=DECIMAL},
+      </if>
+      <if test="record.packagedCount != null" >
+        packaged_count = #{record.packagedCount,jdbcType=INTEGER},
+      </if>
+      <if test="record.averageWeight != null" >
+        average_weight = #{record.averageWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="record.checkRecordIds != null" >
+        check_record_ids = #{record.checkRecordIds,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update grain_situation_card
+    set id = #{record.id,jdbcType=INTEGER},
+      createname = #{record.createname,jdbcType=VARCHAR},
+      createdate = #{record.createdate,jdbcType=TIMESTAMP},
+      updatename = #{record.updatename,jdbcType=VARCHAR},
+      updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
+      warehouse_sealing_record_id = #{record.warehouseSealingRecordId,jdbcType=INTEGER},
+      fill_org_id = #{record.fillOrgId,jdbcType=INTEGER},
+      keep_org_id = #{record.keepOrgId,jdbcType=INTEGER},
+      basic_storehouse_id = #{record.basicStorehouseId,jdbcType=INTEGER},
+      basic_unit_aisle_id = #{record.basicUnitAisleId,jdbcType=INTEGER},
+      warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
+      storehouse_type = #{record.storehouseType,jdbcType=INTEGER},
+      design_capacity = #{record.designCapacity,jdbcType=DECIMAL},
+      grain_variety_id = #{record.grainVarietyId,jdbcType=INTEGER},
+      grain_nature_id = #{record.grainNatureId,jdbcType=INTEGER},
+      lssl = #{record.lssl,jdbcType=DECIMAL},
+      grain_area_id = #{record.grainAreaId,jdbcType=INTEGER},
+      shnd = #{record.shnd,jdbcType=DATE},
+      rcsj = #{record.rcsj,jdbcType=DATE},
+      form_warehouse_time = #{record.formWarehouseTime,jdbcType=TIMESTAMP},
+      grain_grade_id = #{record.grainGradeId,jdbcType=INTEGER},
+      temperature_measure_type = #{record.temperatureMeasureType,jdbcType=TINYINT},
+      drafttype = #{record.drafttype,jdbcType=INTEGER},
+      glfs = #{record.glfs,jdbcType=VARCHAR},
+      storage_org_id = #{record.storageOrgId,jdbcType=INTEGER},
+      keeping_way = #{record.keepingWay,jdbcType=INTEGER},
+      volume = #{record.volume,jdbcType=DECIMAL},
+      length = #{record.length,jdbcType=DECIMAL},
+      width = #{record.width,jdbcType=DECIMAL},
+      trapezoid_upper_length = #{record.trapezoidUpperLength,jdbcType=DECIMAL},
+      trapezoid_lower_length = #{record.trapezoidLowerLength,jdbcType=DECIMAL},
+      trapezoid_upper_width = #{record.trapezoidUpperWidth,jdbcType=DECIMAL},
+      trapezoid_lower_width = #{record.trapezoidLowerWidth,jdbcType=DECIMAL},
+      flat_storage_height = #{record.flatStorageHeight,jdbcType=DECIMAL},
+      trapezoid_height = #{record.trapezoidHeight,jdbcType=DECIMAL},
+      silo_inner_diameter = #{record.siloInnerDiameter,jdbcType=DECIMAL},
+      silo_grain_height = #{record.siloGrainHeight,jdbcType=DECIMAL},
+      packaged_count = #{record.packagedCount,jdbcType=INTEGER},
+      average_weight = #{record.averageWeight,jdbcType=DECIMAL},
+      check_record_ids = #{record.checkRecordIds,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.storage.model.GrainSituationCard" >
+    update grain_situation_card
+    <set >
+      <if test="createname != null" >
+        createname = #{createname,jdbcType=VARCHAR},
+      </if>
+      <if test="createdate != null" >
+        createdate = #{createdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatename != null" >
+        updatename = #{updatename,jdbcType=VARCHAR},
+      </if>
+      <if test="updatedate != null" >
+        updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="warehouseSealingRecordId != null" >
+        warehouse_sealing_record_id = #{warehouseSealingRecordId,jdbcType=INTEGER},
+      </if>
+      <if test="fillOrgId != null" >
+        fill_org_id = #{fillOrgId,jdbcType=INTEGER},
+      </if>
+      <if test="keepOrgId != null" >
+        keep_org_id = #{keepOrgId,jdbcType=INTEGER},
+      </if>
+      <if test="basicStorehouseId != null" >
+        basic_storehouse_id = #{basicStorehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="basicUnitAisleId != null" >
+        basic_unit_aisle_id = #{basicUnitAisleId,jdbcType=INTEGER},
+      </if>
+      <if test="warehouseId != null" >
+        warehouse_id = #{warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="storehouseType != null" >
+        storehouse_type = #{storehouseType,jdbcType=INTEGER},
+      </if>
+      <if test="designCapacity != null" >
+        design_capacity = #{designCapacity,jdbcType=DECIMAL},
+      </if>
+      <if test="grainVarietyId != null" >
+        grain_variety_id = #{grainVarietyId,jdbcType=INTEGER},
+      </if>
+      <if test="grainNatureId != null" >
+        grain_nature_id = #{grainNatureId,jdbcType=INTEGER},
+      </if>
+      <if test="lssl != null" >
+        lssl = #{lssl,jdbcType=DECIMAL},
+      </if>
+      <if test="grainAreaId != null" >
+        grain_area_id = #{grainAreaId,jdbcType=INTEGER},
+      </if>
+      <if test="shnd != null" >
+        shnd = #{shnd,jdbcType=DATE},
+      </if>
+      <if test="rcsj != null" >
+        rcsj = #{rcsj,jdbcType=DATE},
+      </if>
+      <if test="formWarehouseTime != null" >
+        form_warehouse_time = #{formWarehouseTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="grainGradeId != null" >
+        grain_grade_id = #{grainGradeId,jdbcType=INTEGER},
+      </if>
+      <if test="temperatureMeasureType != null" >
+        temperature_measure_type = #{temperatureMeasureType,jdbcType=TINYINT},
+      </if>
+      <if test="drafttype != null" >
+        drafttype = #{drafttype,jdbcType=INTEGER},
+      </if>
+      <if test="glfs != null" >
+        glfs = #{glfs,jdbcType=VARCHAR},
+      </if>
+      <if test="storageOrgId != null" >
+        storage_org_id = #{storageOrgId,jdbcType=INTEGER},
+      </if>
+      <if test="keepingWay != null" >
+        keeping_way = #{keepingWay,jdbcType=INTEGER},
+      </if>
+      <if test="volume != null" >
+        volume = #{volume,jdbcType=DECIMAL},
+      </if>
+      <if test="length != null" >
+        length = #{length,jdbcType=DECIMAL},
+      </if>
+      <if test="width != null" >
+        width = #{width,jdbcType=DECIMAL},
+      </if>
+      <if test="trapezoidUpperLength != null" >
+        trapezoid_upper_length = #{trapezoidUpperLength,jdbcType=DECIMAL},
+      </if>
+      <if test="trapezoidLowerLength != null" >
+        trapezoid_lower_length = #{trapezoidLowerLength,jdbcType=DECIMAL},
+      </if>
+      <if test="trapezoidUpperWidth != null" >
+        trapezoid_upper_width = #{trapezoidUpperWidth,jdbcType=DECIMAL},
+      </if>
+      <if test="trapezoidLowerWidth != null" >
+        trapezoid_lower_width = #{trapezoidLowerWidth,jdbcType=DECIMAL},
+      </if>
+      <if test="flatStorageHeight != null" >
+        flat_storage_height = #{flatStorageHeight,jdbcType=DECIMAL},
+      </if>
+      <if test="trapezoidHeight != null" >
+        trapezoid_height = #{trapezoidHeight,jdbcType=DECIMAL},
+      </if>
+      <if test="siloInnerDiameter != null" >
+        silo_inner_diameter = #{siloInnerDiameter,jdbcType=DECIMAL},
+      </if>
+      <if test="siloGrainHeight != null" >
+        silo_grain_height = #{siloGrainHeight,jdbcType=DECIMAL},
+      </if>
+      <if test="packagedCount != null" >
+        packaged_count = #{packagedCount,jdbcType=INTEGER},
+      </if>
+      <if test="averageWeight != null" >
+        average_weight = #{averageWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="checkRecordIds != null" >
+        check_record_ids = #{checkRecordIds,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.storage.model.GrainSituationCard" >
+    update grain_situation_card
+    set createname = #{createname,jdbcType=VARCHAR},
+      createdate = #{createdate,jdbcType=TIMESTAMP},
+      updatename = #{updatename,jdbcType=VARCHAR},
+      updatedate = #{updatedate,jdbcType=TIMESTAMP},
+      warehouse_sealing_record_id = #{warehouseSealingRecordId,jdbcType=INTEGER},
+      fill_org_id = #{fillOrgId,jdbcType=INTEGER},
+      keep_org_id = #{keepOrgId,jdbcType=INTEGER},
+      basic_storehouse_id = #{basicStorehouseId,jdbcType=INTEGER},
+      basic_unit_aisle_id = #{basicUnitAisleId,jdbcType=INTEGER},
+      warehouse_id = #{warehouseId,jdbcType=INTEGER},
+      storehouse_type = #{storehouseType,jdbcType=INTEGER},
+      design_capacity = #{designCapacity,jdbcType=DECIMAL},
+      grain_variety_id = #{grainVarietyId,jdbcType=INTEGER},
+      grain_nature_id = #{grainNatureId,jdbcType=INTEGER},
+      lssl = #{lssl,jdbcType=DECIMAL},
+      grain_area_id = #{grainAreaId,jdbcType=INTEGER},
+      shnd = #{shnd,jdbcType=DATE},
+      rcsj = #{rcsj,jdbcType=DATE},
+      form_warehouse_time = #{formWarehouseTime,jdbcType=TIMESTAMP},
+      grain_grade_id = #{grainGradeId,jdbcType=INTEGER},
+      temperature_measure_type = #{temperatureMeasureType,jdbcType=TINYINT},
+      drafttype = #{drafttype,jdbcType=INTEGER},
+      glfs = #{glfs,jdbcType=VARCHAR},
+      storage_org_id = #{storageOrgId,jdbcType=INTEGER},
+      keeping_way = #{keepingWay,jdbcType=INTEGER},
+      volume = #{volume,jdbcType=DECIMAL},
+      length = #{length,jdbcType=DECIMAL},
+      width = #{width,jdbcType=DECIMAL},
+      trapezoid_upper_length = #{trapezoidUpperLength,jdbcType=DECIMAL},
+      trapezoid_lower_length = #{trapezoidLowerLength,jdbcType=DECIMAL},
+      trapezoid_upper_width = #{trapezoidUpperWidth,jdbcType=DECIMAL},
+      trapezoid_lower_width = #{trapezoidLowerWidth,jdbcType=DECIMAL},
+      flat_storage_height = #{flatStorageHeight,jdbcType=DECIMAL},
+      trapezoid_height = #{trapezoidHeight,jdbcType=DECIMAL},
+      silo_inner_diameter = #{siloInnerDiameter,jdbcType=DECIMAL},
+      silo_grain_height = #{siloGrainHeight,jdbcType=DECIMAL},
+      packaged_count = #{packagedCount,jdbcType=INTEGER},
+      average_weight = #{averageWeight,jdbcType=DECIMAL},
+      check_record_ids = #{checkRecordIds,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

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

@@ -1,6 +1,9 @@
 package com.chinaitop.depot.storage.mapper;
 
+import com.chinaitop.depot.storage.model.StorageStorehouseBusiness;
 import com.chinaitop.depot.storage.model.WarehouseSealingRecord;
+import com.chinaitop.depot.storage.model.vo.WareHouseVO;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -20,4 +23,9 @@ public interface WarehouseSealingRecordMapper {
     List<WarehouseSealingRecord> findByWarehouseSeaList(Map<String, Object> modelMap1);
 
 
+    List<StorageStorehouseBusiness> findStorehouseList(Integer orgId);
+
+    List<WareHouseVO> findWareHouse(@Param("storehouseId") Integer storehouseId);
+
+    WareHouseVO findkcsw(@Param("warehouseId") Integer warehouseId);
 }

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

@@ -141,6 +141,54 @@
     where cc.fcqrdh=#{fcqrdh,jdbcType=VARCHAR}
       AND (cc.czbz = 'i' OR cc.czbz = 'u')
   </select>
+    <select id="findStorehouseList" parameterType="java.lang.Integer" resultType="com.chinaitop.depot.storage.model.StorageStorehouseBusiness">
+      SELECT
+        bs.storehouse_id storehouseId,
+        bs.storehouse_name storehouseName
+      FROM
+        business_qc_quality_inspection bqqi
+          LEFT JOIN basic_storehouse bs ON bs.storehouse_id = bqqi.basic_storehouse_id
+      WHERE
+      bqqi.org_id=#{orgId} and bqqi.jylb='02'
+
+    </select>
+  <select id="findWareHouse" parameterType="java.lang.Integer" resultType="com.chinaitop.depot.storage.model.vo.WareHouseVO">
+    SELECT
+      bw.warehouse_name warehouseName,
+      bw.warehouse_id warehouseId,
+      bw.aisle_id ajid,
+      bua.ajmc
+    FROM
+      basic_warehouse bw
+        LEFT JOIN basic_unit_aisle bua ON bw.aisle_id = bua.id
+    WHERE
+     bw.storehouse_id=#{storehouseId}
+  </select>
+  <select id="findkcsw"  parameterType="java.lang.Integer" resultType="com.chinaitop.depot.storage.model.vo.WareHouseVO">
+    select
+      bw.dutystoreman   bgy,
+      kc.mxpz	grainVarietyId,
+      kc.hwxz	grainNatureId,
+      kc.kcsl lssl,
+      kc.dj	grainGradeId,
+      kc.gb	producerId,
+      kc.cjsj	rcrq,
+      pz.enumname as "grainVarietyName",
+      xz.enumname as "grainNatureName",
+      cd.enumname as "producerName",
+      dj.enumname as "grainGradeName",
+      shnd.enumname as shnd
+    from data_kcgl_kcsw_default kc
+           LEFT JOIN  basic_warehouse bw on kc.hwh = bw.warehouse_id
+           LEFT JOIN depot_qh.basic_enum pz on pz.enumId = kc.mxpz
+           LEFT JOIN depot_qh.basic_enum xz on xz.enumId = kc.hwxz
+           LEFT JOIN depot_qh.basic_enum dj on dj.enumId = kc.dj
+           LEFT JOIN depot_qh.basic_enum cd on cd.enumId = kc.gb
+           LEFT JOIN depot_qh.basic_enum shnd on shnd.enumId = kc.scnf
+    where kc.hwh=#{warehouseId}
+
+
+  </select>
 
 
   <insert id="insert" keyProperty="id" useGeneratedKeys="true"  parameterType="com.chinaitop.depot.storage.model.WarehouseSealingRecord">

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

@@ -1,5 +1,7 @@
 package com.chinaitop.depot.storage.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -8,10 +10,13 @@ public class ClearanceConfirmation {
 
     private Integer id;
     private String czbz;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date zhgxsj;
     private String createname;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createdate;
     private String updatename;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updatedate;
 
     private String cqqrdh; //出清单确认单号

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

@@ -0,0 +1,726 @@
+package com.chinaitop.depot.storage.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class GrainSituationCard {
+    private Integer id;
+
+    private String createname;
+
+    private Date createdate;
+
+    private String updatename;
+
+    private Date updatedate;
+
+    private Integer warehouseSealingRecordId;
+
+    private Integer fillOrgId;
+
+    private Integer keepOrgId;
+
+    private Integer basicStorehouseId;
+
+    private Integer basicUnitAisleId;
+
+    private Integer warehouseId;
+
+    private Integer storehouseType;
+
+    private BigDecimal designCapacity;
+
+    private Integer grainVarietyId;
+
+    private Integer grainNatureId;
+
+    private BigDecimal lssl;
+
+    private Integer grainAreaId;
+
+    private Date shnd;
+
+    private Date rcsj;
+
+    private Date formWarehouseTime;
+
+    private Integer grainGradeId;
+
+    private Byte temperatureMeasureType;
+
+    private Integer drafttype;
+
+    private String glfs;
+
+    private Integer storageOrgId;
+
+    private Integer keepingWay;
+
+    private BigDecimal volume;
+
+    private BigDecimal length;
+
+    private BigDecimal width;
+
+    private BigDecimal trapezoidUpperLength;
+
+    private BigDecimal trapezoidLowerLength;
+
+    private BigDecimal trapezoidUpperWidth;
+
+    private BigDecimal trapezoidLowerWidth;
+
+    private BigDecimal flatStorageHeight;
+
+    private BigDecimal trapezoidHeight;
+
+    private BigDecimal siloInnerDiameter;
+
+    private BigDecimal siloGrainHeight;
+
+    private Integer packagedCount;
+
+    private BigDecimal averageWeight;
+
+    private String checkRecordIds;
+
+    /**
+     * 主键ID
+     * @return id 主键ID
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 主键ID
+     * @param id 主键ID
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 
+     * @return createname 
+     */
+    public String getCreatename() {
+        return createname;
+    }
+
+    /**
+     * 
+     * @param createname 
+     */
+    public void setCreatename(String createname) {
+        this.createname = createname == null ? null : createname.trim();
+    }
+
+    /**
+     * 创建日期
+     * @return createdate 创建日期
+     */
+    public Date getCreatedate() {
+        return createdate;
+    }
+
+    /**
+     * 创建日期
+     * @param createdate 创建日期
+     */
+    public void setCreatedate(Date createdate) {
+        this.createdate = createdate;
+    }
+
+    /**
+     * 
+     * @return updatename 
+     */
+    public String getUpdatename() {
+        return updatename;
+    }
+
+    /**
+     * 
+     * @param updatename 
+     */
+    public void setUpdatename(String updatename) {
+        this.updatename = updatename == null ? null : updatename.trim();
+    }
+
+    /**
+     * 更新日期
+     * @return updatedate 更新日期
+     */
+    public Date getUpdatedate() {
+        return updatedate;
+    }
+
+    /**
+     * 更新日期
+     * @param updatedate 更新日期
+     */
+    public void setUpdatedate(Date updatedate) {
+        this.updatedate = updatedate;
+    }
+
+    /**
+     * warehouse_sealing_record的id；
+     * @return warehouse_sealing_record_id warehouse_sealing_record的id；
+     */
+    public Integer getWarehouseSealingRecordId() {
+        return warehouseSealingRecordId;
+    }
+
+    /**
+     * warehouse_sealing_record的id；
+     * @param warehouseSealingRecordId warehouse_sealing_record的id；
+     */
+    public void setWarehouseSealingRecordId(Integer warehouseSealingRecordId) {
+        this.warehouseSealingRecordId = warehouseSealingRecordId;
+    }
+
+    /**
+     * 填卡库区id；org_info的id；
+     * @return fill_org_id 填卡库区id；org_info的id；
+     */
+    public Integer getFillOrgId() {
+        return fillOrgId;
+    }
+
+    /**
+     * 填卡库区id；org_info的id；
+     * @param fillOrgId 填卡库区id；org_info的id；
+     */
+    public void setFillOrgId(Integer fillOrgId) {
+        this.fillOrgId = fillOrgId;
+    }
+
+    /**
+     * 保管库区id；org_info的id；
+     * @return keep_org_id 保管库区id；org_info的id；
+     */
+    public Integer getKeepOrgId() {
+        return keepOrgId;
+    }
+
+    /**
+     * 保管库区id；org_info的id；
+     * @param keepOrgId 保管库区id；org_info的id；
+     */
+    public void setKeepOrgId(Integer keepOrgId) {
+        this.keepOrgId = keepOrgId;
+    }
+
+    /**
+     * basic_storehouse的id；仓房id；
+     * @return basic_storehouse_id basic_storehouse的id；仓房id；
+     */
+    public Integer getBasicStorehouseId() {
+        return basicStorehouseId;
+    }
+
+    /**
+     * basic_storehouse的id；仓房id；
+     * @param basicStorehouseId basic_storehouse的id；仓房id；
+     */
+    public void setBasicStorehouseId(Integer basicStorehouseId) {
+        this.basicStorehouseId = basicStorehouseId;
+    }
+
+    /**
+     * basic_unit_aisle的id；廒间id；
+     * @return basic_unit_aisle_id basic_unit_aisle的id；廒间id；
+     */
+    public Integer getBasicUnitAisleId() {
+        return basicUnitAisleId;
+    }
+
+    /**
+     * basic_unit_aisle的id；廒间id；
+     * @param basicUnitAisleId basic_unit_aisle的id；廒间id；
+     */
+    public void setBasicUnitAisleId(Integer basicUnitAisleId) {
+        this.basicUnitAisleId = basicUnitAisleId;
+    }
+
+    /**
+     * basic_warehouse的id；货位id;
+     * @return warehouse_id basic_warehouse的id；货位id;
+     */
+    public Integer getWarehouseId() {
+        return warehouseId;
+    }
+
+    /**
+     * basic_warehouse的id；货位id;
+     * @param warehouseId basic_warehouse的id；货位id;
+     */
+    public void setWarehouseId(Integer warehouseId) {
+        this.warehouseId = warehouseId;
+    }
+
+    /**
+     * 仓房类型编号（立筒仓等）
+     * @return storehouse_type 仓房类型编号（立筒仓等）
+     */
+    public Integer getStorehouseType() {
+        return storehouseType;
+    }
+
+    /**
+     * 仓房类型编号（立筒仓等）
+     * @param storehouseType 仓房类型编号（立筒仓等）
+     */
+    public void setStorehouseType(Integer storehouseType) {
+        this.storehouseType = storehouseType;
+    }
+
+    /**
+     * 设计容量（数字，单位吨）
+     * @return design_capacity 设计容量（数字，单位吨）
+     */
+    public BigDecimal getDesignCapacity() {
+        return designCapacity;
+    }
+
+    /**
+     * 设计容量（数字，单位吨）
+     * @param designCapacity 设计容量（数字，单位吨）
+     */
+    public void setDesignCapacity(BigDecimal designCapacity) {
+        this.designCapacity = designCapacity;
+    }
+
+    /**
+     * 粮食品种；basic_enum的id；
+     * @return grain_variety_id 粮食品种；basic_enum的id；
+     */
+    public Integer getGrainVarietyId() {
+        return grainVarietyId;
+    }
+
+    /**
+     * 粮食品种；basic_enum的id；
+     * @param grainVarietyId 粮食品种；basic_enum的id；
+     */
+    public void setGrainVarietyId(Integer grainVarietyId) {
+        this.grainVarietyId = grainVarietyId;
+    }
+
+    /**
+     * 粮食性质；basic_enum的id；
+     * @return grain_nature_id 粮食性质；basic_enum的id；
+     */
+    public Integer getGrainNatureId() {
+        return grainNatureId;
+    }
+
+    /**
+     * 粮食性质；basic_enum的id；
+     * @param grainNatureId 粮食性质；basic_enum的id；
+     */
+    public void setGrainNatureId(Integer grainNatureId) {
+        this.grainNatureId = grainNatureId;
+    }
+
+    /**
+     * 粮食数量，单位：公斤
+     * @return lssl 粮食数量，单位：公斤
+     */
+    public BigDecimal getLssl() {
+        return lssl;
+    }
+
+    /**
+     * 粮食数量，单位：公斤
+     * @param lssl 粮食数量，单位：公斤
+     */
+    public void setLssl(BigDecimal lssl) {
+        this.lssl = lssl;
+    }
+
+    /**
+     * 粮食产地；basic_enum的id；
+     * @return grain_area_id 粮食产地；basic_enum的id；
+     */
+    public Integer getGrainAreaId() {
+        return grainAreaId;
+    }
+
+    /**
+     * 粮食产地；basic_enum的id；
+     * @param grainAreaId 粮食产地；basic_enum的id；
+     */
+    public void setGrainAreaId(Integer grainAreaId) {
+        this.grainAreaId = grainAreaId;
+    }
+
+    /**
+     * 收获年度，格式：YYYY，货位（油罐）状态为2、3、4时必填
+     * @return shnd 收获年度，格式：YYYY，货位（油罐）状态为2、3、4时必填
+     */
+    public Date getShnd() {
+        return shnd;
+    }
+
+    /**
+     * 收获年度，格式：YYYY，货位（油罐）状态为2、3、4时必填
+     * @param shnd 收获年度，格式：YYYY，货位（油罐）状态为2、3、4时必填
+     */
+    public void setShnd(Date shnd) {
+        this.shnd = shnd;
+    }
+
+    /**
+     * 入仓日期；第一车粮食入仓时间；
+     * @return rcsj 入仓日期；第一车粮食入仓时间；
+     */
+    public Date getRcsj() {
+        return rcsj;
+    }
+
+    /**
+     * 入仓日期；第一车粮食入仓时间；
+     * @param rcsj 入仓日期；第一车粮食入仓时间；
+     */
+    public void setRcsj(Date rcsj) {
+        this.rcsj = rcsj;
+    }
+
+    /**
+     * 形成货位时间；生成粮情卡的时间；
+     * @return form_warehouse_time 形成货位时间；生成粮情卡的时间；
+     */
+    public Date getFormWarehouseTime() {
+        return formWarehouseTime;
+    }
+
+    /**
+     * 形成货位时间；生成粮情卡的时间；
+     * @param formWarehouseTime 形成货位时间；生成粮情卡的时间；
+     */
+    public void setFormWarehouseTime(Date formWarehouseTime) {
+        this.formWarehouseTime = formWarehouseTime;
+    }
+
+    /**
+     * 粮食等级；basic_enum的id；
+     * @return grain_grade_id 粮食等级；basic_enum的id；
+     */
+    public Integer getGrainGradeId() {
+        return grainGradeId;
+    }
+
+    /**
+     * 粮食等级；basic_enum的id；
+     * @param grainGradeId 粮食等级；basic_enum的id；
+     */
+    public void setGrainGradeId(Integer grainGradeId) {
+        this.grainGradeId = grainGradeId;
+    }
+
+    /**
+     * 测温方式 1：电子测温；2：手动测温；
+     * @return temperature_measure_type 测温方式 1：电子测温；2：手动测温；
+     */
+    public Byte getTemperatureMeasureType() {
+        return temperatureMeasureType;
+    }
+
+    /**
+     * 测温方式 1：电子测温；2：手动测温；
+     * @param temperatureMeasureType 测温方式 1：电子测温；2：手动测温；
+     */
+    public void setTemperatureMeasureType(Byte temperatureMeasureType) {
+        this.temperatureMeasureType = temperatureMeasureType;
+    }
+
+    /**
+     * 通风方式
+     * @return drafttype 通风方式
+     */
+    public Integer getDrafttype() {
+        return drafttype;
+    }
+
+    /**
+     * 通风方式
+     * @param drafttype 通风方式
+     */
+    public void setDrafttype(Integer drafttype) {
+        this.drafttype = drafttype;
+    }
+
+    /**
+     * 管理方式 01 直储；02 代储；03 租仓；04 委托；
+     * @return glfs 管理方式 01 直储；02 代储；03 租仓；04 委托；
+     */
+    public String getGlfs() {
+        return glfs;
+    }
+
+    /**
+     * 管理方式 01 直储；02 代储；03 租仓；04 委托；
+     * @param glfs 管理方式 01 直储；02 代储；03 租仓；04 委托；
+     */
+    public void setGlfs(String glfs) {
+        this.glfs = glfs == null ? null : glfs.trim();
+    }
+
+    /**
+     * 存储地点库区id；org_info的id；
+     * @return storage_org_id 存储地点库区id；org_info的id；
+     */
+    public Integer getStorageOrgId() {
+        return storageOrgId;
+    }
+
+    /**
+     * 存储地点库区id；org_info的id；
+     * @param storageOrgId 存储地点库区id；org_info的id；
+     */
+    public void setStorageOrgId(Integer storageOrgId) {
+        this.storageOrgId = storageOrgId;
+    }
+
+    /**
+     * 保管方式
+     * @return keeping_way 保管方式
+     */
+    public Integer getKeepingWay() {
+        return keepingWay;
+    }
+
+    /**
+     * 保管方式
+     * @param keepingWay 保管方式
+     */
+    public void setKeepingWay(Integer keepingWay) {
+        this.keepingWay = keepingWay;
+    }
+
+    /**
+     * 散存粮体积(立方米)
+     * @return volume 散存粮体积(立方米)
+     */
+    public BigDecimal getVolume() {
+        return volume;
+    }
+
+    /**
+     * 散存粮体积(立方米)
+     * @param volume 散存粮体积(立方米)
+     */
+    public void setVolume(BigDecimal volume) {
+        this.volume = volume;
+    }
+
+    /**
+     * 长（米）
+     * @return length 长（米）
+     */
+    public BigDecimal getLength() {
+        return length;
+    }
+
+    /**
+     * 长（米）
+     * @param length 长（米）
+     */
+    public void setLength(BigDecimal length) {
+        this.length = length;
+    }
+
+    /**
+     * 宽（米）
+     * @return width 宽（米）
+     */
+    public BigDecimal getWidth() {
+        return width;
+    }
+
+    /**
+     * 宽（米）
+     * @param width 宽（米）
+     */
+    public void setWidth(BigDecimal width) {
+        this.width = width;
+    }
+
+    /**
+     * 梯形粮堆-上底长
+     * @return trapezoid_upper_length 梯形粮堆-上底长
+     */
+    public BigDecimal getTrapezoidUpperLength() {
+        return trapezoidUpperLength;
+    }
+
+    /**
+     * 梯形粮堆-上底长
+     * @param trapezoidUpperLength 梯形粮堆-上底长
+     */
+    public void setTrapezoidUpperLength(BigDecimal trapezoidUpperLength) {
+        this.trapezoidUpperLength = trapezoidUpperLength;
+    }
+
+    /**
+     * 梯形粮堆-下底长
+     * @return trapezoid_lower_length 梯形粮堆-下底长
+     */
+    public BigDecimal getTrapezoidLowerLength() {
+        return trapezoidLowerLength;
+    }
+
+    /**
+     * 梯形粮堆-下底长
+     * @param trapezoidLowerLength 梯形粮堆-下底长
+     */
+    public void setTrapezoidLowerLength(BigDecimal trapezoidLowerLength) {
+        this.trapezoidLowerLength = trapezoidLowerLength;
+    }
+
+    /**
+     * 梯形粮堆-上底宽
+     * @return trapezoid_upper_width 梯形粮堆-上底宽
+     */
+    public BigDecimal getTrapezoidUpperWidth() {
+        return trapezoidUpperWidth;
+    }
+
+    /**
+     * 梯形粮堆-上底宽
+     * @param trapezoidUpperWidth 梯形粮堆-上底宽
+     */
+    public void setTrapezoidUpperWidth(BigDecimal trapezoidUpperWidth) {
+        this.trapezoidUpperWidth = trapezoidUpperWidth;
+    }
+
+    /**
+     * 梯形粮堆-下底宽
+     * @return trapezoid_lower_width 梯形粮堆-下底宽
+     */
+    public BigDecimal getTrapezoidLowerWidth() {
+        return trapezoidLowerWidth;
+    }
+
+    /**
+     * 梯形粮堆-下底宽
+     * @param trapezoidLowerWidth 梯形粮堆-下底宽
+     */
+    public void setTrapezoidLowerWidth(BigDecimal trapezoidLowerWidth) {
+        this.trapezoidLowerWidth = trapezoidLowerWidth;
+    }
+
+    /**
+     * 平房仓粮堆（高）
+     * @return flat_storage_height 平房仓粮堆（高）
+     */
+    public BigDecimal getFlatStorageHeight() {
+        return flatStorageHeight;
+    }
+
+    /**
+     * 平房仓粮堆（高）
+     * @param flatStorageHeight 平房仓粮堆（高）
+     */
+    public void setFlatStorageHeight(BigDecimal flatStorageHeight) {
+        this.flatStorageHeight = flatStorageHeight;
+    }
+
+    /**
+     * 梯形高
+     * @return trapezoid_height 梯形高
+     */
+    public BigDecimal getTrapezoidHeight() {
+        return trapezoidHeight;
+    }
+
+    /**
+     * 梯形高
+     * @param trapezoidHeight 梯形高
+     */
+    public void setTrapezoidHeight(BigDecimal trapezoidHeight) {
+        this.trapezoidHeight = trapezoidHeight;
+    }
+
+    /**
+     * 筒仓内直径
+     * @return silo_inner_diameter 筒仓内直径
+     */
+    public BigDecimal getSiloInnerDiameter() {
+        return siloInnerDiameter;
+    }
+
+    /**
+     * 筒仓内直径
+     * @param siloInnerDiameter 筒仓内直径
+     */
+    public void setSiloInnerDiameter(BigDecimal siloInnerDiameter) {
+        this.siloInnerDiameter = siloInnerDiameter;
+    }
+
+    /**
+     * 筒仓内粮堆高
+     * @return silo_grain_height 筒仓内粮堆高
+     */
+    public BigDecimal getSiloGrainHeight() {
+        return siloGrainHeight;
+    }
+
+    /**
+     * 筒仓内粮堆高
+     * @param siloGrainHeight 筒仓内粮堆高
+     */
+    public void setSiloGrainHeight(BigDecimal siloGrainHeight) {
+        this.siloGrainHeight = siloGrainHeight;
+    }
+
+    /**
+     * 包装散存包数
+     * @return packaged_count 包装散存包数
+     */
+    public Integer getPackagedCount() {
+        return packagedCount;
+    }
+
+    /**
+     * 包装散存包数
+     * @param packagedCount 包装散存包数
+     */
+    public void setPackagedCount(Integer packagedCount) {
+        this.packagedCount = packagedCount;
+    }
+
+    /**
+     * 平均包重
+     * @return average_weight 平均包重
+     */
+    public BigDecimal getAverageWeight() {
+        return averageWeight;
+    }
+
+    /**
+     * 平均包重
+     * @param averageWeight 平均包重
+     */
+    public void setAverageWeight(BigDecimal averageWeight) {
+        this.averageWeight = averageWeight;
+    }
+
+    /**
+     * 检查记录id；storage_qualitycheck的id；数组","分隔；
+     * @return check_record_ids 检查记录id；storage_qualitycheck的id；数组","分隔；
+     */
+    public String getCheckRecordIds() {
+        return checkRecordIds;
+    }
+
+    /**
+     * 检查记录id；storage_qualitycheck的id；数组","分隔；
+     * @param checkRecordIds 检查记录id；storage_qualitycheck的id；数组","分隔；
+     */
+    public void setCheckRecordIds(String checkRecordIds) {
+        this.checkRecordIds = checkRecordIds == null ? null : checkRecordIds.trim();
+    }
+}

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

@@ -1,5 +1,7 @@
 package com.chinaitop.depot.storage.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -8,10 +10,13 @@ public class WarehouseSealingRecord {
 
     private Integer id;
     private String czbz;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date zhgxsj;
     private String createname;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createdate;
     private String updatename;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updatedate;
 
     private String fcqrdh; //封仓单确认单号

src/main/java/com/chinaitop/depot/storage/model/vo/WareHouseVO.java

@@ -0,0 +1,43 @@
+package com.chinaitop.depot.storage.model.vo;
+
+public class WareHouseVO {
+
+    private Integer warehouseId;
+
+    private Integer ajid;
+    private String ajmc; //廒间名称
+
+    private String warehouseName;//货位名称
+
+    public Integer getWarehouseId() {
+        return warehouseId;
+    }
+
+    public void setWarehouseId(Integer warehouseId) {
+        this.warehouseId = warehouseId;
+    }
+
+    public Integer getAjId() {
+        return ajid;
+    }
+
+    public void setAjId(Integer ajId) {
+        this.ajid = ajId;
+    }
+
+    public String getAjmc() {
+        return ajmc;
+    }
+
+    public void setAjmc(String ajmc) {
+        this.ajmc = ajmc;
+    }
+
+    public String getWarehouseName() {
+        return warehouseName;
+    }
+
+    public void setWarehouseName(String warehouseName) {
+        this.warehouseName = warehouseName;
+    }
+}

src/main/java/com/chinaitop/depot/storage/model/vo/kcswVO.java

@@ -0,0 +1,44 @@
+package com.chinaitop.depot.storage.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+public class kcswVO {
+
+    private String bgy;
+
+     private Double lssl;
+
+     private Date  rcrq;
+
+    @ApiModelProperty(value = "粮食品种；basic_enum的id；")
+    private Integer grainVarietyId;
+
+    @ApiModelProperty(value = "粮食性质；basic_enum的id；")
+    private Integer grainNatureId;
+
+    @ApiModelProperty(value = "粮食等级；basic_enum的id；")
+    private Integer grainGradeId;
+
+    @ApiModelProperty(value = "粮食产地；basic_enum的id；")
+    private Integer producerId;
+
+    @ApiModelProperty(value = "basic_storehouse的id；仓房名称")
+    private String basicStorehouseName;
+
+    @ApiModelProperty(value = "basic_warehouse的id；货位名称")
+    private String warehouseName;
+
+    @ApiModelProperty(value = "粮食品种；basic_enum的id；粮食品种名称")
+    private String grainVarietyName;
+
+    @ApiModelProperty(value = "粮食性质；basic_enum的id；粮食性质名称")
+    private String grainNatureName;
+
+    @ApiModelProperty(value = "粮食等级；basic_enum的id；粮食等级名称")
+    private String grainGradeName;
+
+    @ApiModelProperty(value = "粮食产地；basic_enum的id；粮食产地名称")
+    private String producerName;
+}

src/main/java/com/chinaitop/depot/storage/service/WarehouseSealingRecordService.java

@@ -1,7 +1,9 @@
 package com.chinaitop.depot.storage.service;
 
 
+import com.chinaitop.depot.storage.model.StorageStorehouseBusiness;
 import com.chinaitop.depot.storage.model.WarehouseSealingRecord;
+import com.chinaitop.depot.storage.model.vo.WareHouseVO;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -35,4 +37,9 @@ public interface WarehouseSealingRecordService {
     public void updateBasicStorehouse(WarehouseSealingRecord WarehouseSealingRecord);
 
 
+    List<StorageStorehouseBusiness> findStorehouse(Integer orgId);
+
+    List<WareHouseVO> findWareHouse(Integer storehouseId);
+
+    WareHouseVO findkcsw(Integer warehouseId);
 }

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

@@ -2,7 +2,9 @@ package com.chinaitop.depot.storage.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.chinaitop.depot.storage.mapper.WarehouseSealingRecordMapper;
+import com.chinaitop.depot.storage.model.StorageStorehouseBusiness;
 import com.chinaitop.depot.storage.model.WarehouseSealingRecord;
+import com.chinaitop.depot.storage.model.vo.WareHouseVO;
 import com.chinaitop.depot.storage.service.WarehouseSealingRecordService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.lang.ObjectUtils;
@@ -96,4 +98,33 @@ public class WarehouseSealingRecordServiceImpl implements WarehouseSealingRecord
     public void updateBasicStorehouse(WarehouseSealingRecord WarehouseSealingRecord){
         WarehouseSealingRecordMapper.updateByPrimaryKey(WarehouseSealingRecord);
     }
+
+    /**
+     * 查询本库区做过出仓检验的的仓房
+     * @param orgId
+     * @return
+     */
+    @Override
+    public List<StorageStorehouseBusiness> findStorehouse(Integer orgId) {
+        List<StorageStorehouseBusiness> storageStorehouseBusinessList= WarehouseSealingRecordMapper.findStorehouseList(orgId);
+        return storageStorehouseBusinessList;
+    }
+
+    /**
+     *
+     * @param storehouseId
+     * @return
+     */
+    @Override
+    public List<WareHouseVO> findWareHouse(Integer storehouseId) {
+        List<WareHouseVO> wareHouseVOList = WarehouseSealingRecordMapper.findWareHouse(storehouseId);
+        return wareHouseVOList;
+    }
+
+    @Override
+    public WareHouseVO findkcsw(Integer warehouseId) {
+        WareHouseVO wareHouseVO =WarehouseSealingRecordMapper.findkcsw(warehouseId);
+
+        return wareHouseVO;
+    }
 }

src/main/java/com/chinaitop/depot/storage/utils/GeneratorSqlmap.java

@@ -16,7 +16,7 @@ public class GeneratorSqlmap {
 		List<String> warnings = new ArrayList<String>();
 		boolean overwrite = true;
 		//指定 逆向工程配置文件(写自己电脑的路径)
-		File configFile = new File("D:\\git_ziguangyun_gogs\\tianjin\\depot-qualitycheck-tianjin\\src\\main\\resources\\generatorConfig.xml");
+		File configFile = new File("D:\\Zero\\qinghai\\depot-basic-qinghai\\src\\main\\resources\\generatorConfig.xml");
 		ConfigurationParser cp = new ConfigurationParser(warnings);
 		Configuration config = cp.parseConfiguration(configFile);
 		DefaultShellCallback callback = new DefaultShellCallback(overwrite);

src/main/resources/bootstrap.yml

@@ -8,4 +8,4 @@ spring:
   profiles:
     active: dev
 mybatis:
-  config-location: classpath:mybatis/mybatis-config.xml
+  config-location: classpath:mybatis/mybatis-config.xml

src/main/resources/generatorConfig.xml

@@ -6,17 +6,17 @@
 <generatorConfiguration>
 	<context id="testTables" targetRuntime="MyBatis3">
 		<!-- 生成注释时，必须加type="MyCommentGenerator" -->
-		<!-- <commentGenerator type="com.chinaitop.depot.storage.utils.MyCommentGenerator">
-			是否去除自动生成的注释 true：是 ： false:否
+		<commentGenerator type="com.chinaitop.depot.utils.MyCommentGenerator">
+			<!-- 是否去除自动生成的注释 true：是 ： false:否 -->
 			<property name="suppressAllComments" value="false" />
-		</commentGenerator> -->
+		</commentGenerator>
 		
 		<!--数据库连接的信息：驱动类、连接地址、用户名、密码 -->
 		<jdbcConnection 
-			driverClass="com.gbasedbt.jdbc.IfxDriver"
-			connectionURL="jdbc:gbasedbt-sqli://111.164.113.172:666/depot:INFORMIXSERVER=gbaseserver;NEWCODESET=GBK,8859-1,819;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;"
-			userId="gbasedbt"
-			password="GBase123">
+			driverClass="com.mysql.jdbc.Driver"
+			connectionURL="jdbc:mysql://172.16.0.36:3306/province_all;useSSL=false"
+			userId="root"
+			password="123456">
 		</jdbcConnection>
 		
 		<!-- 默认false，把JDBC DECIMAL 和 NUMERIC 类型解析为 Integer，为 true时把JDBC DECIMAL 和 
@@ -26,7 +26,7 @@
 		</javaTypeResolver>
 
 		<!-- targetProject:生成PO类的位置 -->
-		<javaModelGenerator targetPackage="com.chinaitop.depot.storages.model"
+		<javaModelGenerator targetPackage="com.chinaitop.depot.agent.bgz.model"
 			targetProject=".\src\main\java">
 			<!-- enableSubPackages:是否让schema作为包的后缀 -->
 			<property name="enableSubPackages" value="false" />
@@ -35,7 +35,7 @@
 		</javaModelGenerator>
 		
         <!-- targetProject:mapper映射文件生成的位置 -->
-		<sqlMapGenerator targetPackage="com.chinaitop.depot.storages.mapper"
+		<sqlMapGenerator targetPackage="com.chinaitop.depot.agent.bgz.mapper" 
 			targetProject=".\src\main\java">
 			<!-- enableSubPackages:是否让schema作为包的后缀 -->
 			<property name="enableSubPackages" value="false" />
@@ -43,15 +43,14 @@
 		
 		<!-- targetPackage：mapper接口生成的位置 -->
 		<javaClientGenerator type="XMLMAPPER"
-			targetPackage="com.chinaitop.depot.storages.mapper"
+			targetPackage="com.chinaitop.depot.agent.bgz.mapper" 
 			targetProject=".\src\main\java">
 			<!-- enableSubPackages:是否让schema作为包的后缀 -->
 			<property name="enableSubPackages" value="false" />
 		</javaClientGenerator>
 		
 		<!-- 指定要反向生成的数据库表 -->
-<!-- 		<table schema="" tableName="storage_qualitystandard_main"></table> -->
-		<table schema="" tableName="t_ventilation_operation"></table>
+		<table schema="" tableName="business_agent_bgmxz"></table>
 
 	</context>
 </generatorConfiguration>