diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerMainController.java index 5c75bd71..c0a53a94 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerMainController.java @@ -4,6 +4,13 @@ import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.container.vo.*; +import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobDetailExportReqVO; +import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobDetailRespVO; +import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainRespVO; +import com.win.module.wms.convert.transferissueJob.TransferissueJobDetailConvert; +import com.win.module.wms.convert.transferissueJob.TransferissueJobMainConvert; +import com.win.module.wms.dal.dataobject.transferissueJob.TransferissueJobDetailDO; +import com.win.module.wms.dal.dataobject.transferissueJob.TransferissueJobMainDO; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -122,4 +129,13 @@ public class ContainerMainController { ExcelUtils.write(response, "器具主.xls", "数据", ContainerMainExcelVO.class, datas); } + @GetMapping("/getContainerByNumber") + @Operation(summary = "APP获得器具主子表明细列表") + @Parameter(name = "number", description = "编号", required = true, example = "T0011979") + @PreAuthorize("@ss.hasPermission('wms:container-job-main:query')") + public CommonResult getContainerByNumber(@RequestParam("number") String number) { + ContainerMainRespVO containerMainRespVO = containerMainService.getContainerByNumber(number); + return success(containerMainRespVO); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerMainRespVO.java index 64f4a9df..755ff484 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerMainRespVO.java @@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.time.LocalDateTime; +import java.util.List; @Schema(description = "管理后台 - 器具主 Response VO") @Data @@ -16,5 +17,7 @@ public class ContainerMainRespVO extends ContainerMainBaseVO { @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED) private String creator; + @Schema(description = "子表列表数据") + private List subList; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerMainService.java index 7716e32a..066625fd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/container/ContainerMainService.java @@ -4,10 +4,7 @@ import java.util.*; import javax.validation.*; import com.win.framework.common.pojo.CustomConditions; -import com.win.module.wms.controller.container.vo.ContainerMainCreateReqVO; -import com.win.module.wms.controller.container.vo.ContainerMainExportReqVO; -import com.win.module.wms.controller.container.vo.ContainerMainPageReqVO; -import com.win.module.wms.controller.container.vo.ContainerMainUpdateReqVO; +import com.win.module.wms.controller.container.vo.*; import com.win.module.wms.dal.dataobject.container.ContainerMainDO; import com.win.framework.common.pojo.PageResult; @@ -80,4 +77,10 @@ public interface ContainerMainService { */ List getContainerMainList(ContainerMainExportReqVO exportReqVO); + /** + * 根据number获取数据 + * @param number 号码 + * @return + */ + ContainerMainRespVO getContainerByNumber(String number); } 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 e7796653..65d08d72 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 @@ -1,10 +1,11 @@ package com.win.module.wms.service.container; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.win.framework.common.pojo.CustomConditions; -import com.win.module.wms.controller.container.vo.ContainerMainCreateReqVO; -import com.win.module.wms.controller.container.vo.ContainerMainExportReqVO; -import com.win.module.wms.controller.container.vo.ContainerMainPageReqVO; -import com.win.module.wms.controller.container.vo.ContainerMainUpdateReqVO; +import com.win.module.wms.controller.container.vo.*; +import com.win.module.wms.convert.container.ContainerDetailConvert; +import com.win.module.wms.dal.dataobject.container.ContainerDetailDO; +import com.win.module.wms.dal.mysql.container.ContainerDetailMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -32,6 +33,9 @@ public class ContainerMainServiceImpl implements ContainerMainService { @Resource private ContainerMainMapper containerMainMapper; + @Resource + private ContainerDetailMapper containerDetailMapper; + @Override public String createContainerMain(ContainerMainCreateReqVO createReqVO) { // 插入 @@ -87,4 +91,26 @@ public class ContainerMainServiceImpl implements ContainerMainService { return containerMainMapper.selectList(exportReqVO); } + @Override + public ContainerMainRespVO getContainerByNumber(String number) { + // 查询主表 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(ContainerMainDO::getNumber,number); + ContainerMainDO containerMainDO = containerMainMapper.selectOne(lambdaQueryWrapper); + ContainerMainRespVO containerMainRespVO = ContainerMainConvert.INSTANCE.convert(containerMainDO); + // 查询子表 + LambdaQueryWrapper lambdaQueryWrapperDetail = new LambdaQueryWrapper<>(); + lambdaQueryWrapperDetail.eq(ContainerDetailDO::getContentNumber,number); + List list = containerDetailMapper.selectList(lambdaQueryWrapperDetail); + + List subList = new ArrayList<>(); + for(ContainerDetailDO containerDetailDO:list){ + ContainerDetailRespVO containerDetailRespVO = ContainerDetailConvert.INSTANCE.convert(containerDetailDO); + subList.add(containerDetailRespVO); + } + // 主子绑定 + containerMainRespVO.setSubList(subList); + return containerMainRespVO; + } + }