From 38501272bd653d643ea18930cd402b4fc7535996 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Thu, 28 Dec 2023 11:25:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=99=A8=E5=85=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../containerBind/vo/ContainerBindRecordMainRespVO.java | 3 +++ .../module/wms/service/container/ContainerMainServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/containerBind/vo/ContainerBindRecordMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/containerBind/vo/ContainerBindRecordMainRespVO.java index 942673f4..e183198b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/containerBind/vo/ContainerBindRecordMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/containerBind/vo/ContainerBindRecordMainRespVO.java @@ -6,6 +6,7 @@ import lombok.EqualsAndHashCode; import lombok.ToString; import java.time.LocalDateTime; +import java.util.List; @Schema(description = "管理后台 - 器具绑定记录主 Response VO") @Data @@ -16,4 +17,6 @@ public class ContainerBindRecordMainRespVO extends ContainerBindRecordMainBaseVO @Schema(description = "创建时间") private LocalDateTime createTime; + private List subList; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerMainServiceImpl.java index bbfba50c..3055b609 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerMainServiceImpl.java @@ -159,7 +159,7 @@ public class ContainerMainServiceImpl implements ContainerMainService { ContainerMainRespVO containerMainRespVO = ContainerMainConvert.INSTANCE.convert(containerMainDO); // 查询子表 LambdaQueryWrapper lambdaQueryWrapperDetail = new LambdaQueryWrapper<>(); - lambdaQueryWrapperDetail.eq(ContainerDetailDO::getContentNumber,number); + lambdaQueryWrapperDetail.eq(ContainerDetailDO::getMasterId,containerMainDO.getId()); List list = containerDetailMapper.selectList(lambdaQueryWrapperDetail); List subList = new ArrayList<>();