From 7d1a2ab7a375485dcfe589b61205c7c3756d5c0e Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Thu, 9 Nov 2023 11:03:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E6=96=99=E4=B8=8A=E6=9E=B6=E9=80=80?= =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=E6=9F=A5=E8=AF=A2=E4=B8=BB=E5=AD=90?= =?UTF-8?q?=E8=A1=A8=E8=AF=A6=E6=83=85=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PutawayRequestMainController.java | 24 +++++++++++++++++++ .../vo/PutawayRequestDetailExportReqVO.java | 3 +++ .../vo/PutawayRequestMainRespVO.java | 5 ++++ .../PutawayRequestDetailMapper.java | 1 + 4 files changed, 33 insertions(+) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestMainController.java index f0aaee10..d6b0ab97 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestMainController.java @@ -4,6 +4,9 @@ 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.putawayRequest.vo.*; +import com.win.module.wms.convert.putawayRequest.PutawayRequestDetailConvert; +import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestDetailDO; +import com.win.module.wms.service.putawayRequest.PutawayRequestDetailService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -33,6 +36,9 @@ public class PutawayRequestMainController { @Resource private PutawayRequestMainService putawayRequestMainService; + + @Resource + private PutawayRequestDetailService putawayRequestDetailService; @Resource private AdminUserApi userApi; @@ -115,4 +121,22 @@ public class PutawayRequestMainController { ExcelUtils.write(response, "上架申请主.xls", "数据", PutawayRequestMainExcelVO.class, datas); } + @GetMapping("/getPutawayRequestById") + @Operation(summary = "APP获得原料上架申请主子表明细列表") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:putaway-request-main:query')") + public CommonResult getPutawayRequestById(@RequestParam("id") Long id) { + PutawayRequestMainDO putawayRequestMain = putawayRequestMainService.getPutawayRequestMain(id); + PutawayRequestMainRespVO result = PutawayRequestMainConvert.INSTANCE.convert(putawayRequestMain); + if(result==null) { + return success(result); + }; + PutawayRequestDetailExportReqVO reqVO = new PutawayRequestDetailExportReqVO(); + reqVO.setMasterId(result.getId()); + List putawayRequestDetailList = putawayRequestDetailService.getPutawayRequestDetailList(reqVO); + List vos = PutawayRequestDetailConvert.INSTANCE.convertList02(putawayRequestDetailList); + result.setSubList(vos); + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestDetailExportReqVO.java index dbfe3cac..76a9c04f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestDetailExportReqVO.java @@ -83,4 +83,7 @@ public class PutawayRequestDetailExportReqVO { @Schema(description = "到货主代码") private String toOwnerCode; + @Schema(description = "主表id") + private Long masterId; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestMainRespVO.java index 5a7ce892..0e6de5be 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestMainRespVO.java @@ -3,10 +3,15 @@ package com.win.module.wms.controller.putawayRequest.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import java.util.List; + @Schema(description = "管理后台 - 上架申请主 Response VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class PutawayRequestMainRespVO extends PutawayRequestMainBaseVO { + @Schema(description = " 原料上架申请子表request_putaway_detail", requiredMode = Schema.RequiredMode.REQUIRED) + private List subList; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRequest/PutawayRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRequest/PutawayRequestDetailMapper.java index d99e9a7d..ff64c120 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRequest/PutawayRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRequest/PutawayRequestDetailMapper.java @@ -51,6 +51,7 @@ public interface PutawayRequestDetailMapper extends BaseMapperX selectList(PutawayRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() + .eqIfPresent(PutawayRequestDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(PutawayRequestDetailDO::getPackingNumber, reqVO.getPackingNumber()) .eqIfPresent(PutawayRequestDetailDO::getContainerNumber, reqVO.getContainerNumber()) .eqIfPresent(PutawayRequestDetailDO::getBatch, reqVO.getBatch())