From f179268e14ab251d8f4f0df68c8edee60ffef933 Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Wed, 20 Mar 2024 11:45:10 +0800
Subject: [PATCH] =?UTF-8?q?ebom=20=E5=B7=A5=E8=89=BA=E5=88=9B=E5=BB=BAbom?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E9=80=80=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/BomNewEbomParentService.java      | 35 +++++++++++++------
 .../bomnew/service/domain/EBom/EBomEdit.java  |  2 +-
 2 files changed, 25 insertions(+), 12 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 d0daa55c..5653cfa4 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
@@ -1057,8 +1057,11 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 
     /**
      * 退回设计
+     * 1.已发布不能退
+     * 2.被工艺岗位添加的物料，不可以退回。但是可以被删除（只能是当前工艺岗位的用户创建的物料）
+     *
      */
-    // @Transactional(rollbackFor = Exception.class)
+      @Transactional(rollbackFor = Exception.class)
     public void revertDesign(BomNewEBomRevertDTO dto) throws ExecutionException, InterruptedException {
         List<Long> rowIds = dto.getRowIdList();
 
@@ -1077,7 +1080,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 
         if (rowIds.size() != bomNewEbomParentEntityList.size()) {
 
-            // throw new NflgBusinessException(STATE.BusinessError, "选择数据中包含有下级BOM无法进行退回");
+
             VUtils.isTure(true).throwMessage("选择数据中包含有下级BOM无法进行退回");
         }
 
@@ -1110,9 +1113,9 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 
             }
 
-            //忽略叶子节点
+            //忽略叶子节点 和  工艺人员
             revertList.addAll(bomTreeList.stream()
-                    .filter(u -> u.getBomRowId() > 0)
+                    .filter(u -> u.getBomRowId() > 0 &&  Objects.equals(UserJobEnum.ENGINEER.getValue(),u.getCreatedJob()))
                     .map(BomNewEbomParentVO::getBomRowId).collect(Collectors.toList()));
 
         }
@@ -1346,7 +1349,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
         if (StringUtils.isNotEmpty(query.getMaterialNo())) {
             materialMainList = materialMainService.lambdaQuery().eq(MaterialMainEntity::getMaterialNo, query.getMaterialNo()).list();
             if (CollUtil.isEmpty(materialMainList)) {
-                throw new NflgBusinessException(STATE.Error, StrUtil.format("{} 物料编码的物料信息不存在", query.getMaterialNo()));
+                throw new NflgBusinessException(STATE.Error, StrUtil.format("{} 物料编码在主数据不存在", query.getMaterialNo()));
             }
             if (CollUtil.isNotEmpty(materialMainList) && materialMainList.size() > 1) {
                 throw new NflgBusinessException(STATE.Error, StrUtil.format("同时存在{}多条相同物料编码的物料信息", query.getMaterialNo()));
@@ -1364,12 +1367,10 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
         }
 
 
-        BomNewEbomParentEntity bomParent = null;
+
         BomNewEbomChildEntity childEntity = null;
 
-        if (query.getBomRowId() != null && query.getBomRowId().longValue() != 0) {
-            bomParent = getById(query.getBomRowId());
-        }
+
         if (query.getRowId() != null && query.getRowId().longValue() != 0) {
             childEntity = SpringUtil.getBean(BomNewEbomChildService.class).getById(query.getRowId());
         }
@@ -1380,12 +1381,24 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             BomNewEbomParentVO baseMaterialVO = new BomNewEbomParentVO();
 
             if (childEntity != null) {
-                BeanUtil.copyProperties(childEntity, baseMaterialVO);
-                if (childEntity.getMaterialNo().equals(materialMainEntity.getMaterialNo())) {
+
+               //编辑查询物料id未变化
+                if (childEntity.getMaterialNo().equals(materialMainEntity.getMaterialNo()) || childEntity.getDrawingNo().equals(materialMainEntity.getDrawingNo())) {
+                    BeanUtil.copyProperties(childEntity, baseMaterialVO);
+                    SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(ImmutableList.of(baseMaterialVO),EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT2);
                     return baseMaterialVO;
                 }
             }
 
+
+
+
+
+            //编辑数据 新增或物料编码已变化
+            BomNewEbomParentEntity bomParent = null;
+            if (query.getBomRowId() != null && query.getBomRowId().longValue() != 0) {
+                bomParent = getById(query.getBomRowId());
+            }
             BeanUtil.copyProperties(materialMainEntity, baseMaterialVO);
             SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(ImmutableList.of(baseMaterialVO));
 
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 dac923d9..aaddbc7d 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
@@ -243,7 +243,7 @@ public class EBomEdit {
             dto.getDatas().forEach(k -> {
                 k.setParentRowId(parentEntity.getRowId());
             });
-            parentEntity.setEditStatus(dto.getOpType());
+          //  parentEntity.setEditStatus(dto.getOpType());
 
         }else{
             parentEntity = Convert.convert(BomNewEbomParentEntity.class, dto.getParent());