.

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

@@ -86,12 +86,6 @@ public class BasicTankController {
         return pageInfo;
     }
 
-    /**
-     * 更新油罐信息
-     *
-     * @param tankJson JSON数据对象
-     * @return
-     */
     @RequestMapping(value = "/edit", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
     @ApiOperation(value="更新油罐信息", notes = "更新油罐信息")
     @ApiImplicitParams({

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

@@ -69,6 +69,7 @@
     <result column="updatetime" jdbcType="TIMESTAMP" property="updatetime" />
     <result column="cfbm" jdbcType="VARCHAR" property="cfbm" />
     <result column="ajbm" jdbcType="VARCHAR" property="ajbm" />
+    <result column="datatype" jdbcType="VARCHAR" property="datatype" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -138,7 +139,8 @@
     draftType, heatInsulationStep_roof, heatInsulationStep_window, grbwcs, nfszcc, ywfsfqfczz, 
     ywfhfbfdss, ywlqjcss, ywjxtfss, nfhlxzsc, nffddyqtcl, nfcwcc, actual_capacity, completion_date, 
     useDate, storehouse_state, store_way, currentType, dutyStoreman, remark, createName, 
-    createDate, updateName, updateDate, working_status, del_flag, library_type, updatetime, cfbm, ajbm
+    createDate, updateName, updateDate, working_status, del_flag, library_type, updatetime, cfbm, ajbm,
+    datatype
   </sql>
   <select id="selectByExample" parameterType="com.chinaitop.depot.basic.model.BasicStorehouseExample" resultMap="BaseResultMap">
     select
@@ -193,7 +195,7 @@
       dutyStoreman, remark, createName, 
       createDate, updateName, updateDate, 
       working_status, del_flag, library_type, 
-      updatetime, cfbm, ajbm)
+      updatetime, cfbm, ajbm, datatype)
     values (#{storehouseId,jdbcType=INTEGER}, #{uuid,jdbcType=VARCHAR}, #{depotId,jdbcType=INTEGER}, 
       #{depotName,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, #{orgName,jdbcType=VARCHAR}, 
       #{storehouseCode,jdbcType=VARCHAR}, #{storehouseName,jdbcType=VARCHAR}, #{storehouseType,jdbcType=INTEGER}, 
@@ -216,7 +218,8 @@
       #{dutystoreman,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{createname,jdbcType=VARCHAR}, 
       #{createdate,jdbcType=TIMESTAMP}, #{updatename,jdbcType=VARCHAR}, #{updatedate,jdbcType=TIMESTAMP}, 
       #{workingStatus,jdbcType=INTEGER}, #{delFlag,jdbcType=INTEGER}, #{libraryType,jdbcType=VARCHAR}, 
-      #{updatetime,jdbcType=TIMESTAMP}, #{cfbm,jdbcType=VARCHAR}, #{ajbm,jdbcType=VARCHAR})
+      #{updatetime,jdbcType=TIMESTAMP}, #{cfbm,jdbcType=VARCHAR}, #{ajbm,jdbcType=VARCHAR},
+      #{datatype,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.basic.model.BasicStorehouse" keyProperty="storehouseId" useGeneratedKeys="true">
     insert into basic_storehouse
@@ -422,6 +425,9 @@
       <if test="ajbm != null">
         ajbm,
       </if>
+      <if test="datatype != null">
+       datatype,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="storehouseId != null">
@@ -625,6 +631,9 @@
       <if test="ajbm != null">
         #{ajbm,jdbcType=VARCHAR},
       </if>
+      <if test="datatype != null">
+       #{datatype,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.basic.model.BasicStorehouseExample" resultType="java.lang.Integer">
@@ -837,6 +846,9 @@
       <if test="record.ajbm != null">
         ajbm = #{record.ajbm,jdbcType=VARCHAR},
       </if>
+      <if test="record.datatype != null">
+       datatype = #{record.datatype,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -910,7 +922,8 @@
       library_type = #{record.libraryType,jdbcType=VARCHAR},
       updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
       cfbm = #{record.cfbm,jdbcType=VARCHAR},
-      ajbm = #{record.ajbm,jdbcType=VARCHAR}
+      ajbm = #{record.ajbm,jdbcType=VARCHAR},
+      datatype = #{record.datatype,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -1111,11 +1124,14 @@
         updatetime = #{updatetime,jdbcType=TIMESTAMP},
       </if>
       <if test="cfbm != null">
-        cfbm = #{datatype,cfbm=VARCHAR},
+        cfbm = #{cfbm,jdbcType=VARCHAR},
       </if>
       <if test="ajbm != null">
         ajbm = #{ajbm,jdbcType=VARCHAR},
       </if>
+      <if test="datatype != null">
+       datatype = #{datatype,jdbcType=VARCHAR},
+      </if>
     </set>
     where storehouse_id = #{storehouseId,jdbcType=INTEGER}
   </update>
@@ -1186,7 +1202,8 @@
       library_type = #{libraryType,jdbcType=VARCHAR},
       updatetime = #{updatetime,jdbcType=TIMESTAMP},
       cfbm = #{cfbm,jdbcType=VARCHAR},
-      ajbm = #{ajbm,jdbcType=VARCHAR}
+      ajbm = #{ajbm,jdbcType=VARCHAR},
+      datatype = #{datatype,jdbcType=VARCHAR}
     where storehouse_id = #{storehouseId,jdbcType=INTEGER}
   </update>
 

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

@@ -139,6 +139,8 @@ public class BasicStorehouse {
     private String cfbm;
 
     private String ajbm;
+    
+    private String datatype;
 
     /**
      * ID
@@ -1204,4 +1206,12 @@ public class BasicStorehouse {
 		this.ajbm = ajbm;
 	}
 
+	public String getDatatype() {
+		return datatype;
+	}
+
+	public void setDatatype(String datatype) {
+		this.datatype = datatype;
+	}
+
 }

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

@@ -1,6 +1,7 @@
 package com.chinaitop.depot.basic.service.impl;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -18,6 +19,7 @@ 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.BasicStorehouse;
 import com.chinaitop.depot.basic.model.BasicTank;
 import com.chinaitop.depot.basic.model.BasicTankExample;
 import com.chinaitop.depot.basic.model.BasicTankHw;
@@ -92,22 +94,52 @@ public class BasicTankServiceImpl implements BasicTankService {
 		String ajbm = "";//廒间编码
 
 		if (!"".equals(basicTank.getStoragetankCode())) {
-			//String code = basicTank.getStoragetankCode().toString().substring(2, 5);
-			ygbm = BusinessUtils.setBZcfandygbm(dwdm, basicTank.getStoragetankCode(), "1");
+			String code = basicTank.getStoragetankCode().toString().substring(2, 5);
+			ygbm = BusinessUtils.setBZcfandygbm(dwdm, code, "1");
 			ajbm = BusinessUtils.setBZajbm(ygbm, "", "1");
 			basicTank.setYgdm(ygbm);
 			basicTank.setYgajdm(ajbm);
 		}
         if(basicTank.getId() == null || "".equals(basicTank.getId())){
-        	basicTankMapper.insertSelective(basicTank);
+        	BasicStorehouse storehouse = new BasicStorehouse();
+        	storehouse.setStorehouseCode(basicTank.getStoragetankCode());
+        	storehouse.setStorehouseName(basicTank.getStoragetankName());
+        	storehouse.setOrgId(basicTank.getOrgId());
+        	storehouse.setDatatype("1");
+        	storehouse.setDelFlag(1);
+        	storehouse.setCreatedate(new Date());
+        	storehouse.setLibraryType("0");
+        	storehouse.setCfbm(basicTank.getYgdm());
+        	storehouse.setAjbm(basicTank.getYgajdm());
+        	int count = basicStorehouseMapper.insertSelective(storehouse);
+        	if (count > 0) {
+        		basicTank.setId(storehouse.getStorehouseId());
+        		basicTankMapper.insertSelective(basicTank);
+        		
+        		tankhw.setId(basicTank.getId());
+        		tankhw.setHwbm(BusinessUtils.setBZhwbm(basicTank.getYgajdm(), "01"));
+        		basicTankHwMapper.insertSelective(tankhw);
+        	}
 
-        	tankhw.setId(basicTank.getId());
-        	tankhw.setHwbm(BusinessUtils.setBZhwbm(basicTank.getYgajdm(), "01"));
-        	basicTankHwMapper.insertSelective(tankhw);
 		}else{
+			int count = basicTankMapper.updateByPrimaryKeySelective(basicTank);
 			if (!"".equals(basicTank.getStoragetankCode())) {
 				tankhw.setHwbm(BusinessUtils.setBZhwbm(basicTank.getYgajdm(), "01"));
 			}
+			//油罐表修改成功后修改仓房表中对应的油罐数据
+			if (count > 0) {
+				BasicStorehouse storehouse = new BasicStorehouse();
+				storehouse.setStorehouseId(basicTank.getId());
+				storehouse.setStorehouseName(basicTank.getStoragetankName());
+				storehouse.setStorehouseCode(basicTank.getStoragetankCode());
+				storehouse.setDelFlag(basicTank.getDelFlag());
+				storehouse.setCfbm(basicTank.getYgdm());
+	        	storehouse.setAjbm(basicTank.getYgajdm());
+				basicStorehouseMapper.updateByPrimaryKeySelective(storehouse);
+			}
+			//修改油罐货位表
+			tankhw.setCzbz("u");
+			tankhw.setZhgxsj(new Date());
 			BasicTankHwExample example = new BasicTankHwExample();
 			BasicTankHwExample.Criteria criteria = example.createCriteria();
 			criteria.andIdEqualTo(basicTank.getId());

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

@@ -11,7 +11,7 @@ public class BusinessUtils {
 	//简易简易仓、简易囤、罩棚的3位廒间编码
 	private final static String JY_CODE = "999";
 
-	//简易简易仓、简易囤、罩棚的3位廒间编码
+	//油罐廒间编码
 	private final static String YG_CODE = "000";
 
 	//油罐