From 42a5b9c6ab89afb0f0564a0d1ded2e90c58bb4ae Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Fri, 2 Aug 2024 10:21:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A4=9A=E4=B8=AA=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E5=8D=95=E6=89=93=E5=8C=85=E4=BF=A1=E6=81=AF-?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8C=85=E8=A3=B9ID=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/pack/vo/PlateDetailsRespVO.java | 6 ++++++ .../module/manage/service/pack/PackServiceImpl.java | 11 +++++++++++ .../module/manage/dal/mysql/query/OrderItemMapper.xml | 2 ++ 3 files changed, 19 insertions(+) diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PlateDetailsRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PlateDetailsRespVO.java index 5aaa1bf49..780ad44dc 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PlateDetailsRespVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/pack/vo/PlateDetailsRespVO.java @@ -16,6 +16,12 @@ import java.util.List; @ExcelIgnoreUnannotated public class PlateDetailsRespVO { + @Schema(description = "包裹ID", requiredMode = Schema.RequiredMode.REQUIRED) + private Long packageId; + + @Schema(description = "包裹号", requiredMode = Schema.RequiredMode.REQUIRED) + private String packageNo; + @Schema(description = "房间名称", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("房间名称") private String roomName; diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java index d63fde6ed..7a48e9035 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java @@ -220,6 +220,12 @@ public class PackServiceImpl implements PackService { List plateDetailsRespVOS = orderItemMapper.selectOrdersPlateList(orderIds, getUserOrganId()); + List packageIds = plateDetailsRespVOS.stream().map(PlateDetailsRespVO::getPackageId).distinct().toList(); + + List orderPackageDOS = orderPackageMapper.selectBatchIds(packageIds); + + + for (PlateDetailsRespVO plateDetailsRespVO : plateDetailsRespVOS) { String name = ""; if(!plateDetailsRespVO.getProcessGroupNameList().isEmpty()) { @@ -230,6 +236,11 @@ public class PackServiceImpl implements PackService { name = name.substring(0, name.length() - 1); } plateDetailsRespVO.setProcessGroup(name); + + plateDetailsRespVO.setPackageNo(orderPackageDOS.stream() + .filter(m -> m.getId().equals(plateDetailsRespVO.getPackageId())) + .map(OrderPackageDO::getPackageNo).findFirst().orElse("")); + } return plateDetailsRespVOS; diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.xml index d2bc94b42..92089cd21 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.xml +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/OrderItemMapper.xml @@ -118,6 +118,7 @@ + @@ -429,6 +430,7 @@ select distinct + oi.package_id as packageId, og.name as name, ob.room_name as roomName, ob.name as bodyName,