From 413115a082c3b920363bba195a08ae01aabfa77d Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Wed, 10 Jan 2024 23:03:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E9=A1=B9=E6=8E=92=E5=BA=8F=E5=8D=87?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/service/OptionalEbomImportChildService.java     | 5 +++--
 .../bomnew/service/aggreg/AggregOptionConfigService.java   | 7 +++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java
index 5ab0a0f8..f5c10f18 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java
@@ -96,13 +96,14 @@ public class OptionalEbomImportChildService extends ServiceImpl<OptionalEbomImpo
                     .replace(" ",";")
                     .replace("，",";")
                     .replace(",",";");
-            strMaterial=strMaterial.replace("\n","").trim();
-
+            strMaterial=strMaterial.replace("\n","");
 
 
 
 
             List<String> listNo = StrUtil.splitTrim(strMaterial,";");
+            listNo = listNo.stream().filter(str -> !str.trim().replace(" ","").isEmpty()).collect(Collectors.toList());
+
             List<BaseMaterialVO> materialListVo = SpringUtil.getBean(MaterialMainService.class).initMaterialForMaterialNo(listNo);
             if (CollectionUtil.isEmpty(materialListVo)) {
                 throw new NflgBusinessException(STATE.BusinessError, "未查询到物料相关数据");
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/AggregOptionConfigService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/AggregOptionConfigService.java
index 964e32c5..fcbb176f 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/AggregOptionConfigService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/AggregOptionConfigService.java
@@ -122,6 +122,13 @@ public class AggregOptionConfigService {
         }
 
         OptionalEbomConfigAggregVO optionalEbomConfigAggregVO = new OptionalEbomConfigAggregVO();
+
+        try{
+            Collections.sort(listParent, (option0, option1) -> option0.getOptionDrawingNo().compareTo(option1.getOptionDrawingNo()));
+        }catch (Exception e){
+
+        }
+
         optionalEbomConfigAggregVO.setSingleList(listParent);
 
         if (CollectionUtil.isEmpty(mulList)) {