From 8022f1532e7121316179d06111c9d9d781fc14fe Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Tue, 7 Nov 2023 18:54:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=A3=E6=96=99=E4=BB=BB=E5=8A=A1=20?= =?UTF-8?q?=E6=A0=B9=E6=8D=AEid=E6=9F=A5=E8=AF=A2=E4=B8=BB=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=8F=8A=E5=AD=90=E4=BB=BB=E5=8A=A1=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pickJob/PickJobMainController.java | 25 +++++++++++++++++++ .../pickJob/vo/PickJobDetailExportReqVO.java | 5 +++- .../pickJob/vo/PickJobDetailPageReqVO.java | 2 +- .../pickJob/vo/PickJobMainRespVO.java | 5 ++++ .../dataobject/pickJob/PickJobDetailDO.java | 2 +- .../mysql/pickJob/PickJobDetailMapper.java | 4 +-- 6 files changed, 38 insertions(+), 5 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobMainController.java index b29d918e..c341b9ca 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobMainController.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.pickJob.vo.*; +import com.win.module.wms.convert.pickJob.PickJobDetailConvert; import com.win.module.wms.convert.pickJob.PickJobMainConvert; +import com.win.module.wms.dal.dataobject.pickJob.PickJobDetailDO; import com.win.module.wms.dal.dataobject.pickJob.PickJobMainDO; +import com.win.module.wms.service.pickJob.PickJobDetailService; import com.win.module.wms.service.pickJob.PickJobMainService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -36,6 +39,9 @@ public class PickJobMainController { @Resource private PickJobMainService pickJobMainService; + + @Resource + private PickJobDetailService pickJobDetailService; @Resource private AdminUserApi userApi; @@ -120,4 +126,23 @@ public class PickJobMainController { return success(result); } + @GetMapping("/getPickJobById") + @Operation(summary = "APP获得拣料任务主子表明细列表") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:pick-job-main:query')") + public CommonResult getPickJobById(@RequestParam("id") Long id) { + PickJobMainDO pickJobMain = pickJobMainService.getPickJobMain(id); + PickJobMainRespVO result = PickJobMainConvert.INSTANCE.convert(pickJobMain); + if(result==null) { + return success(result); + }; + PickJobDetailExportReqVO pickJobDetailExportReqVO = new PickJobDetailExportReqVO(); + pickJobDetailExportReqVO.setMasterId(result.getId()); + List pickJobDetailList = pickJobDetailService.getPickJobDetailList(pickJobDetailExportReqVO); + List pickJobDetailExcelVOS = PickJobDetailConvert.INSTANCE.convertList02(pickJobDetailList); + result.setSubList(pickJobDetailExcelVOS); + return success(result); + } + + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailExportReqVO.java index 0a1a87b6..94364b17 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailExportReqVO.java @@ -65,7 +65,7 @@ public class PickJobDetailExportReqVO { private LocalDateTime[] createTime; @Schema(description = "创建者Id") - private String creatorId; + private String creator; @Schema(description = "从货主代码") private String fromOwnerCode; @@ -73,4 +73,7 @@ public class PickJobDetailExportReqVO { @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/pickJob/vo/PickJobDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailPageReqVO.java index 5ee2d681..9c0a35f4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailPageReqVO.java @@ -67,7 +67,7 @@ public class PickJobDetailPageReqVO extends PageParam { private LocalDateTime[] createTime; @Schema(description = "创建者Id") - private String creatorId; + private String creator; @Schema(description = "从货主代码") private String fromOwnerCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobMainRespVO.java index 9b32763e..b2c560a7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobMainRespVO.java @@ -3,10 +3,15 @@ package com.win.module.wms.controller.pickJob.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 PickJobMainRespVO extends PickJobMainBaseVO { + @Schema(description = "拣料任务子表job_repleinsh_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/dataobject/pickJob/PickJobDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/pickJob/PickJobDetailDO.java index f71c4660..ec56e70b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/pickJob/PickJobDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/pickJob/PickJobDetailDO.java @@ -97,7 +97,7 @@ public class PickJobDetailDO extends BaseDO { /** * 创建者Id */ - private String creatorId; + private String creator; /** * 地点ID */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickJob/PickJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickJob/PickJobDetailMapper.java index b0ae72e5..8c3acdf7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickJob/PickJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickJob/PickJobDetailMapper.java @@ -38,7 +38,7 @@ public interface PickJobDetailMapper extends BaseMapperX { .eqIfPresent(PickJobDetailDO::getNumber, reqVO.getNumber()) .eqIfPresent(PickJobDetailDO::getRemark, reqVO.getRemark()) .betweenIfPresent(PickJobDetailDO::getCreateTime, reqVO.getCreateTime()) - .eqIfPresent(PickJobDetailDO::getCreatorId, reqVO.getCreatorId()) + .eqIfPresent(PickJobDetailDO::getCreator, reqVO.getCreator()) .eqIfPresent(PickJobDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode()) .eqIfPresent(PickJobDetailDO::getToOwnerCode, reqVO.getToOwnerCode()) .orderByDesc(PickJobDetailDO::getId)); @@ -66,7 +66,7 @@ public interface PickJobDetailMapper extends BaseMapperX { .eqIfPresent(PickJobDetailDO::getNumber, reqVO.getNumber()) .eqIfPresent(PickJobDetailDO::getRemark, reqVO.getRemark()) .betweenIfPresent(PickJobDetailDO::getCreateTime, reqVO.getCreateTime()) - .eqIfPresent(PickJobDetailDO::getCreatorId, reqVO.getCreatorId()) + .eqIfPresent(PickJobDetailDO::getCreator, reqVO.getCreator()) .eqIfPresent(PickJobDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode()) .eqIfPresent(PickJobDetailDO::getToOwnerCode, reqVO.getToOwnerCode()) .orderByDesc(PickJobDetailDO::getId));