【BL_2018110014】【仓库编号重复保存错误】

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/WarehouseServiceImpl.java

@@ -110,16 +110,15 @@ public class WarehouseServiceImpl extends CommonBaseServiceImpl<WarehouseMapper,
         if(record.getId() == 0){
             String whcode = record.getWh_code().trim().toUpperCase();
             whcode = RegexpUtils.replaceSpecCharacter(whcode);
+            //验证名称是否重复
+            validName(record.getWh_description(), record.getId());
+            //验证编号是否重复
+            validCode(whcode, record.getId());
             String code = pushMaxnubmer(whcode, record.getId());
             record.setCompanyId(BaseContextHolder.getCompanyId());
             record.setCreatorId(BaseContextHolder.getUserId());
             record.setCreateTime(new Date());
             record.setCreatorName(BaseContextHolder.getUserName());
-            //验证名称是否重复
-            validName(record.getWh_description(), record.getId());
-            //验证编号是否重复
-            validCode(code, record.getId());
-
             count = getMapper().insertSelective(record);
             //记录LOG
             docBaseDTO = generateMsgObj(record.getId(), code);