diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
index 470c45ab..6a743083 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
@@ -2627,6 +2627,9 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             //转移后删除
             this.getBaseMapper().delEBomHistory(childParentRowIds);
 
+        } else {
+            this.getBaseMapper().insertEBomFormalParent(exceptRowIds);
+            this.getBaseMapper().insertEBomFormalChild(exceptRowIds);
         }
     }
 
diff --git a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/exception/BaseGlobalExceptionHandle.java b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/exception/BaseGlobalExceptionHandle.java
index 6e43b547..838f590e 100644
--- a/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/exception/BaseGlobalExceptionHandle.java
+++ b/nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/exception/BaseGlobalExceptionHandle.java
@@ -1,5 +1,6 @@
 package com.nflg.product.base.core.exception;
 
+import cn.hutool.core.util.StrUtil;
 import lombok.extern.slf4j.Slf4j;
 import nflg.product.common.constant.STATE;
 import nflg.product.common.vo.ResultVO;
@@ -51,7 +52,7 @@ public class BaseGlobalExceptionHandle {
     public ResultVO<String> handleDuplicateKeyException(DuplicateKeyException e) {
         log.error(e.getMessage(), e);
         //return ResultVO.error("已存在该记录，请勿重复操作");
-        return ResultVO.error("已存在该记录，请勿重复操作");
+        return ResultVO.error("数据库存在重复数据");
     }
 
 
@@ -59,8 +60,11 @@ public class BaseGlobalExceptionHandle {
     @ResponseBody
     public ResultVO<String> handleException(Exception e) {
         log.error(e.getMessage(), e);
-        //return ResultVO.error("操作失败，请联系系统管理员");
-        return ResultVO.error("操作失败，请联系系统管理员");
+        if (StrUtil.isNotBlank(e.getMessage()) && e.getMessage().contains("Deadlock")) {
+            return ResultVO.error("操作失败，请重试");
+        } else {
+            return ResultVO.error("操作失败，请联系系统管理员");
+        }
     }
 
     /**