From 0dbc17e8e36267a473861f1aac723e4c7f9dd91e Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Fri, 12 Jun 2026 16:47:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93bug#1679=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../executor/service/manage/pack/PackServiceImpl.java       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java
index cc75b5454..66dde3639 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java
@@ -1408,8 +1408,10 @@ public class PackServiceImpl implements PackService {
         Set<Long> orderIds = Set.of(orderId);
         List<PackageDetailsRespVO> packPartsList = orderPartsMapper.selectPackedParts(orderIds, packageNo);
         List<PackageDetailsRespVO> packPlateList = orderPlateMapper.selectPackedPlateList(orderIds, packageNo);
-        packPlateList.addAll(packPartsList);
-        return packPlateList;
+
+        Collection<PackageDetailsRespVO> resultList = buildPackPlateGroup(packPlateList);
+        resultList.addAll(buildPackPartsGroup(packPartsList));
+        return CollUtil.newArrayList(resultList);
     }
 
     @Override