1.修复物料已删除情况继续保存删除操作的错误。

2.批量操作提示语增加换行。

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/exception/BizExceptionCode.java

@@ -21,6 +21,7 @@ public enum BizExceptionCode implements BaseExceptionCode {
     NULL_CODERULE(79100, "单据规则不存在,请先确定单据生成规则"),
     CODE_EXISTS(79200, "单据编号已存在"),
     BIZ_CLOSE(79301, "只能关闭已审核的单据"),
+    ORDER_NOT_EXITTS(79300, "单据不存在"),
     BIZ_OPEN(79302, "只能打开已关闭的单据"),
     BIZ_AUDITED(79303,"只能审核未审核的单据"),
     BIZ_UNAUDITED(79304,"只能反审核已审核的单据"),

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

@@ -30,7 +30,7 @@ import com.usoftchina.saas.document.service.*;
 import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.utils.CollectionUtils;
-import com.usoftchina.saas.utils.DateUtils;
+import com.usoftchina.saas.utils.ObjectUtils;
 import com.usoftchina.saas.utils.RegexpUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -142,6 +142,9 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
             messageLogService.save(docBaseDTO);
         }else{
             String oldCode = getMapper().getCodeById(product.getId());
+            if (StringUtils.isEmpty(oldCode)){
+                throw new BizException(BizExceptionCode.ORDER_NOT_EXITTS);
+            }
             if (!product.getPr_code().equals(oldCode)){
                 validEnableUpdateCode(product.getId());
             }
@@ -425,7 +428,7 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
                 close(docBaseDTO.getId());
             }catch (Exception e){
                 String msg = BizExceptionCode.DEAL_FAILED.getMessage();
-                errorMsg.append(String.format(msg, docBaseDTO.getCode(), e.getMessage()));
+                errorMsg.append(String.format(msg, docBaseDTO.getCode(), e.getMessage()) + "<br />");
             }
         }
         return errorMsg.toString();
@@ -439,7 +442,7 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
                 open(docBaseDTO.getId());
             }catch (Exception e){
                 String msg = BizExceptionCode.DEAL_FAILED.getMessage();
-                errorMsg.append(String.format(msg, docBaseDTO.getCode(), e.getMessage()));
+                errorMsg.append(String.format(msg, docBaseDTO.getCode(), e.getMessage()) + "<br />");
             }
         }
         return errorMsg.toString();
@@ -580,6 +583,10 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
 
     @Override
     public boolean deleteDetailById(Long id) {
+        Product productTemp = getMapper().selectByPrimaryKey(id);
+        if (ObjectUtils.isEmpty(productTemp)){
+            throw new BizException(BizExceptionCode.ORDER_NOT_EXITTS);
+        }
         Long prodId = productDetailMapper.selectProdidByPrimaryKey(id);
         validProductOperation(prodId, BizExceptionCode.BIZ_RELDELETE_DELETEPROD);
         String prCode = getMapper().selectByPrimaryKey(prodId).getPr_code();

framework/core/src/main/java/com/usoftchina/saas/exception/ExceptionCode.java

@@ -31,10 +31,10 @@ public enum ExceptionCode implements BaseExceptionCode {
 
     // 账户管理相关
     COMPANY_NAME_EXIST(52000, "公司名称已注册"),
-    COMPANY_NAME_HASREGISTER(52000, "企业已开通saas,请联系管理员 %s 将您添加至企业"),
+    COMPANY_NAME_HASREGISTER(52000, "企业已开通saas服务,请联系管理员 %s 将您添加至企业"),
     COMPANY_CODE_EXIST(52001, "公司商业登记证号已注册"),
     COMPANY_DOMAIN_EXIST(52002, "域名已存在"),
-    COMPANY_NOT_EXIST(52003, "公司不存在"),
+    COMPANY_NOT_EXIST(52003, "企业不存在"),
     COMPANY_NOT_BIND(52004, "未绑定该公司"),
     USER_NAME_EXIST(53000, "用户名已注册"),
     USER_MOBILE_EXIST(53001, "手机号已注册"),
@@ -45,11 +45,11 @@ public enum ExceptionCode implements BaseExceptionCode {
     USER_NOT_ENABLE(53006, "用户禁止使用"),
     ROLE_NOT_EXIST(53020, "角色不存在"),
     MISSING_PERMISSIONS(53030, "权限缺失"),
-    USER_COMPANY_EXIST(53007, "企业已存在账户"),
-    ROLE_HAS_USE(54030, "存在已使用该角色的账户,不允许删除"),
-    APPLY_DOING_EXIST(54031, "已存在待处理的加入申请"),
-    HAS_BIND_COMPANY(54032, "已加入企业"),
-    SMS_VALIDCODE_EXPIRE(54033, "短信验证码已过期"),
+    USER_COMPANY_EXIST(53007, "该账户已在企业服务中"),
+    ROLE_HAS_USE(54030, "该角色已有账户使用，不允许删除"),
+    APPLY_DOING_EXIST(54031, "您已申请加入此企业，管理员处理中，请勿重复申请"),
+    HAS_BIND_COMPANY(54032, "您的账户已存在该企业服务中，请勿重复加入"),
+    SMS_VALIDCODE_EXPIRE(54033, "短信验证码已过期，请重新获取"),
     SMS_VALIDCODE_ERROR(54034, "短信验证码错误"),
 
     // 文件相关