From 39a8f28b206679a6a2c388bda9b938e95e1829a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Tue, 18 Jun 2024 09:53:13 +0800
Subject: [PATCH] =?UTF-8?q?fix(ebom):=20=E5=B7=A5=E4=BD=9C=E8=A1=A8?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E6=9A=82=E5=AD=98=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=B2=A1=E6=9C=89=E4=B8=8B=E7=BA=A7=E4=B9=9F=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E5=8F=AF=E4=BB=A5=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/service/BomNewEbomParentService.java   |  8 ++++----
 .../bomnew/service/domain/EBom/EBomEdit.java      | 15 ++++++++++++---
 2 files changed, 16 insertions(+), 7 deletions(-)

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 d996bcee..594fa8ad 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
@@ -1932,10 +1932,10 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
         checkUserRoleAuth(dto.getParent().getCreatedBy());
 
 
-        //暂存数据为空后面不处理
-        if (CollUtil.isEmpty(dto.getDatas())) {
-            return dto.getParent();
-        }
+        //        //暂存数据为空后面不处理
+        //        if (CollUtil.isEmpty(dto.getDatas())) {
+        //            return dto.getParent();
+        //        }
 
 
         EBomEdit eBomEdit = new EBomEdit(EBomSourceEnum.FROM_MDM.getValue());
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java
index 83dd8ae8..636413cc 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java
@@ -14,6 +14,7 @@ import com.nflg.product.bomnew.constant.*;
 import com.nflg.product.bomnew.pojo.dto.BomNewEBomParentEditDTO;
 import com.nflg.product.bomnew.pojo.entity.BomNewEbomChildEntity;
 import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentEntity;
+import com.nflg.product.bomnew.pojo.entity.MaterialMainEntity;
 import com.nflg.product.bomnew.pojo.vo.BaseMaterialVO;
 import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO;
 import com.nflg.product.bomnew.service.BomNewEbomChildService;
@@ -21,6 +22,7 @@ import com.nflg.product.bomnew.service.BomNewEbomParentService;
 import com.nflg.product.bomnew.service.MaterialMainService;
 import com.nflg.product.bomnew.service.UserRoleService;
 import com.nflg.product.bomnew.util.ListCommonUtil;
+import com.nflg.product.bomnew.util.MaterialshouldBomExistUtil;
 import com.nflg.product.bomnew.util.VUtils;
 import com.nflg.product.bomnew.util.VersionUtil;
 import lombok.Getter;
@@ -75,6 +77,11 @@ public class EBomEdit {
         parent.setStatus(EBomStatusEnum.WAIT_CHECK.getValue());
         parent.setNum(new BigDecimal(1));
         parent.setBomExist(1);
+        MaterialMainEntity materialMainEntity = SpringUtil.getBean(MaterialMainService.class).lambdaQuery()
+                .eq(MaterialMainEntity::getMaterialNo, parent.getMaterialNo())
+                .one();
+        parent.setShouldBomExist(MaterialshouldBomExistUtil.checkShouldBomExist(materialMainEntity.getMaterialCategoryCode()
+                , materialMainEntity.getMaterialGetType()) ? 1 : 0);
         parent.setLastVersionIs(1);
         parent.setEditStatus(EbomEditStatusEnum.HANDLER_CREATED.getValue());
         parent.setExceptionStatus(EBomExceptionStatusEnum.OK.getValue());
@@ -132,6 +139,7 @@ public class EBomEdit {
         parentEntity.setRootIs(parentEntity.getMaterialNo().startsWith("31") ? 1 : 0);
         parentEntity.setUserRootIs(1);
         parentEntity.setDeptRowId(SessionUtil.getDepartRowId());
+        parentEntity.setBomExist(CollUtil.isEmpty(createDTO.getDatas()) ? 0 : 1);
 
         createDTO.getDatas().forEach(k -> {
             k.setParentRowId(parentEntity.getRowId());
@@ -274,9 +282,9 @@ public class EBomEdit {
             throw new NflgBusinessException(STATE.Error, "parent 数据不能为空");
         }
 
-        if (CollUtil.isEmpty(dto.getDatas())) {
-            throw new NflgBusinessException(STATE.Error, "datas 数据不能为空");
-        }
+        //        if (CollUtil.isEmpty(dto.getDatas())) {
+        //            throw new NflgBusinessException(STATE.Error, "datas 数据不能为空");
+        //        }
 
         List<String> materialNos = dto.getDatas().stream().map(u -> u.getMaterialNo()).collect(Collectors.toList());
         if(materialNos.contains(dto.getParent().getMaterialNo())){
@@ -356,6 +364,7 @@ public class EBomEdit {
             parentEntity.setModifyTime(LocalDateTime.now());
         }
         parentEntity.setEditStatus(dto.getOpType());
+        parentEntity.setBomExist(CollUtil.isEmpty(dto.getDatas()) ? 0 : 1);
         //提交
         if (Objects.equals(dto.getOpType(), EbomEditStatusEnum.HANDLER_FINISHED.getValue())) {
             //工艺人员