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 orderIds = Set.of(orderId); List packPartsList = orderPartsMapper.selectPackedParts(orderIds, packageNo); List packPlateList = orderPlateMapper.selectPackedPlateList(orderIds, packageNo); - packPlateList.addAll(packPartsList); - return packPlateList; + + Collection resultList = buildPackPlateGroup(packPlateList); + resultList.addAll(buildPackPartsGroup(packPartsList)); + return CollUtil.newArrayList(resultList); } @Override