From fb83dca188a0adfd73cd42401d79d781dfbbbd58 Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Tue, 9 Apr 2024 16:56:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=9B=E5=BB=BAbom=20?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=A4=8D=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/bomnew/api/user/EbomApi.java |  7 +++--
 .../service/BomNewEbomParentService.java      | 16 ++++++++++--
 .../bomnew/service/domain/EBom/EBomEdit.java  | 26 +++++++++++++------
 3 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java
index d656043f..2c3d1da6 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/EbomApi.java
@@ -260,8 +260,7 @@ public class EbomApi extends BaseApi {
         dto.setRevertUserName(SessionUtil.getUserName());
         dto.setUserCode(SessionUtil.getUserCode());
         bomNewEbomParentService.revertDesign(dto);
-        //更新-待复核根节点
-        bomNewEbomParentService.getBaseMapper().updateRootForWaitReview();
+
 
         return ResultVO.success(true);
 
@@ -367,7 +366,7 @@ public class EbomApi extends BaseApi {
         checkDeleteRule(dto);
         bomNewEbomParentService.deleteBomChild(dto.getDelDatas());
         BomNewEbomParentVO temporary = bomNewEbomParentService.temporary(dto);
-        bomNewEbomParentService.getBaseMapper().updateRootForWaitReview();
+
         return ResultVO.success(temporary);
     }
 
@@ -378,7 +377,7 @@ public class EbomApi extends BaseApi {
         checkDeleteRule(dto);
         bomNewEbomParentService.deleteBomChild(dto.getDelDatas());
         BomNewEbomParentVO temporary = bomNewEbomParentService.temporary(dto);
-        bomNewEbomParentService.getBaseMapper().updateRootForWaitReview();
+       // bomNewEbomParentService.getBaseMapper().updateRootForWaitReview();
         return ResultVO.success(temporary);
     }
 
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 174df938..4022db9a 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
@@ -1174,7 +1174,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             }
 
 
-
+            //更新-待复核根节点
+           getBaseMapper().updateRootForWaitReview();
         }
 
 
@@ -1260,7 +1261,9 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
                     .set(BomNewEbomParentEntity::getAuditUserName, SessionUtil.getUserName())
                     .set(BomNewEbomParentEntity::getStatus, EBomStatusEnum.CHECKED.getValue())
                     .set(BomNewEbomParentEntity::getEditStatus, EbomEditStatusEnum.HANDLER_FINISHED.getValue())
+                    .set(BomNewEbomParentEntity::getRootIsForWaitReview,0)
                     .set(BomNewEbomParentEntity::getRevertDesc,"")
+
                     .in(BomNewEbomParentEntity::getRowId, updateReviewIdList);
 
             //child表状态变更
@@ -1651,6 +1654,13 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
         ebomChildService.getBaseMapper().updateEBomMaterialUse();
 //        ThreadUtil.execAsync(() -> computeLevelNumAndRootState());
 
+        if (eBomEdit.isRootForWaitReview()) {
+            this.getBaseMapper().updateRootForWaitReview();
+        }
+
+
+
+
         BomNewEbomParentVO retParentVO = Convert.convert(BomNewEbomParentVO.class, eBomEdit.getParentEntity());
         retParentVO.setBomRowId(retParentVO.getRowId());
 
@@ -1713,7 +1723,9 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
         superMaterialStatus(dto.getDatas());
 
         // checkAndSaveEBomException(dto.getParent().getBomRowId());
-
+        if (eBomEdit.isRootForWaitReview()) {
+            this.getBaseMapper().updateRootForWaitReview();
+        }
 
         return true;
 
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 0c89558a..4d475faa 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
@@ -40,6 +40,8 @@ public class EBomEdit {
     public List<BomNewEbomParentEntity> parentEntities;
     @Getter
     private BomNewEbomParentEntity parentEntity;
+    @Getter
+    private boolean isRootForWaitReview=false;
 
     public List<BomNewEbomChildEntity> childEntities;
 
@@ -78,9 +80,16 @@ public class EBomEdit {
         parent.setEditStatus(EbomEditStatusEnum.HANDLER_CREATED.getValue());
         parent.setExceptionStatus(EBomExceptionStatusEnum.OK.getValue());
 
+       boolean isTechnician= SpringUtil.getBean(UserRoleService.class).technician();
+        parent.setStatus(isTechnician? EBomStatusEnum.CHECKED.getValue() : EBomStatusEnum.WAIT_CHECK.getValue());
+        parent.setCreatedJob(isTechnician? UserJobEnum.ENGINEER.getValue() : UserJobEnum.DESIGNER.getValue());
 
-        parent.setStatus(SpringUtil.getBean(UserRoleService.class).technician() ? EBomStatusEnum.CHECKED.getValue() : EBomStatusEnum.WAIT_CHECK.getValue());
-        parent.setCreatedJob(SpringUtil.getBean(UserRoleService.class).technician() ? UserJobEnum.ENGINEER.getValue() : UserJobEnum.DESIGNER.getValue());
+        //工艺人不用更新
+        if(isTechnician){
+            isRootForWaitReview=false;
+        }else{
+            isRootForWaitReview=true;
+        }
 
         parent.setCreatedTime(LocalDateTime.now());
         parent.setModifyTime(LocalDateTime.now());
@@ -125,12 +134,12 @@ public class EBomEdit {
         });
 
 
-        if (Objects.equals(createDTO.getOpType(), EbomEditStatusEnum.HANDLER_FINISHED.getValue())) {
-            //工艺人员
-            if (roleList.contains(EBomConstant.TECHNICIAN)) {
-                parentEntity.setStatus(EBomStatusEnum.CHECKED.getValue());
-            }
-        }
+//        if (Objects.equals(createDTO.getOpType(), EbomEditStatusEnum.HANDLER_FINISHED.getValue())) {
+//            //工艺人员
+//            if (roleList.contains(EBomConstant.TECHNICIAN)) {
+//                parentEntity.setStatus(EBomStatusEnum.CHECKED.getValue());
+//            }
+//        }
 
         childEntities.addAll(updateOrCreateChild(createDTO));
 
@@ -293,6 +302,7 @@ public class EBomEdit {
         //rowId is null 必定是未入库作为根
         if (dto.getParent().getRowId() == null || dto.getParent().getRowId().longValue() == 0) {
             createRootBom(dto);
+
             return;
         }