.

src/main/java/com/chinaitop/depot/basic/controller/BasicStorehouseController.java

@@ -1,11 +1,9 @@
 package com.chinaitop.depot.basic.controller;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -33,7 +31,6 @@ import com.chinaitop.depot.basic.service.BasicStorehouseService;
 import com.chinaitop.depot.basic.service.BasicWarehouseService;
 import com.chinaitop.depot.common.service.ImportServiceImpl;
 import com.chinaitop.utils.ParameterUtil;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 
@@ -196,55 +193,17 @@ public class BasicStorehouseController {
 		return map;
 	}
 
-	/**
-	 * 更新仓房信息
-	 *
-	 * @param storehouseJson JSON数据对象
-	 * @return
-	 */
 	@RequestMapping(value = "/edit", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
 	@ApiOperation(value="更新仓房信息", notes = "更新仓房信息")
 	@ApiImplicitParams({
 			@ApiImplicitParam(name = "storehouseJson", value = "JSON数据对象", paramType = "form"),
+			@ApiImplicitParam(name = "warehouseJson", value = "货位数据", paramType = "form"),
 			@ApiImplicitParam(name = "userInfo", value = "JSON登录对象", paramType = "form")
 	})
-	public Map<String, Object> edit(String storehouseJson, String userInfo) {
-		Map<String, Object> modelMap = new HashMap<String, Object>();
-		JSONObject user = null;
-		Integer orgId = null;
-		String userName = "";
-		if (null != userInfo && !"".equals(userInfo)) {
-			user = JSONObject.parseObject(userInfo);
-			orgId = Integer.parseInt(user.get("orgId") == null?"":user.get("orgId").toString());
-			userName = user.get("username") == null?"":user.get("username").toString();
-		}
-		Date date = new Date();
+	public Map<String, Object> edit(String storehouseJson, String warehouseJson, String userInfo) {
+		Map<String, Object> modelMap = null;
 		try {
-			// JSON字符串转对象
-			ObjectMapper mapper = new ObjectMapper();
-			BasicStorehouse basicStorehouse = (BasicStorehouse) mapper.readValue(storehouseJson, BasicStorehouse.class);
-			basicStorehouse.setDelFlag(1);
-			if (basicStorehouse.getStorehouseId() == null) {
-				String uuid = UUID.randomUUID().toString();
-				//String uuid = UUID.randomUUID().toString().replaceAll("-", "");
-				basicStorehouse.setUuid(uuid);
-
-				if(!ParameterUtil.isequal(basicStorehouse.getLibraryType(),"1")){
-					basicStorehouse.setDepotId(orgId);
-				}
-				basicStorehouse.setOrgId(orgId);
-				basicStorehouse.setCreatename(userName);
-				basicStorehouse.setCreatedate(date);
-				basicStorehouseService.addBasicStorehouse(basicStorehouse);
-			} else {
-				if(!ParameterUtil.isequal(basicStorehouse.getLibraryType(),"1")){
-					basicStorehouse.setDutystoreman(null);
-				}
-				basicStorehouse.setUpdatename(userName);
-				basicStorehouse.setUpdatedate(date);
-				basicStorehouseService.updateBasicStorehouse(basicStorehouse);
-			}
-			modelMap.put("status", "success");
+			modelMap = basicStorehouseService.saveOrUpdate(storehouseJson, warehouseJson, userInfo);
 		} catch (Exception e) {
 			e.printStackTrace();
 			modelMap.put("status", "error");
@@ -253,12 +212,6 @@ public class BasicStorehouseController {
 		return modelMap;
 	}
 
-	/**
-	 * 按仓房ID逻辑删除仓房信息
-	 *
-	 * @param id 数据ID
-	 * @return
-	 */
 	@RequestMapping(value = "/remove", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
 	@ApiOperation(value="按仓房ID逻辑删除仓房信息", notes = "按仓房ID逻辑删除仓房信息")
 	@ApiImplicitParams({

src/main/java/com/chinaitop/depot/basic/controller/BasicTankController.java

@@ -38,6 +38,7 @@ import io.swagger.annotations.ApiOperation;
  */
 @RestController
 @RequestMapping(value = "/Tank")
+@SuppressWarnings("all")
 @Api(value= "BasicTankController", description = "油罐管理控制类")
 public class BasicTankController {
 
@@ -87,60 +88,23 @@ public class BasicTankController {
         return pageInfo;
     }
 
-    /**
-     * 更新油罐信息
-     *
-     * @param tankJson JSON数据对象
-     * @return
-     */
-    @RequestMapping(value = "/edit", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+	@RequestMapping(value = "/edit", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
     @ApiOperation(value="更新油罐信息", notes = "更新油罐信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "tankJson", value = "JSON数据对象", paramType = "form"),
             @ApiImplicitParam(name = "orgId", value = "组织id", paramType = "form")
     })
-    public Map<String, Object> edit(String tankJson, Integer orgId) {
+    public Map<String, Object> edit(HttpServletRequest request, String tankJson, Integer orgId) {
         Map<String, Object> modelMap = new HashMap<String, Object>();
         try {
-            // JSON字符串转对象
-            ObjectMapper mapper = new ObjectMapper();
-            BasicTank basicTank = mapper.readValue(tankJson, BasicTank.class);
-            
-            // 校验编码是否重复
-            BasicTankExample example = new BasicTankExample();
-            BasicTankExample.Criteria criteria = example.createCriteria();
-            criteria.andOrgIdEqualTo(orgId);
-            criteria.andStoragetankCodeEqualTo(basicTank.getStoragetankCode());
-            List<BasicTank> list = null;
-            if (null != basicTank.getId() && !"".equals(basicTank.getId())) {//修改
-            	criteria.andIdNotEqualTo(basicTank.getId());
-            	
-            	// 查询除当前数据外还要别的油罐编码跟当前录入的编码一样，一样就是有重复的，没有就可以录入
-            	list = basicTankService.findBasicTank(example);
-            	if (null != list && list.size() > 0) {
-            		// 获取自己数据的ID
-            		modelMap.put("status", "error");
-            		modelMap.put("msg", "油罐编码已存在，不可与其它油罐编码重复！");
-            		return modelMap;
-            	}
-            } else {//新增
-            	list = basicTankService.findBasicTank(example);
-            	if (null != list && list.size() > 0) {
-            		modelMap.put("status", "error");
-            		modelMap.put("msg", "油罐编码已存在，不可与其它油罐编码重复！");
-            		return modelMap;
-            	}
-            }
-
-            basicTankService.saveOrEdit(basicTank,orgId);
-            modelMap.put("status", "success");
-            modelMap.put("msg", "保存成功！");
+            modelMap = basicTankService.updateOrSave(request, tankJson, orgId);
         } catch (Exception e) {
             e.printStackTrace();
             modelMap.put("status", "error");
             modelMap.put("msg", "保存失败！");
-        }
-        return modelMap;
+        } finally {
+        	return modelMap;
+		}
     }
 
     /**

src/main/java/com/chinaitop/depot/basic/mapper/BasicStorehouseMapper.java

@@ -40,4 +40,13 @@ public interface BasicStorehouseMapper {
 	List<BasicStorehouse> getThreeTempCheckList(Map<String, Object> map);
 
     Map<String, Object> getAgentDepotId(Map<String, Object> map);
+
+    /**
+     * 更新单位表仓房数和油罐数
+     * 
+     * @param map
+     */
+    void editOrgCfAndHwNum(Map<String, Object> map);
+
+    Map<String, Object> queryCrAndgw(Integer orgId);
 }

src/main/java/com/chinaitop/depot/basic/mapper/BasicStorehouseMapper.xml

@@ -1223,4 +1223,28 @@
     </if>
     order by house.storehouse_id asc
   </select>
+  <!-- 更新单位表的仓房数和货位数 -->
+  <update id="editOrgCfAndHwNum" parameterType="java.util.Map" >
+  	UPDATE org_info SET org_id=${orgId}
+  	<if test="cf_count != null">
+  	,house_number=${cf_count}
+  	</if>
+  	<if test="yg_count != null">
+  	,tank_number=${yg_count}
+  	</if>
+  	<if test="cr_count != null">
+  	,effective_capacity=${cr_count}
+  	</if>
+  	<if test="gr_count != null">
+  	,yxgr=${gr_count}
+  	</if>
+  	WHERE org_id=${orgId}
+  </update>
+  <!-- 查询当前仓房和油罐的有效容量之和 -->
+  <select id="queryCrAndgw" parameterType="java.lang.Integer" resultType="java.util.Map">
+  	SELECT 
+	IFNULL((SELECT SUM(a.actual_capacity) FROM basic_storehouse a WHERE a.org_id=#{orgId,jdbcType=INTEGER}),0) as cr_count,
+	IFNULL((SELECT SUM(a.tank_capacity) FROM basic_tank a WHERE a.org_id=#{orgId,jdbcType=INTEGER}),0) as gr_count
+	FROM DUAL
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/basic/mapper/BasicTankHwMapper.java

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

src/main/java/com/chinaitop/depot/basic/mapper/BasicTankHwMapper.xml

@@ -0,0 +1,320 @@
+<?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.basic.mapper.BasicTankHwMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.basic.model.BasicTankHw" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="hwbm" property="hwbm" jdbcType="VARCHAR" />
+    <result column="hwmc" property="hwmc" jdbcType="VARCHAR" />
+    <result column="ajdm" property="ajdm" jdbcType="VARCHAR" />
+    <result column="hwqyrq" property="hwqyrq" jdbcType="TIMESTAMP" />
+    <result column="hwrl" property="hwrl" jdbcType="DECIMAL" />
+    <result column="bgdw" property="bgdw" jdbcType="VARCHAR" />
+    <result column="bgy" property="bgy" jdbcType="VARCHAR" />
+    <result column="czbz" property="czbz" jdbcType="VARCHAR" />
+    <result column="zhgxsj" property="zhgxsj" jdbcType="TIMESTAMP" />
+    <result column="crk_status" property="crkStatus" 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, org_id, hwbm, hwmc, ajdm, hwqyrq, hwrl, bgdw, bgy, czbz, zhgxsj, crk_status
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.basic.model.BasicTankHwExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from basic_tank_hw
+    <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 basic_tank_hw
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from basic_tank_hw
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.basic.model.BasicTankHwExample" >
+    delete from basic_tank_hw
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.basic.model.BasicTankHw" >
+    insert into basic_tank_hw (id, org_id, hwbm, 
+      hwmc, ajdm, hwqyrq, 
+      hwrl, bgdw, bgy, czbz, 
+      zhgxsj, crk_status)
+    values (#{id,jdbcType=INTEGER}, #{orgId,jdbcType=INTEGER}, #{hwbm,jdbcType=VARCHAR}, 
+      #{hwmc,jdbcType=VARCHAR}, #{ajdm,jdbcType=VARCHAR}, #{hwqyrq,jdbcType=TIMESTAMP}, 
+      #{hwrl,jdbcType=DECIMAL}, #{bgdw,jdbcType=VARCHAR}, #{bgy,jdbcType=VARCHAR}, #{czbz,jdbcType=VARCHAR}, 
+      #{zhgxsj,jdbcType=TIMESTAMP}, #{crkStatus,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.basic.model.BasicTankHw" >
+    insert into basic_tank_hw
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+      <if test="hwbm != null" >
+        hwbm,
+      </if>
+      <if test="hwmc != null" >
+        hwmc,
+      </if>
+      <if test="ajdm != null" >
+        ajdm,
+      </if>
+      <if test="hwqyrq != null" >
+        hwqyrq,
+      </if>
+      <if test="hwrl != null" >
+        hwrl,
+      </if>
+      <if test="bgdw != null" >
+        bgdw,
+      </if>
+      <if test="bgy != null" >
+        bgy,
+      </if>
+      <if test="czbz != null" >
+        czbz,
+      </if>
+      <if test="zhgxsj != null" >
+        zhgxsj,
+      </if>
+      <if test="crkStatus != null" >
+        crk_status,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="hwbm != null" >
+        #{hwbm,jdbcType=VARCHAR},
+      </if>
+      <if test="hwmc != null" >
+        #{hwmc,jdbcType=VARCHAR},
+      </if>
+      <if test="ajdm != null" >
+        #{ajdm,jdbcType=VARCHAR},
+      </if>
+      <if test="hwqyrq != null" >
+        #{hwqyrq,jdbcType=TIMESTAMP},
+      </if>
+      <if test="hwrl != null" >
+        #{hwrl,jdbcType=DECIMAL},
+      </if>
+      <if test="bgdw != null" >
+        #{bgdw,jdbcType=VARCHAR},
+      </if>
+      <if test="bgy != null" >
+        #{bgy,jdbcType=VARCHAR},
+      </if>
+      <if test="czbz != null" >
+        #{czbz,jdbcType=VARCHAR},
+      </if>
+      <if test="zhgxsj != null" >
+        #{zhgxsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="crkStatus != null" >
+        #{crkStatus,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.basic.model.BasicTankHwExample" resultType="java.lang.Integer" >
+    select count(*) from basic_tank_hw
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update basic_tank_hw
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.hwbm != null" >
+        hwbm = #{record.hwbm,jdbcType=VARCHAR},
+      </if>
+      <if test="record.hwmc != null" >
+        hwmc = #{record.hwmc,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ajdm != null" >
+        ajdm = #{record.ajdm,jdbcType=VARCHAR},
+      </if>
+      <if test="record.hwqyrq != null" >
+        hwqyrq = #{record.hwqyrq,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.hwrl != null" >
+        hwrl = #{record.hwrl,jdbcType=DECIMAL},
+      </if>
+      <if test="record.bgdw != null" >
+        bgdw = #{record.bgdw,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bgy != null" >
+        bgy = #{record.bgy,jdbcType=VARCHAR},
+      </if>
+      <if test="record.czbz != null" >
+        czbz = #{record.czbz,jdbcType=VARCHAR},
+      </if>
+      <if test="record.zhgxsj != null" >
+        zhgxsj = #{record.zhgxsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.crkStatus != null" >
+        crk_status = #{record.crkStatus,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update basic_tank_hw
+    set id = #{record.id,jdbcType=INTEGER},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      hwbm = #{record.hwbm,jdbcType=VARCHAR},
+      hwmc = #{record.hwmc,jdbcType=VARCHAR},
+      ajdm = #{record.ajdm,jdbcType=VARCHAR},
+      hwqyrq = #{record.hwqyrq,jdbcType=TIMESTAMP},
+      hwrl = #{record.hwrl,jdbcType=DECIMAL},
+      bgdw = #{record.bgdw,jdbcType=VARCHAR},
+      bgy = #{record.bgy,jdbcType=VARCHAR},
+      czbz = #{record.czbz,jdbcType=VARCHAR},
+      zhgxsj = #{record.zhgxsj,jdbcType=TIMESTAMP},
+      crk_status = #{record.crkStatus,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.basic.model.BasicTankHw" >
+    update basic_tank_hw
+    <set >
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="hwbm != null" >
+        hwbm = #{hwbm,jdbcType=VARCHAR},
+      </if>
+      <if test="hwmc != null" >
+        hwmc = #{hwmc,jdbcType=VARCHAR},
+      </if>
+      <if test="ajdm != null" >
+        ajdm = #{ajdm,jdbcType=VARCHAR},
+      </if>
+      <if test="hwqyrq != null" >
+        hwqyrq = #{hwqyrq,jdbcType=TIMESTAMP},
+      </if>
+      <if test="hwrl != null" >
+        hwrl = #{hwrl,jdbcType=DECIMAL},
+      </if>
+      <if test="bgdw != null" >
+        bgdw = #{bgdw,jdbcType=VARCHAR},
+      </if>
+      <if test="bgy != null" >
+        bgy = #{bgy,jdbcType=VARCHAR},
+      </if>
+      <if test="czbz != null" >
+        czbz = #{czbz,jdbcType=VARCHAR},
+      </if>
+      <if test="zhgxsj != null" >
+        zhgxsj = #{zhgxsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="crkStatus != null" >
+        crk_status = #{crkStatus,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.basic.model.BasicTankHw" >
+    update basic_tank_hw
+    set org_id = #{orgId,jdbcType=INTEGER},
+      hwbm = #{hwbm,jdbcType=VARCHAR},
+      hwmc = #{hwmc,jdbcType=VARCHAR},
+      ajdm = #{ajdm,jdbcType=VARCHAR},
+      hwqyrq = #{hwqyrq,jdbcType=TIMESTAMP},
+      hwrl = #{hwrl,jdbcType=DECIMAL},
+      bgdw = #{bgdw,jdbcType=VARCHAR},
+      bgy = #{bgy,jdbcType=VARCHAR},
+      czbz = #{czbz,jdbcType=VARCHAR},
+      zhgxsj = #{zhgxsj,jdbcType=TIMESTAMP},
+      crk_status = #{crkStatus,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

src/main/java/com/chinaitop/depot/basic/mapper/BasicTankMapper.xml

@@ -20,7 +20,8 @@
     <result column="tank_status" jdbcType="INTEGER" property="tankStatus" />
     <result column="org_id" jdbcType="INTEGER" property="orgId" />
     <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
-    <result column="updatetime" jdbcType="TIMESTAMP" property="updatetime" />
+    <result column="updatetime" jdbcType="TIMESTAMP" property="updatetime" />
+    <result column="crk_status" jdbcType="VARCHAR" property="crkStatus" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -83,7 +84,7 @@
   <sql id="Base_Column_List">
     id, storageTank_code, storageTank_name, org_code, tank_capacity, createDate, facilities_type, 
     heating_type, tank_type, diameter, height, buildDate, check_way, weld_way, tank_apply, tank_status, 
-    org_id, del_flag, updatetime
+    org_id, del_flag, updatetime, crk_status
   </sql>
   <select id="selectByExample" parameterType="com.chinaitop.depot.basic.model.BasicTankExample" resultMap="BaseResultMap">
     select
@@ -121,17 +122,17 @@
       facilities_type, heating_type, tank_type, 
       diameter, height, buildDate, check_way, 
       weld_way, tank_apply, tank_status, 
-      org_id, del_flag, updatetime
+      org_id, del_flag, updatetime, crk_status
       )
     values (#{id,jdbcType=INTEGER}, #{storagetankCode,jdbcType=VARCHAR}, #{storagetankName,jdbcType=VARCHAR}, 
       #{orgCode,jdbcType=VARCHAR}, #{tankCapacity,jdbcType=DECIMAL}, #{createdate,jdbcType=TIMESTAMP}, 
       #{facilitiesType,jdbcType=INTEGER}, #{heatingType,jdbcType=INTEGER}, #{tankType,jdbcType=INTEGER}, 
       #{diameter,jdbcType=DECIMAL}, #{height,jdbcType=DECIMAL}, #{builddate,jdbcType=TIMESTAMP}, #{checkWay,jdbcType=INTEGER}, 
       #{weldWay,jdbcType=INTEGER}, #{tankApply,jdbcType=INTEGER}, #{tankStatus,jdbcType=INTEGER}, 
-      #{orgId,jdbcType=INTEGER}, #{delFlag,jdbcType=INTEGER}, #{updatetime,jdbcType=TIMESTAMP}
+      #{orgId,jdbcType=INTEGER}, #{delFlag,jdbcType=INTEGER}, #{updatetime,jdbcType=TIMESTAMP}, #{crkStatus,jdbcType=VARCHAR}
       )
   </insert>
-  <insert id="insertSelective" parameterType="com.chinaitop.depot.basic.model.BasicTank">
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.basic.model.BasicTank"  keyProperty="id" useGeneratedKeys="true">
     insert into basic_tank
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -190,6 +191,9 @@
       </if>
       <if test="updatetime != null">
         updatetime,
+      </if>
+      <if test="crkStatus != null">
+        crk_status,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -249,6 +253,9 @@
       </if>
       <if test="updatetime != null">
         #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="crkStatus != null">
+        #{crkStatus,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
@@ -317,6 +324,9 @@
       </if>
       <if test="record.updatetime != null">
         updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.crkStatus != null">
+        crk_status = #{record.crkStatus,jdbcType=VARCHAR},
       </if>
     </set>
     <if test="_parameter != null">
@@ -343,7 +353,8 @@
       tank_status = #{record.tankStatus,jdbcType=INTEGER},
       org_id = #{record.orgId,jdbcType=INTEGER},
       del_flag = #{record.delFlag,jdbcType=INTEGER},
-      updatetime = #{record.updatetime,jdbcType=TIMESTAMP}
+      updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      crk_status = #{record.crkStatus,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -404,6 +415,9 @@
       </if>
       <if test="updatetime != null">
         updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="crkStatus != null">
+        crk_status = #{crkStatus,jdbcType=VARCHAR},
       </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
@@ -427,7 +441,8 @@
       tank_status = #{tankStatus,jdbcType=INTEGER},
       org_id = #{orgId,jdbcType=INTEGER},
       del_flag = #{delFlag,jdbcType=INTEGER},
-      updatetime = #{updatetime,jdbcType=TIMESTAMP}
+      updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      crk_status = #{crkStatus,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>

src/main/java/com/chinaitop/depot/basic/model/BasicTank.java

@@ -41,6 +41,8 @@ public class BasicTank {
     private Integer delFlag;
 
     private Date updatetime;
+    
+    private String crkStatus;
 
     /**
      * 油罐id
@@ -337,4 +339,13 @@ public class BasicTank {
     public void setUpdatetime(Date updatetime) {
         this.updatetime = updatetime;
     }
+
+	public String getCrkStatus() {
+		return crkStatus;
+	}
+
+	public void setCrkStatus(String crkStatus) {
+		this.crkStatus = crkStatus;
+	}
+
 }

src/main/java/com/chinaitop/depot/basic/model/BasicTankExample.java

@@ -1227,6 +1227,11 @@ public class BasicTankExample {
             addCriterion("updatetime not between", value1, value2, "updatetime");
             return (Criteria) this;
         }
+
+        public Criteria andCrkStatusEqualTo(String value) {
+            addCriterion("crk_status =", value, "crkStatus");
+            return (Criteria) this;
+        }
     }
 
     /**

src/main/java/com/chinaitop/depot/basic/model/BasicTankHw.java

@@ -0,0 +1,222 @@
+package com.chinaitop.depot.basic.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class BasicTankHw {
+    private Integer id;
+
+    private Integer orgId;
+
+    private String hwbm;
+
+    private String hwmc;
+
+    private String ajdm;
+
+    private Date hwqyrq;
+
+    private BigDecimal hwrl;
+
+    private String bgdw;
+
+    private String bgy;
+
+    private String czbz;
+
+    private Date zhgxsj;
+
+    private String crkStatus;
+
+    /**
+     * 油罐货位主键ID
+     * @return id 油罐货位主键ID
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 油罐货位主键ID
+     * @param id 油罐货位主键ID
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 单位ID
+     * @return org_id 单位ID
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 单位ID
+     * @param orgId 单位ID
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    /**
+     * 货位编码
+     * @return hwbm 货位编码
+     */
+    public String getHwbm() {
+        return hwbm;
+    }
+
+    /**
+     * 货位编码
+     * @param hwbm 货位编码
+     */
+    public void setHwbm(String hwbm) {
+        this.hwbm = hwbm == null ? null : hwbm.trim();
+    }
+
+    /**
+     * 货位名称
+     * @return hwmc 货位名称
+     */
+    public String getHwmc() {
+        return hwmc;
+    }
+
+    /**
+     * 货位名称
+     * @param hwmc 货位名称
+     */
+    public void setHwmc(String hwmc) {
+        this.hwmc = hwmc == null ? null : hwmc.trim();
+    }
+
+    /**
+     * 廒间代码
+     * @return ajdm 廒间代码
+     */
+    public String getAjdm() {
+        return ajdm;
+    }
+
+    /**
+     * 廒间代码
+     * @param ajdm 廒间代码
+     */
+    public void setAjdm(String ajdm) {
+        this.ajdm = ajdm == null ? null : ajdm.trim();
+    }
+
+    /**
+     * 货位启用日期
+     * @return hwqyrq 货位启用日期
+     */
+    public Date getHwqyrq() {
+        return hwqyrq;
+    }
+
+    /**
+     * 货位启用日期
+     * @param hwqyrq 货位启用日期
+     */
+    public void setHwqyrq(Date hwqyrq) {
+        this.hwqyrq = hwqyrq;
+    }
+
+    /**
+     * 货位容量(吨)
+     * @return hwrl 货位容量(吨)
+     */
+    public BigDecimal getHwrl() {
+        return hwrl;
+    }
+
+    /**
+     * 货位容量(吨)
+     * @param hwrl 货位容量(吨)
+     */
+    public void setHwrl(BigDecimal hwrl) {
+        this.hwrl = hwrl;
+    }
+
+    /**
+     * 保管单位
+     * @return bgdw 保管单位
+     */
+    public String getBgdw() {
+        return bgdw;
+    }
+
+    /**
+     * 保管单位
+     * @param bgdw 保管单位
+     */
+    public void setBgdw(String bgdw) {
+        this.bgdw = bgdw == null ? null : bgdw.trim();
+    }
+
+    /**
+     * 保管员
+     * @return bgy 保管员
+     */
+    public String getBgy() {
+        return bgy;
+    }
+
+    /**
+     * 保管员
+     * @param bgy 保管员
+     */
+    public void setBgy(String bgy) {
+        this.bgy = bgy == null ? null : bgy.trim();
+    }
+
+    /**
+     * 操作标志(i:新增,u:更新,d:删除)
+     * @return czbz 操作标志(i:新增,u:更新,d:删除)
+     */
+    public String getCzbz() {
+        return czbz;
+    }
+
+    /**
+     * 操作标志(i:新增,u:更新,d:删除)
+     * @param czbz 操作标志(i:新增,u:更新,d:删除)
+     */
+    public void setCzbz(String czbz) {
+        this.czbz = czbz == null ? null : czbz.trim();
+    }
+
+    /**
+     * 最后更新时间
+     * @return zhgxsj 最后更新时间
+     */
+    public Date getZhgxsj() {
+        return zhgxsj;
+    }
+
+    /**
+     * 最后更新时间
+     * @param zhgxsj 最后更新时间
+     */
+    public void setZhgxsj(Date zhgxsj) {
+        this.zhgxsj = zhgxsj;
+    }
+
+    /**
+     * 出入库状态(1空仓,2入库中,3封仓,4出库中)
+     * @return crk_status 出入库状态(1空仓,2入库中,3封仓,4出库中)
+     */
+    public String getCrkStatus() {
+        return crkStatus;
+    }
+
+    /**
+     * 出入库状态(1空仓,2入库中,3封仓,4出库中)
+     * @param crkStatus 出入库状态(1空仓,2入库中,3封仓,4出库中)
+     */
+    public void setCrkStatus(String crkStatus) {
+        this.crkStatus = crkStatus == null ? null : crkStatus.trim();
+    }
+}

src/main/java/com/chinaitop/depot/basic/service/BasicStorehouseService.java

@@ -103,4 +103,23 @@ public interface BasicStorehouseService {
 	 */
 	public Map<String, Object> getThreeTempCheckList(Integer orgId);
 
+	/**
+	 * 更新仓房和货位信息
+	 * 
+	 * @param storehouseJson 仓房数据对象
+	 * @param warehouseJson 货位数据对象
+	 * @param userInfo 登录对象
+	 * @return
+	 * @throws Exception
+	 */
+	public Map<String, Object> saveOrUpdate(String storehouseJson, String warehouseJson, String userInfo) throws Exception;
+
+	/**
+	 * 更新单位表中仓房数
+	 * 
+	 * @param orgId
+	 * @throws Exception
+	 */
+	public void editOrgChNum(Integer orgId) throws Exception;
+
 }

src/main/java/com/chinaitop/depot/basic/service/BasicTankService.java

@@ -5,13 +5,16 @@ import com.chinaitop.depot.basic.model.BasicTank;
 import com.chinaitop.depot.basic.model.BasicTankExample;
 
 import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
 
 public interface BasicTankService {
 
 
     List<BasicTank> findBasicTank(BasicTankExample example);
 
-    void saveOrEdit(BasicTank basicTank,Integer orgId);
+    void saveOrEdit(HttpServletRequest request, BasicTank basicTank,Integer orgId);
 
     BasicTank findByPrimary(Integer id);
 
@@ -20,4 +23,14 @@ public interface BasicTankService {
     Boolean findStorageTankCodeList(BasicTankExample basicTankExample, Integer id);
 
     String importData(List<List<String>> list, JSONObject user,String orgCode);
+
+    /**
+     * 更新油罐信息
+     * 
+     * @param request
+     * @param tankJson 油罐数据对象
+     * @param orgId 单位ID
+     * @return
+     */
+	Map<String, Object> updateOrSave(HttpServletRequest request, String tankJson, Integer orgId) throws Exception;
 }

src/main/java/com/chinaitop/depot/basic/service/BasicWarehouseService.java

@@ -3,6 +3,7 @@ package com.chinaitop.depot.basic.service;
 import java.util.List;
 import java.util.Map;
 
+import com.chinaitop.depot.basic.model.BasicStorehouse;
 import com.chinaitop.depot.basic.model.BasicWarehouse;
 import com.chinaitop.depot.basic.model.BasicWarehouseExample;
 
@@ -66,4 +67,12 @@ public interface BasicWarehouseService {
 	 */
 	Integer getCountWhs(Integer orgId, Integer delFlag) throws Exception;
 
+	/**
+	 * 更新货位数据
+	 * 
+	 * @param basicStorehouse
+	 * @param warehouseJson
+	 */
+	void saveOrUpdate(BasicStorehouse basicStorehouse, String warehouseJson) throws Exception;
+
 }

src/main/java/com/chinaitop/depot/basic/service/impl/BasicStorehouseServiceImpl.java

@@ -13,15 +13,19 @@ import javax.annotation.Resource;
 import com.chinaitop.depot.basic.mapper.BasicEnumMapper;
 import com.chinaitop.depot.basic.model.*;
 import com.chinaitop.utils.ParameterUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.chinaitop.depot.basic.mapper.BasicStorehouseMapper;
+import com.chinaitop.depot.basic.mapper.BasicTankMapper;
 import com.chinaitop.depot.basic.mapper.BasicWarehouseMapper;
 import com.chinaitop.depot.basic.model.BasicStorehouseExample.Criteria;
 import com.chinaitop.depot.basic.service.BasicKeeperHouseService;
 import com.chinaitop.depot.basic.service.BasicKeeperService;
 import com.chinaitop.depot.basic.service.BasicStorehouseService;
+import com.chinaitop.depot.basic.service.BasicWarehouseService;
 
 @Service
 @SuppressWarnings("all")
@@ -34,6 +38,9 @@ public class BasicStorehouseServiceImpl implements BasicStorehouseService {
 	private BasicWarehouseMapper wareMapper;
 
 	@Resource
+	private BasicWarehouseService warehouseService;
+
+	@Resource
 	private BasicEnumMapper enumMapper;
 
 	@Resource
@@ -41,6 +48,9 @@ public class BasicStorehouseServiceImpl implements BasicStorehouseService {
 
 	@Resource
 	private BasicKeeperService keeperService;
+	
+	@Resource
+	private BasicTankMapper basicTankMapper;
 
 	@Override
 	public void addBasicStorehouse(BasicStorehouse basicStorehouse) throws Exception {
@@ -517,4 +527,91 @@ public class BasicStorehouseServiceImpl implements BasicStorehouseService {
 		return modelMap;
 	}
 
+	@Override
+	public Map<String, Object> saveOrUpdate(String storehouseJson, String warehouseJson, String userInfo) throws Exception {
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+		JSONObject user = null;
+		Integer orgId = null;
+		String userName = "";
+		if (null != userInfo && !"".equals(userInfo)) {
+			user = JSONObject.parseObject(userInfo);
+			orgId = Integer.parseInt(user.get("orgId") == null?"":user.get("orgId").toString());
+			userName = user.get("username") == null?"":user.get("username").toString();
+		}
+		Date date = new Date();
+
+		// JSON字符串转对象
+		ObjectMapper mapper = new ObjectMapper();
+		BasicStorehouse basicStorehouse = (BasicStorehouse) mapper.readValue(storehouseJson, BasicStorehouse.class);
+		basicStorehouse.setDelFlag(1);
+		if (basicStorehouse.getStorehouseId() == null) {
+			String uuid = UUID.randomUUID().toString();
+			//String uuid = UUID.randomUUID().toString().replaceAll("-", "");
+			basicStorehouse.setUuid(uuid);
+			
+			if(!ParameterUtil.isequal(basicStorehouse.getLibraryType(),"1")){
+				basicStorehouse.setDepotId(orgId);
+			}
+			basicStorehouse.setOrgId(orgId);
+			basicStorehouse.setCreatename(userName);
+			basicStorehouse.setCreatedate(date);
+			basic.insertSelective(basicStorehouse);
+
+		} else {
+			if(!ParameterUtil.isequal(basicStorehouse.getLibraryType(),"1")){
+				basicStorehouse.setDutystoreman(null);
+			}
+			basicStorehouse.setUpdatename(userName);
+			basicStorehouse.setUpdatedate(date);
+			basic.updateByPrimaryKey(basicStorehouse);
+		}
+
+		//更新货位数据
+		warehouseService.saveOrUpdate(basicStorehouse, warehouseJson);
+
+		//更新单位表中仓房数和货位数
+		editOrgChNum(orgId);
+
+		modelMap.put("status", "success");
+
+		return modelMap;
+	}
+
+	/**
+	 * 更新单位表中仓房数、油罐数、有效仓容、有效罐容
+	 * @param orgId
+	 */
+	@Override
+	public void editOrgChNum(Integer orgId) throws Exception {
+		//查询当前单位仓房数
+		BasicStorehouseExample cf_example = new BasicStorehouseExample();
+		BasicStorehouseExample.Criteria cf_criteria = cf_example.createCriteria();
+		cf_criteria.andOrgIdEqualTo(orgId);
+		cf_criteria.andLibraryTypeEqualTo("0");
+		cf_criteria.andDelFlagEqualTo(1);
+		int ch_count = basic.countByExample(cf_example);
+		
+		//查询当前单位的油罐数
+		BasicTankExample yg_example = new BasicTankExample();
+		BasicTankExample.Criteria yg_criteria = yg_example.createCriteria();
+		yg_criteria.andOrgIdEqualTo(orgId);
+		//yg_criteria.andLibraryTypeEqualTo("0");
+		yg_criteria.andDelFlagEqualTo(1);
+		int yg_count = basicTankMapper.countByExample(yg_example);
+
+		//查询当前单位仓房总实际容量和油罐总实际容量
+		Map<String, Object> rl_map = basic.queryCrAndgw(orgId);
+		
+
+		//更新当前单位下仓房数、货位数、有效仓房、有效罐容
+		Map<String, Object> map = new HashMap<String, Object>();
+		map.put("orgId", orgId);
+		map.put("cf_count", ch_count);
+		map.put("yg_count", yg_count);
+		map.put("cr_count", rl_map.get("cr_count"));
+		map.put("gr_count", rl_map.get("gr_count"));
+
+		basic.editOrgCfAndHwNum(map);
+	}
+
 }

src/main/java/com/chinaitop/depot/basic/service/impl/BasicTankServiceImpl.java

@@ -6,18 +6,24 @@ import java.util.List;
 import java.util.Map;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import org.apache.commons.lang.ObjectUtils;
 import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.chinaitop.depot.basic.mapper.BasicEnumMapper;
+import com.chinaitop.depot.basic.mapper.BasicTankHwMapper;
 import com.chinaitop.depot.basic.mapper.BasicTankMapper;
 import com.chinaitop.depot.basic.model.BasicEnum;
 import com.chinaitop.depot.basic.model.BasicEnumExample;
 import com.chinaitop.depot.basic.model.BasicTank;
 import com.chinaitop.depot.basic.model.BasicTankExample;
+import com.chinaitop.depot.basic.model.BasicTankHw;
+import com.chinaitop.depot.basic.service.BasicStorehouseService;
 import com.chinaitop.depot.basic.service.BasicTankService;
 import com.chinaitop.utils.ParameterUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 @Service
 public class BasicTankServiceImpl implements BasicTankService {
@@ -26,8 +32,14 @@ public class BasicTankServiceImpl implements BasicTankService {
 	private BasicTankMapper basicTankMapper;
 
 	@Resource
+	private BasicStorehouseService basicStorehouseService;
+
+	@Resource
 	private BasicEnumMapper enumMapper;
 
+	@Resource
+	private BasicTankHwMapper basicTankHwMapper;
+
 
 	@Override
 	public List<BasicTank> findBasicTank(BasicTankExample example) {
@@ -38,14 +50,44 @@ public class BasicTankServiceImpl implements BasicTankService {
 	}
 
 	@Override
-    public void saveOrEdit(BasicTank basicTank,Integer orgId) {
+    public void saveOrEdit(HttpServletRequest request, BasicTank basicTank,Integer orgId) {
 		basicTank.setDelFlag(1);
 		basicTank.setOrgId(orgId);
+
+		//组装油罐货位
+		String org_obj = ObjectUtils.toString(request.getSession().getAttribute("orgInfo"),"");
+		String bgdw = null;
+		if(!org_obj.isEmpty()) {
+			JSONObject obj = JSONObject.parseObject(org_obj);
+			bgdw = ObjectUtils.toString(obj.get("orgName"), "");//保管单位默认为当前用户所在的单位
+		}
+		BasicTankHw tankhw = new BasicTankHw();
+		tankhw.setOrgId(orgId);
+		tankhw.setHwbm("01");
+		tankhw.setHwmc(basicTank.getStoragetankName());
+		tankhw.setHwqyrq(basicTank.getBuilddate());
+		tankhw.setHwrl(basicTank.getTankCapacity());
+		tankhw.setBgdw(bgdw);
+		tankhw.setCzbz("i");
+		tankhw.setZhgxsj(basicTank.getCreatedate());
+		tankhw.setCrkStatus(basicTank.getCrkStatus());
         if(basicTank.getId()==null){
 			basicTankMapper.insertSelective(basicTank);
+
+			tankhw.setId(basicTank.getId());
+			basicTankHwMapper.insertSelective(tankhw);
 		}else{
 			basicTankMapper.updateByPrimaryKeySelective(basicTank);
+			basicTankHwMapper.updateByPrimaryKeySelective(tankhw);
 		}
+
+
+//        BasicTank basicTank_n = basicTankMapper.selectByPrimaryKey(basicTank.getId());
+//        if (null != basicTank_n) {
+//        	basicTankHwMapper.updateByPrimaryKeySelective(tankhw);
+//        } else {
+//        	basicTankHwMapper.insertSelective(tankhw);
+//        }
     }
 
     @Override
@@ -362,4 +404,50 @@ public class BasicTankServiceImpl implements BasicTankService {
 		}
 		return msg;
     }
+
+	@Override
+	public Map<String, Object> updateOrSave(HttpServletRequest request, String tankJson, Integer orgId) throws Exception {
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+
+		// JSON字符串转对象
+		ObjectMapper mapper = new ObjectMapper();
+		BasicTank basicTank = mapper.readValue(tankJson, BasicTank.class);
+
+		// 校验编码是否重复
+		BasicTankExample example = new BasicTankExample();
+		BasicTankExample.Criteria criteria = example.createCriteria();
+		criteria.andOrgIdEqualTo(orgId);
+		criteria.andStoragetankCodeEqualTo(basicTank.getStoragetankCode());
+		List<BasicTank> list = null;
+		if (null != basicTank.getId() && !"".equals(basicTank.getId())) {//修改
+			criteria.andIdNotEqualTo(basicTank.getId());
+
+			// 查询除当前数据外还要别的油罐编码跟当前录入的编码一样，一样就是有重复的，没有就可以录入
+			list = basicTankMapper.selectByExample(example);
+			if (null != list && list.size() > 0) {
+				// 获取自己数据的ID
+				modelMap.put("status", "error");
+				modelMap.put("msg", "油罐编码已存在，不可与其它油罐编码重复！");
+				return modelMap;
+			}
+		} else {//新增
+			list = basicTankMapper.selectByExample(example);
+			if (null != list && list.size() > 0) {
+				modelMap.put("status", "error");
+				modelMap.put("msg", "油罐编码已存在，不可与其它油罐编码重复！");
+				return modelMap;
+			}
+		}
+
+		//更新油罐信息
+		this.saveOrEdit(request, basicTank, orgId);
+		
+		//更新单位表中仓房数、油罐数、有效仓容、有效罐容
+		basicStorehouseService.editOrgChNum(orgId);
+
+		modelMap.put("status", "success");
+		modelMap.put("msg", "保存成功！");
+
+        return modelMap;
+	}
 }

src/main/java/com/chinaitop/depot/basic/service/impl/BasicWarehouseServiceImpl.java

@@ -10,10 +10,13 @@ import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 import com.chinaitop.depot.basic.mapper.BasicWarehouseMapper;
+import com.chinaitop.depot.basic.model.BasicStorehouse;
 import com.chinaitop.depot.basic.model.BasicWarehouse;
 import com.chinaitop.depot.basic.model.BasicWarehouseExample;
 import com.chinaitop.depot.basic.model.BasicWarehouseExample.Criteria;
 import com.chinaitop.depot.basic.service.BasicWarehouseService;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 @Service
 public class BasicWarehouseServiceImpl implements BasicWarehouseService {
@@ -108,4 +111,24 @@ public class BasicWarehouseServiceImpl implements BasicWarehouseService {
 		return hws;
 	}
 
+	@Override
+	public void saveOrUpdate(BasicStorehouse storehouse, String warehouseJson) throws Exception {
+		ObjectMapper mappers = new ObjectMapper();
+		List<BasicWarehouse> list = mappers.readValue(warehouseJson, new TypeReference<List<BasicWarehouse>>(){});
+
+		for (BasicWarehouse warehouse : list) {
+			if (null == warehouse.getWarehouseId()) {//没有货位ID那就是新增
+				warehouse.setStorehouseId(storehouse.getStorehouseId());
+				warehouse.setCreatename(storehouse.getCreatename());
+				warehouse.setCreatedate(storehouse.getCreatedate());
+				warehouse.setOrgId(storehouse.getOrgId());
+				mapper.insertSelective(warehouse);
+			} else {
+				warehouse.setUpdatename(storehouse.getUpdatename());
+				warehouse.setUpdatedate(storehouse.getUpdatedate());
+				mapper.updateByPrimaryKeySelective(warehouse);
+			}
+		}
+	}
+
 }

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

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