仓房标准编码生成规则修改

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

@@ -560,7 +560,7 @@ public class BasicStorehouseServiceImpl implements BasicStorehouseService {
 		String ajbm = "";//廒间编码
 
 		if (!"".equals(basicStorehouse.getStorehouseCode())) {
-			cfbm = BusinessUtils.setBZcfandygbm(dwbm, basicStorehouse.getStorehouseCode(), "0");
+			cfbm = BusinessUtils.setBZcfandygbm(dwbm, basicStorehouse.getStorehouseCode(), "0", orgId+"");
 			ajbm = BusinessUtils.setBZajbm(cfbm, basicStorehouse.getStorehouseType()+"", "0");
 			basicStorehouse.setCfbm(cfbm);
 			basicStorehouse.setAjbm(ajbm);

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

@@ -79,7 +79,7 @@ public class BasicTankServiceImpl implements BasicTankService {
 		String ajbm = "";//廒间编码
 
 		if (!"".equals(basicTank.getStoragetankCode())) {
-			ygbm = BusinessUtils.setBZcfandygbm(dwdm, basicTank.getStoragetankCode(), "1");
+			ygbm = BusinessUtils.setBZcfandygbm(dwdm, basicTank.getStoragetankCode(), "1", orgId+"");
 			ajbm = BusinessUtils.setBZajbm(ygbm, "", "1");
 			basicTank.setYgdm(ygbm);
 			basicTank.setYgajdm(ajbm);

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

@@ -25,12 +25,21 @@ public class BusinessUtils {
 	 * @param dwbm 单位编码
 	 * @param code 仓房或油罐编码
 	 * @param typeCode 类型标识：0仓房,1油罐
+	 * @param orgId 单位ID
 	 * @return
 	 */
-	public static String setBZcfandygbm(String dwbm, String code, String typeCode) {
+	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);
+		//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;
 	}