库区编码

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

@@ -143,13 +143,15 @@ public class OrgInfoController {
 	 * @throws JsonParseException
 	 * @throws JsonMappingException
 	 * @throws IOException
+	 * dwdm  是单位的统一社会信用代码
 	 */
 	@RequestMapping(value="/save")
-	public Map<String, Object> save(String orgInfoJson) throws JsonParseException, JsonMappingException, IOException {
+	public Map<String, Object> save(String orgInfoJson,String dwdm) throws JsonParseException, JsonMappingException, IOException {
 		Map<String, Object> modelMap = new HashMap<>();
 		// JSON字符串转对象
 		ObjectMapper mapper = new ObjectMapper();
 		OrgInfo orgInfo = (OrgInfo)mapper.readValue(orgInfoJson, OrgInfo.class);
+		
         if (orgInfo.getOrgId() == null) {
         	if(!ObjectUtils.toString(orgInfo.getBirdsEye()).isEmpty()) {
         		String path = uploadPath+orgInfo.getBirdsEye();
@@ -160,13 +162,17 @@ public class OrgInfoController {
         	/* 保存数据  */
 			orgInfoService.add(orgInfo);
 
-			/* 生成库区标准编码 */
-			String zzdm = orgInfo.getCreditCode();
-			if ("".equals(zzdm)) {
-				zzdm = orgInfo.getCompanyOrgCode();
-			}
-//			orgInfo.setKqbm(BusinessUtils.setBZkqbm(zzdm, orgInfo.getOrgId()));
-//			orgInfoService.updateSelective(orgInfo);
+			/**
+			 * 库区代码
+			 * 库区代码	单位代码+3位库区顺序码
+			 */
+			String kqbm = dwdm.concat(orgInfo.getOrgCode());
+			orgInfo.setKqbm(kqbm);
+			orgInfoService.updateSelective(orgInfo);
+			
+			
+			/*orgInfo.setKqbm(BusinessUtils.setBZkqbm(zzdm, orgInfo.getOrgId()));
+			orgInfoService.updateSelective(orgInfo);*/
 			
 			//默认给新建的机构创建一个系统管理员角色
 			RoleInfo roleInfo = new RoleInfo();
@@ -189,10 +195,15 @@ public class OrgInfoController {
         		String hexString = FileUtil.toHexString(file2byte);
         		orgInfo.setWjl(hexString);
         	}
+			
+			String kqbm = dwdm.concat(orgInfo.getOrgCode());
+			orgInfo.setKqbm(kqbm);
+			orgInfoService.updateSelective(orgInfo);
+			
 //			orgInfo.setKqbm(BusinessUtils.setBZkqbm(orgInfo.getCreditCode(), orgInfo.getOrgId()));
 //			orgInfoService.update(orgInfo);
 		}
-        if(orgInfo.getParentId() != 0) {//排除顶级机构
+        /*if(orgInfo.getParentId() != 0) {//排除顶级机构
         	//查询父机构id以及层级
         	OrgInfo orgParentInfo = orgInfoService.findById(orgInfo.getParentId());
         	//查询同级机构已存在的级别后2位
@@ -236,7 +247,7 @@ public class OrgInfoController {
         			orgInfoService.update(orgInfo);
         		}
         	}
-        }
+        }*/
 		modelMap.put("status", "success");
 		modelMap.put("newOrgId", orgInfo.getOrgId());
 		return modelMap;