From 4a18917359594ecfbdb7d0933e9d2f30b259f9f3 Mon Sep 17 00:00:00 2001
From: 10001392 <1055202292@qq.com>
Date: Mon, 9 Dec 2024 14:01:29 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B7=A5=E8=89=BA=E8=B7=AF=E7=BA=BF?=
 =?UTF-8?q?=E3=80=91=E8=8E=B7=E5=8F=96PBOM=E5=88=97=E8=A1=A8=EF=BC=8C?=
 =?UTF-8?q?=E5=BA=8F=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/technology/job/PBomFormalTreeTask.java    | 3 ++-
 .../com/nflg/product/technology/pojo/vo/BomNewPBomVO.java  | 3 +++
 .../product/technology/pojo/vo/BomNewPbomParentVO.java     | 7 ++++++-
 .../technology/service/ProcessRouteTaskService.java        | 7 ++++---
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/job/PBomFormalTreeTask.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/job/PBomFormalTreeTask.java
index 6f759c68..9e16bd0e 100644
--- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/job/PBomFormalTreeTask.java
+++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/job/PBomFormalTreeTask.java
@@ -58,7 +58,8 @@ public class PBomFormalTreeTask extends RecursiveTask<List<BomNewPbomParentVO>>
             for (BomNewPbomParentVO vo :
                     bomDetail) {
                 vo.setLevelNum(levelNum);
-                vo.setOrderNumber(inCountNum.getAndIncrement() + "");
+                vo.setOrderNumberTemp(inCountNum.getAndIncrement() + "");
+                vo.setOrderNumber(vo.getOrderNumber());
             }
 
 
diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/BomNewPBomVO.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/BomNewPBomVO.java
index dea5950a..7f731819 100644
--- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/BomNewPBomVO.java
+++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/BomNewPBomVO.java
@@ -24,6 +24,9 @@ public class BomNewPBomVO extends BaseMaterialVO  {
 
 
 
+    @ApiModelProperty("排序号（临时）")
+    private  String orderNumberTemp;
+
     @ApiModelProperty("排序号")
     private  String orderNumber;
 
diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/BomNewPbomParentVO.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/BomNewPbomParentVO.java
index f46680b8..f6fb7bde 100644
--- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/BomNewPbomParentVO.java
+++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/BomNewPbomParentVO.java
@@ -50,13 +50,18 @@ public class BomNewPbomParentVO extends BaseMaterialVO implements Serializable {
     private String facCode;
 
 
+    /**
+     * 排序号（临时）
+     */
+    @ApiModelProperty(value = "排序号")
+    private String orderNumberTemp;
+
     /**
      * 排序号
      */
     @ApiModelProperty(value = "排序号")
     private String orderNumber;
 
-
     /**
      * 单重
      */
diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessRouteTaskService.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessRouteTaskService.java
index 13216319..f291c3fe 100644
--- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessRouteTaskService.java
+++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessRouteTaskService.java
@@ -326,6 +326,7 @@ public class ProcessRouteTaskService extends ServiceImpl<ProcessRouteTaskMapper,
                 }
                 item.setSapOrderNum(BomUtil.generateSapOrderNum(item.getProjectType(), item.getMaterialCategoryCode()
                         , item.getFacCode(), item.getMaterialNo(), item.getBomExist()));
+                item.setLevelNum(item.getLevelNum() - 1); // 最顶级不返回，所以-1
             });
             // 最顶级不返回
             nodesList.remove(0);
@@ -364,7 +365,7 @@ public class ProcessRouteTaskService extends ServiceImpl<ProcessRouteTaskMapper,
 
                     BomNewPBomVO pop = majorStack.poll();
                     if (pop != null) {
-                        pop.setOrderNumber(noCode.incrementAndGet() + "");
+                        pop.setOrderNumberTemp(noCode.incrementAndGet() + "");
                         rootList.add(pop);
                         List<BomNewPBomVO> childNode = listMap.get(pop.getBomRowId());
                         if (CollectionUtil.isNotEmpty(childNode)) {
@@ -386,7 +387,7 @@ public class ProcessRouteTaskService extends ServiceImpl<ProcessRouteTaskMapper,
         List<BomNewPBomVO> rootList = null;
         //列表
         rootList = listToList(bomList, parentRowId);
-        Collections.sort(rootList, (option0, option1) -> Integer.parseInt(option0.getOrderNumber()) - Integer.parseInt(option1.getOrderNumber()));
+        Collections.sort(rootList, (option0, option1) -> Integer.parseInt(option0.getOrderNumberTemp()) - Integer.parseInt(option1.getOrderNumberTemp()));
         return rootList;
     }
 
@@ -449,7 +450,7 @@ public class ProcessRouteTaskService extends ServiceImpl<ProcessRouteTaskMapper,
         List<BomNewPbomParentVO> bomDetails =new ArrayList<>();
         List<BomNewPbomParentVO> childs = bomDetailList(parentBomRow.getRowId(),parentBomRow.getFacCode());
         parentBomRow.setLevelNum(1);
-        parentBomRow.setOrderNumber("1");
+        parentBomRow.setOrderNumberTemp("1");
         bomDetails.add(parentBomRow);
         if(CollUtil.isNotEmpty(childs)){
             bomDetails.addAll(childs);