From 25df92278ac9f812a87066e788880e762506da83 Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Mon, 11 Dec 2023 18:40:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/OptionalEbomImportChildService.java     | 13 ++++++++-----
 .../bomnew/service/aggreg/OptionalExcelService.java |  9 +++++----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java
index a3a9ca03..4b8863dd 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java
@@ -108,7 +108,7 @@ public class OptionalEbomImportChildService extends ServiceImpl<OptionalEbomImpo
     }
 
 
-    public void  insertOptionAction(OptionalEbomImportChildEntity item){
+    public void  insertOptionAction(OptionalEbomImportChildEntity item) throws NflgBusinessException {
         QueryWrapper<OptionalEbomImportChildEntity> queryWrapper3 = new QueryWrapper<>();
         //  同一个机型下不可以存在相同的物料信息（物料编号），如果是“无”的情况，需同一个机型+同一个选项来做唯一判断
         if (StrUtil.isEmpty(item.getMaterialNo()) && item.getMaterialName().equals("无")) {
@@ -131,11 +131,14 @@ public class OptionalEbomImportChildService extends ServiceImpl<OptionalEbomImpo
             //     item.setUpdatedTime(new Date());
             save(item);
         } else {
-            item.setRowId(childEntity.getRowId());
-
-
-           this.getBaseMapper().updateById(item);
+//            item.setRowId(childEntity.getRowId());
+//           this.getBaseMapper().updateById(item);
+            String bizErr=item.getMaterialNo();
+            if (StrUtil.isEmpty(bizErr)) {
+                bizErr=item.getMaterialName();
+            }
 
+            throw new NflgBusinessException(STATE.BusinessError, "存在相同的数据, "+bizErr);
         }
 
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java
index a74d01c4..7af80e7e 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java
@@ -336,11 +336,12 @@ public class OptionalExcelService {
 
                      childOptionEntity.setCreatedTime(DateUtil.now());
                     optionalEbomImportService.save(childOptionEntity);
-                }else{
-                    childOptionEntity.setParentRowId(parentOptionEntity.getRowId());
-
-                    optionalEbomImportService.updateById(childOptionEntity);
                 }
+//                else{
+//                    childOptionEntity.setParentRowId(parentOptionEntity.getRowId());
+//
+//                    optionalEbomImportService.updateById(childOptionEntity);
+//                }
 
 
                 if (childOptionEntity == null || childOptionEntity.getRowId() == null) {