From c7e25fcc3cc5ed3a80224680be134d81ba502a93 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Thu, 9 Nov 2023 10:58:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=A3=E6=96=99=E7=94=B3=E8=AF=B7=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=B8=BB=E5=AD=90=E8=A1=A8=E8=AF=A6=E6=83=85=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PickRequestMainController.java | 25 +++++++++++++++++++ .../vo/PickRequestDetailExportReqVO.java | 3 +++ .../pickRequest/vo/PickRequestMainRespVO.java | 5 ++++ .../pickRequest/PickRequestDetailMapper.java | 1 + 4 files changed, 34 insertions(+) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/PickRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/PickRequestMainController.java index 63f3cbd6..b4d4f71a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/PickRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/PickRequestMainController.java @@ -8,8 +8,11 @@ import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.pickRequest.vo.*; +import com.win.module.wms.convert.pickRequest.PickRequestDetailConvert; import com.win.module.wms.convert.pickRequest.PickRequestMainConvert; +import com.win.module.wms.dal.dataobject.pickRequest.PickRequestDetailDO; import com.win.module.wms.dal.dataobject.pickRequest.PickRequestMainDO; +import com.win.module.wms.service.pickRequest.PickRequestDetailService; import com.win.module.wms.service.pickRequest.PickRequestMainService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -37,6 +40,9 @@ public class PickRequestMainController { @Resource private PickRequestMainService pickRequestMainService; + @Resource + private PickRequestDetailService pickRequestDetailService; + @Resource private AdminUserApi userApi; @@ -121,4 +127,23 @@ public class PickRequestMainController { return success(result); } + @GetMapping("/getPickRequestById") + @Operation(summary = "APP获得拣料申请主子表明细列表") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:pick-request-main:query')") + public CommonResult getPickRequestById(@RequestParam("id") Long id) { + PickRequestMainDO pickRequestMain = pickRequestMainService.getPickRequestMain(id); + PickRequestMainRespVO result = PickRequestMainConvert.INSTANCE.convert(pickRequestMain); + if(result==null) { + return success(result); + }; + PickRequestDetailExportReqVO reqVO = new PickRequestDetailExportReqVO(); + reqVO.setMasterId(result.getId()); + List pickRequestDetailList = pickRequestDetailService.getPickRequestDetailList(reqVO); + List vos = PickRequestDetailConvert.INSTANCE.convertList02(pickRequestDetailList); + result.setSubList(vos); + return success(result); + } + + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/vo/PickRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/vo/PickRequestDetailExportReqVO.java index 87ba2f99..ae12b950 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/vo/PickRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/vo/PickRequestDetailExportReqVO.java @@ -68,4 +68,7 @@ public class PickRequestDetailExportReqVO { @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/pickRequest/vo/PickRequestMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/vo/PickRequestMainRespVO.java index 938d3986..85859c39 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/vo/PickRequestMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/vo/PickRequestMainRespVO.java @@ -3,10 +3,15 @@ package com.win.module.wms.controller.pickRequest.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 PickRequestMainRespVO extends PickRequestMainBaseVO { + @Schema(description = "拣料申请子表request_pick_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/pickRequest/PickRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRequest/PickRequestDetailMapper.java index 5d6f73e8..64e3ba3e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRequest/PickRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRequest/PickRequestDetailMapper.java @@ -65,6 +65,7 @@ public interface PickRequestDetailMapper extends BaseMapperX