.

src/main/java/com/chinaitop/depot/system/controller/OrgInfoController.java

@@ -15,6 +15,7 @@ import com.chinaitop.depot.system.service.OrgInfoService;
 import com.chinaitop.depot.system.service.RoleButtonService;
 import com.chinaitop.depot.system.service.RoleFuncService;
 import com.chinaitop.depot.system.service.RoleInfoService;
+import com.chinaitop.depot.utils.BusinessUtils;
 import com.chinaitop.depot.utils.DataSynchronization;
 import com.chinaitop.depot.utils.FileUtil;
 import com.fasterxml.jackson.core.JsonParseException;
@@ -156,8 +157,17 @@ public class OrgInfoController {
         		String hexString = FileUtil.toHexString(file2byte);
         		orgInfo.setWjl(hexString);
         	}
+        	/* 保存数据  */
 			orgInfoService.add(orgInfo);
-			
+
+			/* 生成库区标准编码 */
+			String zzdm = orgInfo.getCreditCode();
+			if ("".equals(zzdm)) {
+				zzdm = orgInfo.getCompanyOrgCode();
+			}
+			orgInfo.setKqbm(BusinessUtils.setBZkqbm(zzdm, orgInfo.getOrgId()));
+			orgInfoService.updateSelective(orgInfo);
+
 			/*新增机构时，重新配置级别*/
 			orgInfoService.clearOrgLevel(new HashMap<String,Object>());//清空所有级别
 			OrgInfoExample example = new OrgInfoExample();

src/main/java/com/chinaitop/depot/system/mapper/OrgInfoMapper.xml

@@ -60,6 +60,7 @@
     <result column="updatetime" property="updateTime" jdbcType="VARCHAR" />
     <result column="frlxfs" property="frlxfs" jdbcType="VARCHAR" />
     <result column="yxgr" property="yxgr" jdbcType="DECIMAL" />
+    <result column="kqbm" property="kqbm" jdbcType="VARCHAR" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.chinaitop.depot.system.model.OrgInfo">
     <result column="wjl" jdbcType="LONGVARCHAR" property="wjl" />
@@ -130,7 +131,8 @@
     independent_corporation, legal_person, whether_rent, info_regist, regist_date, remark, 
     parent_id, status, del_flag, birds_eye, birds_Remote, brief_introduction, invoice_title, 
     regist_number, bank_name, account_name, account_number,level_code,total_assets,corporate_capacity,
-    office_phone,registered_address,mail_box,official_website,house_number,tank_number,depot_property,updatetime,frlxfs,yxgr
+    office_phone,registered_address,mail_box,official_website,house_number,tank_number,depot_property,
+    updatetime,frlxfs,yxgr,kqbm
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.system.model.OrgInfoExample" >
     select
@@ -180,7 +182,7 @@
       regist_number, bank_name, account_name, 
       account_number,total_assets,corporate_capacity,
       office_phone,registered_address,mail_box,official_website,
-      house_number,tank_number,depot_property,level_code,wjl,frlxfs,yxgr)
+      house_number,tank_number,depot_property,level_code,wjl,frlxfs,yxgr,kqbm)
     values (#{orgId,jdbcType=INTEGER}, #{orgName,jdbcType=VARCHAR}, #{shortName,jdbcType=VARCHAR}, 
       #{orgCode,jdbcType=VARCHAR}, #{orgClassId,jdbcType=INTEGER}, #{companyNature,jdbcType=INTEGER}, 
       #{busiType,jdbcType=INTEGER}, #{address,jdbcType=VARCHAR}, #{contact,jdbcType=VARCHAR}, 
@@ -200,7 +202,7 @@
       #{officePhone,jdbcType=VARCHAR}, #{registeredAddress,jdbcType=VARCHAR}, #{mailBox,jdbcType=VARCHAR}, 
       #{officialWebsite,jdbcType=VARCHAR}, #{houseNumber,jdbcType=INTEGER}, #{tankNumber,jdbcType=INTEGER}, 
       #{depotProperty,jdbcType=VARCHAR}, #{levelCode,jdbcType=VARCHAR}, #{wjl,jdbcType=LONGVARCHAR},
-      #{frlxfs,jdbcType=VARCHAR}, #{yxgr,jdbcType=DECIMAL})
+      #{frlxfs,jdbcType=VARCHAR}, #{yxgr,jdbcType=DECIMAL}, #{kqbm,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.system.model.OrgInfo" useGeneratedKeys="true" keyProperty="orgId">
     insert into org_info
@@ -349,6 +351,9 @@
       <if test="yxgr != null">
       	yxgr,
       </if>
+      <if test="kqbm != null">
+      	kqbm,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="orgId != null" >
@@ -495,6 +500,9 @@
       <if test="yxgr != null" >
         #{yxgr,jdbcType=DECIMAL},
       </if>
+      <if test="kqbm != null">
+      	#{kqbm,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.system.model.OrgInfoExample" resultType="java.lang.Integer" >
@@ -653,6 +661,9 @@
       <if test="record.yxgr != null" >
         yxgr = #{record.yxgr,jdbcType=DECIMAL},
       </if>
+      <if test="record.kqbm != null">
+      	kqbm = #{record.kqbm,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -707,7 +718,8 @@
       account_number = #{record.accountNumber,jdbcType=VARCHAR},
       wjl = #{record.wjl,jdbcType=LONGVARCHAR},
       frlxfs = #{record.frlxfs,jdbcType=VARCHAR},
-      yxgr = #{record.yxgr,jdbcType=DECIMAL}
+      yxgr = #{record.yxgr,jdbcType=DECIMAL},
+      kqbm = #{record.kqbm,jdbcType=VARCHAR}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -886,6 +898,9 @@
       <if test="yxgr != null" >
         yxgr = #{yxgr,jdbcType=DECIMAL},
       </if>
+      <if test="kqbm != null">
+      	kqbm = #{kqbm,jdbcType=VARCHAR},
+      </if>
     </set>
     where org_id = #{orgId,jdbcType=INTEGER}
   </update>
@@ -947,7 +962,8 @@
       level_code = #{levelCode,jdbcType=VARCHAR},
       wjl = #{wjl,jdbcType=LONGVARCHAR},
       frlxfs = #{frlxfs,jdbcType=VARCHAR},
-      yxgr = #{yxgr,jdbcType=DECIMAL}
+      yxgr = #{yxgr,jdbcType=DECIMAL},
+      kqbm = #{kqbm,jdbcType=VARCHAR}
     where org_id = #{orgId,jdbcType=INTEGER}
   </update>
   <update id="updateOrgLevel" parameterType="map" statementType="CALLABLE" >

src/main/java/com/chinaitop/depot/system/model/OrgInfo.java

@@ -128,6 +128,8 @@ public class OrgInfo implements Serializable {
     private String frlxfs;
     
     private double yxgr;
+    
+    private String kqbm;
 
     public Integer getOrgId() {
         return orgId;
@@ -608,4 +610,12 @@ public class OrgInfo implements Serializable {
 	public void setYxgr(double yxgr) {
 		this.yxgr = yxgr;
 	}
+
+	public String getKqbm() {
+		return kqbm;
+	}
+
+	public void setKqbm(String kqbm) {
+		this.kqbm = kqbm == null ? null : kqbm.trim();
+	}
 }

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

@@ -0,0 +1,113 @@
+package com.chinaitop.depot.utils;
+
+public class BusinessUtils {
+
+	//简易仓、简易囤、罩棚的枚举ID(天津目前只有简易囤)3位编码是999
+	private final static String JY_NUME_ID = "5214";
+
+	//正常廒间的3位编码
+	private final static String AJ_CODE = "001";
+
+	//简易简易仓、简易囤、罩棚的3位廒间编码
+	private final static String JY_CODE = "999";
+
+	//油罐廒间编码
+	private final static String YG_CODE = "000";
+
+	//油罐
+	private final static String IS_TANK = "1";
+
+	/**
+	 * 组合库区标准编码
+	 * 
+	 * @param zzdm 组织编码或18位统一性用社代码
+	 * @param orgId 单位ID
+	 * @return
+	 */
+	public static String setBZkqbm(String zzdm, Integer orgId) {
+		String kqbm = "";
+		StringBuffer sbf = new StringBuffer();
+		sbf.append(zzdm);
+		if (orgId.toString().length()==1) {
+			sbf.append("00").append(orgId);
+		} else if (orgId.toString().length()==2) {
+			sbf.append("0").append(orgId);
+		} else if (orgId.toString().length()==3) {
+			sbf.append(orgId);
+		}
+		kqbm = sbf.toString().trim();
+		return kqbm;
+	}
+
+	/**
+	 * 组合仓房/油罐标准编码
+	 * 规则：仓房/油罐标准编码=所属单位18位统一信用代码+001+仓房/油罐3位编码
+	 * @param dwbm 单位编码
+	 * @param code 仓房或油罐编码
+	 * @param typeCode 类型标识：0仓房,1油罐
+	 * @param orgId 单位ID
+	 * @return
+	 */
+	public static String setBZcfandygbm(String dwbm, String code, String typeCode, String orgId) {
+		String cfdm = "";
+		StringBuffer sbf = new StringBuffer();
+		//sbf.append(dwbm).append("001").append(typeCode).append(code);
+		if (orgId.length()==1) {
+			sbf.append(dwbm).append("00").append(orgId);
+		} else if (orgId.length()==2) {
+			sbf.append(dwbm).append("0").append(orgId);
+		} else if (orgId.length()==3) {
+			sbf.append(dwbm).append(orgId);
+		}
+		sbf.append(typeCode).append(code);
+		cfdm = sbf.toString().trim();
+		return cfdm;
+	}
+
+	/**
+	 * 组合廒间标准编码
+	 * 规则：廒间标准编码=仓房/油罐标准编码+3位廒间编码
+	 * @param cfbm 仓房/油罐标准编码
+	 * @param cfType 仓房类型
+	 * @param typeCode 类型标识：0仓房,1油罐
+	 * @return
+	 */
+	public static String setBZajbm(String cfbm, String cfType, String typeCode) {
+
+		String ajbm = "";
+
+		StringBuffer sbf = new StringBuffer();
+		sbf.append(cfbm);
+
+		if (IS_TANK.equals(typeCode)) {
+			sbf.append(YG_CODE);
+		} else {
+			if (JY_NUME_ID.equals(cfType)) {
+				sbf.append(JY_CODE);
+			} else {
+				sbf.append(AJ_CODE);
+			}
+		}
+
+		ajbm = sbf.toString().trim();
+
+		return ajbm;
+	}
+
+	/**
+	 * 组合货位标准编码
+	 * 规则：货位标准编码=所属仓房编码+所属廒间编码+货位编码
+	 * 也就是说廒间标准编码+货位编码就是货位的标准编码
+	 * @param ajbm
+	 * @param hwbm
+	 * @return
+	 */
+	public static String setBZhwbm(String ajbm, String hwbm) {
+		String hwdm = "";
+		StringBuffer sbf = new StringBuffer();
+		sbf.append(ajbm).append(hwbm);
+		hwdm = sbf.toString().trim();
+		return hwdm;
+	}
+
+}