代储点下汽车出入库记录油罐业务添加

src/main/java/com/chinaitop/depot/agent/basic/controller/AgentController.java

@@ -74,7 +74,9 @@ public class AgentController {
             criteria.andAgentNameLike("%"+agentName+"%");
         }
         example.setOrderByClause("updatetime desc");
-        PageHelper.startPage(pageNum, pageSize);
+        if (null != pageNum && null != pageSize) {
+        	PageHelper.startPage(pageNum, pageSize);
+        }
         List<BusinessAgent> list = agentService.getAgentList(example);
         PageInfo<BusinessAgent> pageInfo = new PageInfo<BusinessAgent>(list);
         return pageInfo;

src/main/java/com/chinaitop/depot/agent/bgz/mapper/BusinessAgentBgmxzMapper.xml

@@ -645,7 +645,7 @@
   <!-- 查询代储库仓房货位和油罐信息 -->
   <select id="selectAgentHouseWareList" parameterType="java.util.Map" resultType="java.util.Map">
     SELECT 
-    	a.depot_id+"" unitid,
+    	a.depot_id unitid,
     	c.warehouse_id hwh,
     	c.bgmxz_tbsj modifydate
     FROM business_agent_depot a

src/main/java/com/chinaitop/depot/agent/crk/controller/AgentHcController.java

@@ -69,8 +69,9 @@ public class AgentHcController {
             @ApiImplicitParam(name = "lspz", value = "粮食品种", paramType = "query"),
             @ApiImplicitParam(name = "orgid", value = "组织id", paramType = "query")
     })
-    public PageInfo<Map<String, Object>> getAgentHcList(Integer pageNum, Integer pageSize, Integer agentId, Integer agentDepotId,
-                                                                Integer storehouseId, Integer warehouseId, String businessType, Integer lspz, String orgid){
+    public PageInfo<Map<String, Object>> getAgentHcList(Integer pageNum, Integer pageSize, 
+    		Integer agentId, Integer agentDepotId, String storehouseId, 
+    		String warehouseId, String businessType, Integer lspz, String orgid){
         Map<String,Object> map = new HashMap<>();
         map.put("orgId",orgid);
         if(ParameterUtil.isnotnull(agentId)){
@@ -254,7 +255,7 @@ public class AgentHcController {
 					BusinessAgentDepot agentDepot = bgmxzService.selectAgentDepotObj(orgId, unitId);
 					Integer agentDepotId = agentDepot.getId();
 					Integer agentId = Integer.parseInt(agentDepot.getAgentId());
-					Integer wareId = Integer.parseInt(job.get("wareId")+"");
+					String wareId = job.get("wareId")+"";
 
 					agentHc = new BusinessAgentHc();
 					agentHc.setOrgId(orgId);

src/main/java/com/chinaitop/depot/agent/crk/controller/AgentQcController.java

@@ -70,7 +70,7 @@ public class AgentQcController {
             @ApiImplicitParam(name = "orgid", value = "组织id", paramType = "query")
     })
     public PageInfo<Map<String, Object>> getAgentQcList(Integer pageNum, Integer pageSize, Integer agentId, Integer agentDepotId,
-                                                                Integer storehouseId, Integer warehouseId, String businessType, Integer lspz, String orgid){
+                                                                String storehouseId, String warehouseId, String businessType, Integer lspz, String orgid){
         Map<String,Object> map = new HashMap<>();
         map.put("orgId",orgid);
         if(ParameterUtil.isnotnull(agentId)){
@@ -121,6 +121,7 @@ public class AgentQcController {
         if (ParameterUtil.isnull(agent.getId())) {
             agent.setOrgId(orgId);
             agent.setCreateTime(ParameterUtil.string2date(ParameterUtil.getSysDateTime()));//创建时间
+            agent.setSjly(0);
             agentQcService.add(agent);
         } else {
             agentQcService.update(agent);
@@ -254,7 +255,10 @@ public class AgentQcController {
 					BusinessAgentDepot agentDepot = bgmxzService.selectAgentDepotObj(orgId, unitId);
 					Integer agentDepotId = agentDepot.getId();
 					Integer agentId = Integer.parseInt(agentDepot.getAgentId());
-					Integer wareId = Integer.parseInt(job.get("wareId")+"");
+					String wareId = job.get("wareId")+"";
+					if ("YG".equals(job.get("wareId").toString().substring(0, 2))) {
+						wareId = "";
+					}
 
 					agentQc = new BusinessAgentQc();
 					agentQc.setOrgId(orgId);
@@ -284,7 +288,7 @@ public class AgentQcController {
 
 				}
 
-				//修改代储点货位表的汽车出入库最后同步时间
+				//修改代储点货位表和油罐中间表的汽车出入库最后同步时间
 				agentQcService.updateAgentDepot(orgId);
 			}
 			map.put("status", "200");

src/main/java/com/chinaitop/depot/agent/crk/mapper/BusinessAgentHcMapper.xml

@@ -12,7 +12,7 @@
     <result column="lspz" property="lspz" jdbcType="INTEGER" />
     <result column="grain_number" property="grainNumber" jdbcType="VARCHAR" />
     <result column="storehouse_id" property="storehouseId" jdbcType="VARCHAR" />
-    <result column="warehouse_id" property="warehouseId" jdbcType="INTEGER" />
+    <result column="warehouse_id" property="warehouseId" jdbcType="VARCHAR" />
     <result column="crk_time" property="crkTime" jdbcType="TIMESTAMP" />
     <result column="org_id" property="orgId" jdbcType="INTEGER" />
     <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
@@ -121,7 +121,7 @@
     values (#{id,jdbcType=INTEGER}, #{agentId,jdbcType=INTEGER}, #{agentDepotId,jdbcType=INTEGER}, 
       #{notice,jdbcType=VARCHAR}, #{inbound,jdbcType=VARCHAR}, #{trainNo,jdbcType=VARCHAR}, 
       #{businessType,jdbcType=VARCHAR}, #{lspz,jdbcType=INTEGER}, #{grainNumber,jdbcType=VARCHAR}, 
-      #{storehouseId,jdbcType=VARCHAR}, #{warehouseId,jdbcType=INTEGER}, #{crkTime,jdbcType=TIMESTAMP}, 
+      #{storehouseId,jdbcType=VARCHAR}, #{warehouseId,jdbcType=VARCHAR}, #{crkTime,jdbcType=TIMESTAMP}, 
       #{orgId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{sjly,jdbcType=INTEGER}, 
       #{updatetime,jdbcType=TIMESTAMP})
   </insert>
@@ -209,7 +209,7 @@
         #{storehouseId,jdbcType=VARCHAR},
       </if>
       <if test="warehouseId != null" >
-        #{warehouseId,jdbcType=INTEGER},
+        #{warehouseId,jdbcType=VARCHAR},
       </if>
       <if test="crkTime != null" >
         #{crkTime,jdbcType=TIMESTAMP},
@@ -268,7 +268,7 @@
         storehouse_id = #{record.storehouseId,jdbcType=VARCHAR},
       </if>
       <if test="record.warehouseId != null" >
-        warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
+        warehouse_id = #{record.warehouseId,jdbcType=VARCHAR},
       </if>
       <if test="record.crkTime != null" >
         crk_time = #{record.crkTime,jdbcType=TIMESTAMP},
@@ -302,7 +302,7 @@
       lspz = #{record.lspz,jdbcType=INTEGER},
       grain_number = #{record.grainNumber,jdbcType=VARCHAR},
       storehouse_id = #{record.storehouseId,jdbcType=VARCHAR},
-      warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
+      warehouse_id = #{record.warehouseId,jdbcType=VARCHAR},
       crk_time = #{record.crkTime,jdbcType=TIMESTAMP},
       org_id = #{record.orgId,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
@@ -343,7 +343,7 @@
         storehouse_id = #{storehouseId,jdbcType=VARCHAR},
       </if>
       <if test="warehouseId != null" >
-        warehouse_id = #{warehouseId,jdbcType=INTEGER},
+        warehouse_id = #{warehouseId,jdbcType=VARCHAR},
       </if>
       <if test="crkTime != null" >
         crk_time = #{crkTime,jdbcType=TIMESTAMP},
@@ -374,7 +374,7 @@
       lspz = #{lspz,jdbcType=INTEGER},
       grain_number = #{grainNumber,jdbcType=VARCHAR},
       storehouse_id = #{storehouseId,jdbcType=VARCHAR},
-      warehouse_id = #{warehouseId,jdbcType=INTEGER},
+      warehouse_id = #{warehouseId,jdbcType=VARCHAR},
       crk_time = #{crkTime,jdbcType=TIMESTAMP},
       org_id = #{orgId,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -407,10 +407,10 @@
       AND hc.agent_depot_id = #{agentDepotId,jdbcType=INTEGER}
     </if>
     <if test="storehouseId != null">
-      AND hc.storehouse_id = #{storehouseId,jdbcType=INTEGER}
+      AND hc.storehouse_id = #{storehouseId,jdbcType=VARCHAR}
     </if>
     <if test="warehouseId != null">
-      AND hc.warehouse_id = #{warehouseId,jdbcType=INTEGER}
+      AND hc.warehouse_id = #{warehouseId,jdbcType=VARCHAR}
     </if>
     <if test="businessType != null">
       AND hc.business_type = #{businessType,jdbcType=INTEGER}
@@ -441,10 +441,10 @@
       AND hc.agent_depot_id = #{agentDepotId,jdbcType=INTEGER}
     </if>
     <if test="storehouseId != null">
-      AND hc.storehouse_id = #{storehouseId,jdbcType=INTEGER}
+      AND hc.storehouse_id = #{storehouseId,jdbcType=VARCHAR}
     </if>
     <if test="warehouseId != null">
-      AND hc.warehouse_id = #{warehouseId,jdbcType=INTEGER}
+      AND hc.warehouse_id = #{warehouseId,jdbcType=VARCHAR}
     </if>
     <if test="businessType != null">
       AND hc.business_type = #{businessType,jdbcType=INTEGER}
@@ -459,16 +459,26 @@
 
   <!-- 查询代储库仓房货位信息 -->
   <select id="selectAgentHouseWareList" parameterType="java.util.Map" resultType="java.util.Map">
-    SELECT
-    a.depot_id+"" unitid,
-    c.warehouse_id hwh,
-    c.hccrk_tbsj modifydate
+    SELECT 
+    	a.depot_id unitid,
+    	c.warehouse_id hwh,
+    	c.bgmxz_tbsj modifydate
     FROM business_agent_depot a
-    LEFT JOIN business_agent_storehouse b ON b.agent_depot_id=a.id
-    LEFT JOIN business_agent_warehouse c ON c.agent_storehouse_id=b.id
-    WHERE a.depot_id != 0 AND b.storehouse_id IS NOT NULL AND c.warehouse_id IS NOT NULL
-    <if test="orgId != null">
-      and c.org_id=#{orgId,jdbcType=INTEGER}
-    </if>
+	LEFT JOIN business_agent_storehouse b ON b.agent_depot_id=a.id
+	LEFT JOIN business_agent_warehouse c ON c.agent_storehouse_id=b.id AND c.del_flag=1 
+	WHERE a.depot_id != 0 AND b.storehouse_id IS NOT NULL AND c.warehouse_id IS NOT NULL 
+	<if test="orgId != null">
+	and c.org_id=#{orgId,jdbcType=INTEGER}
+	</if>
+	UNION 
+	SELECT
+	a.depot_id unitid,
+	b.tank_id hwh,
+	b.bgmxz_tbsj modifydate
+	FROM business_agent_depot a
+	INNER JOIN business_agent_tank_exist b ON b.agent_depot_id = a.id
+	<if test="orgId != null">
+	AND b.org_id = #{orgId,jdbcType=INTEGER}
+	</if>
   </select>
 </mapper>

src/main/java/com/chinaitop/depot/agent/crk/mapper/BusinessAgentQcMapper.xml

@@ -12,7 +12,7 @@
     <result column="lspz" property="lspz" jdbcType="INTEGER" />
     <result column="grain_number" property="grainNumber" jdbcType="VARCHAR" />
     <result column="storehouse_id" property="storehouseId" jdbcType="VARCHAR" />
-    <result column="warehouse_id" property="warehouseId" jdbcType="INTEGER" />
+    <result column="warehouse_id" property="warehouseId" jdbcType="VARCHAR" />
     <result column="crk_time" property="crkTime" jdbcType="TIMESTAMP" />
     <result column="org_id" property="orgId" jdbcType="INTEGER" />
     <result column="sjly" property="sjly" jdbcType="INTEGER" />
@@ -122,7 +122,7 @@
     values (#{id,jdbcType=INTEGER}, #{agentId,jdbcType=INTEGER}, #{agentDepotId,jdbcType=INTEGER}, 
       #{notice,jdbcType=VARCHAR}, #{businessNumber,jdbcType=VARCHAR}, #{carBrand,jdbcType=VARCHAR}, 
       #{businessType,jdbcType=VARCHAR}, #{lspz,jdbcType=INTEGER}, #{grainNumber,jdbcType=VARCHAR}, 
-      #{storehouseId,jdbcType=VARCHAR}, #{warehouseId,jdbcType=INTEGER}, #{crkTime,jdbcType=TIMESTAMP}, 
+      #{storehouseId,jdbcType=VARCHAR}, #{warehouseId,jdbcType=VARCHAR}, #{crkTime,jdbcType=TIMESTAMP}, 
       #{orgId,jdbcType=INTEGER}, #{sjly,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updatetime,jdbcType=TIMESTAMP})
   </insert>
@@ -210,7 +210,7 @@
         #{storehouseId,jdbcType=VARCHAR},
       </if>
       <if test="warehouseId != null" >
-        #{warehouseId,jdbcType=INTEGER},
+        #{warehouseId,jdbcType=VARCHAR},
       </if>
       <if test="crkTime != null" >
         #{crkTime,jdbcType=TIMESTAMP},
@@ -269,7 +269,7 @@
         storehouse_id = #{record.storehouseId,jdbcType=VARCHAR},
       </if>
       <if test="record.warehouseId != null" >
-        warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
+        warehouse_id = #{record.warehouseId,jdbcType=VARCHAR},
       </if>
       <if test="record.crkTime != null" >
         crk_time = #{record.crkTime,jdbcType=TIMESTAMP},
@@ -303,7 +303,7 @@
       lspz = #{record.lspz,jdbcType=INTEGER},
       grain_number = #{record.grainNumber,jdbcType=VARCHAR},
       storehouse_id = #{record.storehouseId,jdbcType=VARCHAR},
-      warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
+      warehouse_id = #{record.warehouseId,jdbcType=VARCHAR},
       crk_time = #{record.crkTime,jdbcType=TIMESTAMP},
       org_id = #{record.orgId,jdbcType=INTEGER},
       sjly = #{record.sjly,jdbcType=INTEGER},
@@ -344,7 +344,7 @@
         storehouse_id = #{storehouseId,jdbcType=VARCHAR},
       </if>
       <if test="warehouseId != null" >
-        warehouse_id = #{warehouseId,jdbcType=INTEGER},
+        warehouse_id = #{warehouseId,jdbcType=VARCHAR},
       </if>
       <if test="crkTime != null" >
         crk_time = #{crkTime,jdbcType=TIMESTAMP},
@@ -375,7 +375,7 @@
       lspz = #{lspz,jdbcType=INTEGER},
       grain_number = #{grainNumber,jdbcType=VARCHAR},
       storehouse_id = #{storehouseId,jdbcType=VARCHAR},
-      warehouse_id = #{warehouseId,jdbcType=INTEGER},
+      warehouse_id = #{warehouseId,jdbcType=VARCHAR},
       crk_time = #{crkTime,jdbcType=TIMESTAMP},
       org_id = #{orgId,jdbcType=INTEGER},
       sjly = #{sjly,jdbcType=INTEGER},
@@ -408,10 +408,10 @@
       AND qc.agent_depot_id = #{agentDepotId,jdbcType=INTEGER}
     </if>
     <if test="storehouseId != null">
-      AND qc.storehouse_id = #{storehouseId,jdbcType=INTEGER}
+      AND qc.storehouse_id = #{storehouseId,jdbcType=VARCHAR}
     </if>
     <if test="warehouseId != null">
-      AND qc.warehouse_id = #{warehouseId,jdbcType=INTEGER}
+      AND qc.warehouse_id = #{warehouseId,jdbcType=VARCHAR}
     </if>
     <if test="businessType != null">
       AND qc.business_type = #{businessType,jdbcType=INTEGER}
@@ -442,10 +442,10 @@
       AND qc.agent_depot_id = #{agentDepotId,jdbcType=INTEGER}
     </if>
     <if test="storehouseId != null">
-      AND qc.storehouse_id = #{storehouseId,jdbcType=INTEGER}
+      AND qc.storehouse_id = #{storehouseId,jdbcType=VARCHAR}
     </if>
     <if test="warehouseId != null">
-      AND qc.warehouse_id = #{warehouseId,jdbcType=INTEGER}
+      AND qc.warehouse_id = #{warehouseId,jdbcType=VARCHAR}
     </if>
     <if test="businessType != null">
       AND qc.business_type = #{businessType,jdbcType=INTEGER}
@@ -454,22 +454,98 @@
       AND qc.lspz = #{lspz,jdbcType=INTEGER}
     </if>
     GROUP BY qc.business_number
+    UNION
+	SELECT
+    qc.id,qc.agent_id agentId,qc.agent_depot_id agentDepotId,qc.notice,qc.business_number businessNumber,qc.car_brand carBrand,
+    qc.business_type businessType,qc.lspz,qc.grain_number grainNumber,qc.storehouse_id storehouseId,
+    qc.warehouse_id warehouseId,qc.crk_time crkTime,qc.org_id orgId,qc.create_time createTime,qc.sjly sjly,
+    '' warehouseName,tank.tank_name storehouseName,agent.agent_name agentName,
+    depot.agent_depot_name agentDepotName,qc.updatetime
+    FROM business_agent_qc qc
+    LEFT JOIN business_agent agent ON agent.id = qc.agent_id
+    LEFT JOIN business_agent_depot depot ON depot.id = qc.agent_depot_id
+	LEFT JOIN business_agent_tank tank ON tank.id=qc.storehouse_id
+	WHERE 1=1 AND qc.sjly=0 AND SUBSTR(qc.storehouse_id,1,2)='YG'
+	<if test="orgId != null">
+      AND qc.org_id = #{orgId,jdbcType=INTEGER}
+    </if>
+	<if test="agentId != null">
+      AND qc.agent_id = #{agentId,jdbcType=INTEGER}
+    </if>
+    <if test="agentDepotId != null">
+      AND qc.agent_depot_id = #{agentDepotId,jdbcType=INTEGER}
+    </if>
+    <if test="storehouseId != null">
+      AND qc.storehouse_id = #{storehouseId,jdbcType=VARCHAR}
+    </if>
+    <if test="warehouseId != null">
+      AND qc.warehouse_id = #{warehouseId,jdbcType=VARCHAR}
+    </if>
+    <if test="businessType != null">
+      AND qc.business_type = #{businessType,jdbcType=INTEGER}
+    </if>
+    <if test="lspz != null">
+      AND qc.lspz = #{lspz,jdbcType=INTEGER}
+    </if>
+	UNION
+	SELECT
+    qc.id,qc.agent_id agentId,qc.agent_depot_id agentDepotId,qc.notice,qc.business_number businessNumber,qc.car_brand carBrand,
+    qc.business_type businessType,qc.lspz,qc.grain_number grainNumber,qc.storehouse_id storehouseId,
+    qc.warehouse_id warehouseId,qc.crk_time crkTime,qc.org_id orgId,qc.create_time createTime,qc.sjly sjly,
+    '' warehouseName,tank.storageTank_name storehouseName,agent.agent_name agentName,
+    depot.agent_depot_name agentDepotName,qc.updatetime
+    FROM business_agent_qc qc
+    LEFT JOIN business_agent agent ON agent.id = qc.agent_id
+    LEFT JOIN business_agent_depot depot ON depot.id = qc.agent_depot_id
+	LEFT JOIN basic_tank tank ON tank.id=qc.storehouse_id
+	WHERE 1=1 AND qc.sjly=1 AND SUBSTR(qc.storehouse_id,1,2)='YG'
+	<if test="orgId != null">
+      AND qc.org_id = #{orgId,jdbcType=INTEGER}
+    </if>
+	<if test="agentId != null">
+      AND qc.agent_id = #{agentId,jdbcType=INTEGER}
+    </if>
+    <if test="agentDepotId != null">
+      AND qc.agent_depot_id = #{agentDepotId,jdbcType=INTEGER}
+    </if>
+    <if test="storehouseId != null">
+      AND qc.storehouse_id = #{storehouseId,jdbcType=VARCHAR}
+    </if>
+    <if test="warehouseId != null">
+      AND qc.warehouse_id = #{warehouseId,jdbcType=VARCHAR}
+    </if>
+    <if test="businessType != null">
+      AND qc.business_type = #{businessType,jdbcType=INTEGER}
+    </if>
+    <if test="lspz != null">
+      AND qc.lspz = #{lspz,jdbcType=INTEGER}
+    </if>
     ) a
     ORDER BY a.updatetime DESC
   </select>
 
   <!-- 查询代储库仓房货位信息 -->
   <select id="selectAgentHouseWareList" parameterType="java.util.Map" resultType="java.util.Map">
-    SELECT
-    a.depot_id+"" unitid,
-    c.warehouse_id hwh,
-    c.qccrk_tbsj modifydate
+    SELECT 
+    	a.depot_id+"" unitid,
+    	c.warehouse_id hwh,
+    	c.qccrk_tbsj modifydate
     FROM business_agent_depot a
-    LEFT JOIN business_agent_storehouse b ON b.agent_depot_id=a.id
-    LEFT JOIN business_agent_warehouse c ON c.agent_storehouse_id=b.id
-    WHERE a.depot_id != 0 AND b.storehouse_id IS NOT NULL AND c.warehouse_id IS NOT NULL
-    <if test="orgId != null">
-      and c.org_id=#{orgId,jdbcType=INTEGER}
-    </if>
+	LEFT JOIN business_agent_storehouse b ON b.agent_depot_id=a.id
+	LEFT JOIN business_agent_warehouse c ON c.agent_storehouse_id=b.id AND c.del_flag=1 
+	WHERE a.depot_id != 0 AND b.storehouse_id IS NOT NULL AND c.warehouse_id IS NOT NULL 
+	<if test="orgId != null">
+	and c.org_id=#{orgId,jdbcType=INTEGER}
+	</if>
+	UNION 
+	SELECT
+	a.depot_id unitid,
+	b.tank_id hwh,
+	b.qccrk_tbsj modifydate
+	FROM business_agent_depot a
+	INNER JOIN business_agent_tank_exist b ON b.agent_depot_id = a.id
+	<if test="orgId != null">
+	AND b.org_id = #{orgId,jdbcType=INTEGER}
+	</if>
   </select>
 </mapper>

src/main/java/com/chinaitop/depot/agent/crk/model/BusinessAgentHc.java

@@ -23,7 +23,7 @@ public class BusinessAgentHc {
 
     private String storehouseId;
 
-    private Integer warehouseId;
+    private String warehouseId;
 
     private Date crkTime;
 
@@ -199,7 +199,7 @@ public class BusinessAgentHc {
      * 货位id
      * @return warehouse_id 货位id
      */
-    public Integer getWarehouseId() {
+    public String getWarehouseId() {
         return warehouseId;
     }
 
@@ -207,8 +207,8 @@ public class BusinessAgentHc {
      * 货位id
      * @param warehouseId 货位id
      */
-    public void setWarehouseId(Integer warehouseId) {
-        this.warehouseId = warehouseId;
+    public void setWarehouseId(String warehouseId) {
+        this.warehouseId = warehouseId == null ? null : warehouseId.trim();
     }
 
     /**

src/main/java/com/chinaitop/depot/agent/crk/model/BusinessAgentHcExample.java

@@ -787,52 +787,52 @@ public class BusinessAgentHcExample {
             return (Criteria) this;
         }
 
-        public Criteria andWarehouseIdEqualTo(Integer value) {
+        public Criteria andWarehouseIdEqualTo(String value) {
             addCriterion("warehouse_id =", value, "warehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andWarehouseIdNotEqualTo(Integer value) {
+        public Criteria andWarehouseIdNotEqualTo(String value) {
             addCriterion("warehouse_id <>", value, "warehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andWarehouseIdGreaterThan(Integer value) {
+        public Criteria andWarehouseIdGreaterThan(String value) {
             addCriterion("warehouse_id >", value, "warehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andWarehouseIdGreaterThanOrEqualTo(Integer value) {
+        public Criteria andWarehouseIdGreaterThanOrEqualTo(String value) {
             addCriterion("warehouse_id >=", value, "warehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andWarehouseIdLessThan(Integer value) {
+        public Criteria andWarehouseIdLessThan(String value) {
             addCriterion("warehouse_id <", value, "warehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andWarehouseIdLessThanOrEqualTo(Integer value) {
+        public Criteria andWarehouseIdLessThanOrEqualTo(String value) {
             addCriterion("warehouse_id <=", value, "warehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andWarehouseIdIn(List<Integer> values) {
+        public Criteria andWarehouseIdIn(List<String> values) {
             addCriterion("warehouse_id in", values, "warehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andWarehouseIdNotIn(List<Integer> values) {
+        public Criteria andWarehouseIdNotIn(List<String> values) {
             addCriterion("warehouse_id not in", values, "warehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andWarehouseIdBetween(Integer value1, Integer value2) {
+        public Criteria andWarehouseIdBetween(String value1, String value2) {
             addCriterion("warehouse_id between", value1, value2, "warehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andWarehouseIdNotBetween(Integer value1, Integer value2) {
+        public Criteria andWarehouseIdNotBetween(String value1, String value2) {
             addCriterion("warehouse_id not between", value1, value2, "warehouseId");
             return (Criteria) this;
         }

src/main/java/com/chinaitop/depot/agent/crk/model/BusinessAgentQc.java

@@ -23,7 +23,7 @@ public class BusinessAgentQc {
 
     private String storehouseId;
 
-    private Integer warehouseId;
+    private String warehouseId;
 
     private Date crkTime;
 
@@ -199,7 +199,7 @@ public class BusinessAgentQc {
      * 货位id
      * @return warehouse_id 货位id
      */
-    public Integer getWarehouseId() {
+    public String getWarehouseId() {
         return warehouseId;
     }
 
@@ -207,8 +207,8 @@ public class BusinessAgentQc {
      * 货位id
      * @param warehouseId 货位id
      */
-    public void setWarehouseId(Integer warehouseId) {
-        this.warehouseId = warehouseId;
+    public void setWarehouseId(String warehouseId) {
+        this.warehouseId = warehouseId == null ? null : warehouseId.trim();
     }
 
     /**

src/main/java/com/chinaitop/depot/agent/crk/model/BusinessAgentQcExample.java

@@ -787,52 +787,52 @@ public class BusinessAgentQcExample {
             return (Criteria) this;
         }
 
-        public Criteria andWarehouseIdEqualTo(Integer value) {
+        public Criteria andWarehouseIdEqualTo(String value) {
             addCriterion("warehouse_id =", value, "warehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andWarehouseIdNotEqualTo(Integer value) {
+        public Criteria andWarehouseIdNotEqualTo(String value) {
             addCriterion("warehouse_id <>", value, "warehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andWarehouseIdGreaterThan(Integer value) {
+        public Criteria andWarehouseIdGreaterThan(String value) {
             addCriterion("warehouse_id >", value, "warehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andWarehouseIdGreaterThanOrEqualTo(Integer value) {
+        public Criteria andWarehouseIdGreaterThanOrEqualTo(String value) {
             addCriterion("warehouse_id >=", value, "warehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andWarehouseIdLessThan(Integer value) {
+        public Criteria andWarehouseIdLessThan(String value) {
             addCriterion("warehouse_id <", value, "warehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andWarehouseIdLessThanOrEqualTo(Integer value) {
+        public Criteria andWarehouseIdLessThanOrEqualTo(String value) {
             addCriterion("warehouse_id <=", value, "warehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andWarehouseIdIn(List<Integer> values) {
+        public Criteria andWarehouseIdIn(List<String> values) {
             addCriterion("warehouse_id in", values, "warehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andWarehouseIdNotIn(List<Integer> values) {
+        public Criteria andWarehouseIdNotIn(List<String> values) {
             addCriterion("warehouse_id not in", values, "warehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andWarehouseIdBetween(Integer value1, Integer value2) {
+        public Criteria andWarehouseIdBetween(String value1, String value2) {
             addCriterion("warehouse_id between", value1, value2, "warehouseId");
             return (Criteria) this;
         }
 
-        public Criteria andWarehouseIdNotBetween(Integer value1, Integer value2) {
+        public Criteria andWarehouseIdNotBetween(String value1, String value2) {
             addCriterion("warehouse_id not between", value1, value2, "warehouseId");
             return (Criteria) this;
         }

src/main/java/com/chinaitop/depot/agent/crk/service/impl/AgentHcServiceImpl.java

@@ -173,7 +173,7 @@ public class AgentHcServiceImpl implements agentHcService {
                             msg = "第 "+(i+3)+" 行第 8 列的值的不正确，请查询后再添加！";
                             return msg;
                         }
-                        agent.setWarehouseId(Integer.parseInt(warehouseId.get("warehouseId").toString()));
+                        agent.setWarehouseId(warehouseId.get("warehouseId").toString());
                         break;
                     case 8:
                         //出入库日期

src/main/java/com/chinaitop/depot/agent/crk/service/impl/AgentQcServiceImpl.java

@@ -10,7 +10,10 @@ import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 import com.chinaitop.depot.agent.basic.mapper.BusinessAgentMapper;
+import com.chinaitop.depot.agent.basic.mapper.BusinessAgentTankExistMapper;
 import com.chinaitop.depot.agent.basic.mapper.BusinessAgentWarehouseMapper;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentTankExist;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentTankExistExample;
 import com.chinaitop.depot.agent.basic.model.BusinessAgentWarehouse;
 import com.chinaitop.depot.agent.basic.model.BusinessAgentWarehouseExample;
 import com.chinaitop.depot.agent.crk.mapper.BusinessAgentQcMapper;
@@ -30,6 +33,9 @@ public class AgentQcServiceImpl implements agentQcService {
     @Resource
 	private BusinessAgentWarehouseMapper agentWareHouseMapper;
 
+    @Resource
+    private BusinessAgentTankExistMapper agentTankExistMapper;
+
     /**
      * 查询仓储处作业记录
      * * @param map
@@ -173,7 +179,7 @@ public class AgentQcServiceImpl implements agentQcService {
                             msg = "第 "+(i+3)+" 行第 8 列的值的不正确，请查询后再添加！";
                             return msg;
                         }
-                        agent.setWarehouseId(Integer.parseInt(warehouseId.get("warehouseId").toString()));
+                        agent.setWarehouseId(warehouseId.get("warehouseId").toString());
                         break;
                     case 8:
                         //出入库日期
@@ -206,6 +212,17 @@ public class AgentQcServiceImpl implements agentQcService {
 		criteria.andOrgIdEqualTo(orgId);
 		criteria.andDelFlagEqualTo(1);
 		agentWareHouseMapper.updateByExampleSelective(record, example);
+
+		//要修改的值
+		BusinessAgentTankExist tank_exist = new BusinessAgentTankExist();
+		tank_exist.setQccrkTbsj(new Date());
+		//修改条件
+		BusinessAgentTankExistExample tank_exist_example = new BusinessAgentTankExistExample();
+		BusinessAgentTankExistExample.Criteria tank_exist_criteria = tank_exist_example.createCriteria();
+		tank_exist_criteria.andOrgIdEqualTo(orgId);
+		tank_exist_criteria.andDelFlagEqualTo(1);
+		//修改，代储点下油罐中间表
+		agentTankExistMapper.updateByExampleSelective(tank_exist, tank_exist_example);
 	}
 
 	@Override