From b4880ab912b26c55ee1d5314f9a4443d57d3c030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Mon, 15 Apr 2024 17:19:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20pbom=E6=AD=A3=E5=BC=8F=E8=A1=A8=E5=88=86?=
 =?UTF-8?q?=E5=B7=A5=E5=8E=82=E9=A1=B5=E9=9D=A2=E6=95=B0=E6=8D=AE=E6=8C=89?=
 =?UTF-8?q?ordernnum=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/service/domain/PBom/PBomDetailTask.java        | 8 ++++++--
 .../resources/mapper/master/BomNewPbomParentMapper.xml    | 5 ++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomDetailTask.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomDetailTask.java
index ed98bc11..3d4b2f13 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomDetailTask.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/PBom/PBomDetailTask.java
@@ -116,9 +116,13 @@ public class PBomDetailTask extends RecursiveTask<List<BomNewPbomParentVO>> {
         }
 
         if (CollUtil.isNotEmpty(bomDetail)) {
-            List<Long> childBowIds = bomDetail.stream().filter(u -> u.getBomRowId() > 0).map(u -> u.getBomRowId()).collect(Collectors.toList());
+            List<Long> childBowIds = bomDetail.stream().map(BomNewPbomParentVO::getBomRowId).filter(bomRowId -> bomRowId > 0).collect(Collectors.toList());
             if (CollUtil.isNotEmpty(childBowIds)) {
-                List<BomNewPbomChildEntity> children = SpringUtil.getBean(BomNewPbomChildService.class).lambdaQuery().in(BomNewPbomChildEntity::getParentRowId, childBowIds).list();
+                List<BomNewPbomChildEntity> children = SpringUtil.getBean(BomNewPbomChildService.class)
+                        .lambdaQuery()
+                        .in(BomNewPbomChildEntity::getParentRowId, childBowIds)
+                        .orderByAsc(BomNewPbomChildEntity::getOrderNumber)
+                        .list();
                 List<BomNewPbomParentVO> bom = Convert.toList(BomNewPbomParentVO.class, children);
 
                 PBomDetailTask task = new PBomDetailTask(bom, countLevelState,levelNum);
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml
index 0edcee8f..0aa28317 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml
@@ -138,7 +138,10 @@
     </select>
 
     <select id="getParentChild" resultType="com.nflg.product.bomnew.pojo.vo.BomNewPbomParentVO">
-        select * from t_bom_new_pbom_child where parent_row_id=#{parentRowId}
+        select *
+        from t_bom_new_pbom_child
+        where parent_row_id = #{parentRowId}
+        order by order_number
     </select>
     <!--bom发布-->
     <update id="bomRelease">