From 6bbf7fd7b034e445182842ccada33d42605530cb Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Wed, 27 Dec 2023 16:42:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=9B=9E=E5=88=A4=E6=96=AD=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/BomNewEbomParentService.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 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 81161bda..821b8b27 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
@@ -763,7 +763,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 //            List<BomNewEbomParentEntity> waitList = bomNewEbomParentEntityList.stream().filter(item -> item.getStatus().equals(EBomStatusEnum.WAIT_CHECK.getValue())).collect(Collectors.toList());
 //            List<BomNewEbomParentEntity> revertList = bomNewEbomParentEntityList.stream().filter(item -> item.getStatus().equals(EBomStatusEnum.RETURNED.getValue())).collect(Collectors.toList());
 
-            List<BomNewEbomParentVO> pbomList = bomTreeList.stream().filter(item -> item.getStatus().equals(EBomStatusEnum.PUBLISHED.getValue())).collect(Collectors.toList());
+            List<BomNewEbomParentVO> pbomList = bomTreeList.stream().filter(item -> EBomStatusEnum.PUBLISHED.getValue().equals(item.getStatus())).collect(Collectors.toList());
 //        if (CollUtil.isNotEmpty(waitList)) {
 //            List<String> materialNoList = waitList.stream().map(BomNewEbomParentEntity::getMaterialNo).collect(Collectors.toList());
 //
@@ -774,7 +774,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 //
 //            throw new NflgBusinessException(STATE.BusinessError, StrUtil.format("物料编号 {} 状态为已退回，不需要退回设计", StrUtil.join(",", materialNoList)));
 //        }
-            if (pbomList.size() > 0) {
+            if (CollectionUtil.isNotEmpty(pbomList) ) {
                 List<String> materialNoList = pbomList.stream().map(BomNewEbomParentVO::getMaterialNo).collect(Collectors.toList());
                 throw new NflgBusinessException(STATE.BusinessError, StrUtil.format("物料编号 {} 状态为已发布PBOM，无法退回设计", StrUtil.join(",", materialNoList)));
 
@@ -793,7 +793,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
         for (Long rowId : revertList) {
             BomNewEbomParentEntity entity = new BomNewEbomParentEntity();
             entity.setRowId(rowId);
-            entity.setEditStatus(EBomStatusEnum.RETURNED.getValue());
+            entity.setStatus(EBomStatusEnum.RETURNED.getValue());
             entity.setRevertTime(LocalDateTime.now());
             entity.setRevertUserName(dto.getRevertUserName());
             updateList.add(entity);