From 8022f1532e7121316179d06111c9d9d781fc14fe Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Tue, 7 Nov 2023 18:54:15 +0800 Subject: [PATCH 1/4] =?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)); From bac8d37d273205f560727622650138e6f4dc9289 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Tue, 7 Nov 2023 18:55:57 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8F=91=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 --- .../issueJob/IssueJobMainController.java | 23 +++++++++++++++++++ .../vo/IssueJobDetailExportReqVO.java | 3 +++ .../issueJob/vo/IssueJobMainRespVO.java | 4 ++++ 3 files changed, 30 insertions(+) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java index dc32f486..af7cb02d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java @@ -3,6 +3,9 @@ package com.win.module.wms.controller.issueJob; 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.convert.issueJob.IssueJobDetailConvert; +import com.win.module.wms.dal.dataobject.issueJob.IssueJobDetailDO; +import com.win.module.wms.service.issueJob.IssueJobDetailService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -38,6 +41,8 @@ public class IssueJobMainController { @Resource private IssueJobMainService issueJobMainService; + @Resource + private IssueJobDetailService issueJobDetailService; @Resource private AdminUserApi userApi; @@ -122,4 +127,22 @@ public class IssueJobMainController { ExcelUtils.write(response, "发料任务主.xls", "数据", IssueJobMainExcelVO.class, datas); } + @GetMapping("/getIssueJobById") + @Operation(summary = "APP获得发料任务主子表明细列表") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:issue-job-main:query')") + public CommonResult getIssueJobById(@RequestParam("id") Long id) { + IssueJobMainDO issueJobMain = issueJobMainService.getIssueJobMain(id); + IssueJobMainRespVO result = IssueJobMainConvert.INSTANCE.convert(issueJobMain); + if(result==null) { + return success(result); + }; + IssueJobDetailExportReqVO issueJobDetailExportReqVO = new IssueJobDetailExportReqVO(); + issueJobDetailExportReqVO.setMasterId(result.getId()); + List issueJobDetailList = issueJobDetailService.getIssueJobDetailList(issueJobDetailExportReqVO); + List issueJobDetailExcelVOS = IssueJobDetailConvert.INSTANCE.convertList02(issueJobDetailList); + result.setSubList(issueJobDetailExcelVOS); + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobDetailExportReqVO.java index 3d45f04a..c034b021 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobDetailExportReqVO.java @@ -94,4 +94,7 @@ public class IssueJobDetailExportReqVO { @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/issueJob/vo/IssueJobMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainRespVO.java index d4b18c7f..e836a99c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainRespVO.java @@ -3,10 +3,14 @@ package com.win.module.wms.controller.issueJob.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 IssueJobMainRespVO extends IssueJobMainBaseVO { + @Schema(description = "发料任务子表job_issue_detail", requiredMode = Schema.RequiredMode.REQUIRED) + private List subList; } From 8efbf9a0fcdc0491d2d6fdd669369f5634f600bc Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Tue, 7 Nov 2023 18:58:01 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=8F=91=E6=96=99?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=20=E6=A0=B9=E6=8D=AEid=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=B8=BB=E4=BB=BB=E5=8A=A1=E5=8F=8A=E5=AD=90=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductionreceiptJobMainController.java | 24 +++++++++++++++++++ ...ProductionreceiptJobDetailExportReqVO.java | 3 +++ .../vo/ProductionreceiptJobMainRespVO.java | 5 ++++ 3 files changed, 32 insertions(+) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobMainController.java index ce9434fb..76da0fe2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobMainController.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.productionreceiptJob.vo.*; +import com.win.module.wms.convert.productionreceiptJob.ProductionreceiptJobDetailConvert; import com.win.module.wms.convert.productionreceiptJob.ProductionreceiptJobMainConvert; +import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobDetailDO; import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobMainDO; +import com.win.module.wms.service.productionreceiptJob.ProductionreceiptJobDetailService; import com.win.module.wms.service.productionreceiptJob.ProductionreceiptJobMainService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -37,6 +40,9 @@ public class ProductionreceiptJobMainController { @Resource private ProductionreceiptJobMainService productionreceiptJobMainService; + @Resource + private ProductionreceiptJobDetailService productionreceiptJobDetailService; + @Resource private AdminUserApi userApi; @PostMapping("/create") @@ -120,4 +126,22 @@ public class ProductionreceiptJobMainController { return success(result); } + @GetMapping("/gettProductionreceiptJobById") + @Operation(summary = "APP获得生产发料主子表明细列表") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:productionreceipt-job-main:query')") + public CommonResult gettProductionreceiptJobById(@RequestParam("id") Long id) { + ProductionreceiptJobMainDO productionreceiptJobMain = productionreceiptJobMainService.getProductionreceiptJobMain(id); + ProductionreceiptJobMainRespVO result = ProductionreceiptJobMainConvert.INSTANCE.convert(productionreceiptJobMain); + if(result==null) { + return success(result); + }; + ProductionreceiptJobDetailExportReqVO productionreceiptJobDetailExportReqVO = new ProductionreceiptJobDetailExportReqVO(); + productionreceiptJobDetailExportReqVO.setMasterId(result.getId()); + List productionreceiptJobDetailList = productionreceiptJobDetailService.getProductionreceiptJobDetailList(productionreceiptJobDetailExportReqVO); + List productionreceiptJobDetailExcelVOS = ProductionreceiptJobDetailConvert.INSTANCE.convertList02(productionreceiptJobDetailList); + result.setSubList(productionreceiptJobDetailExcelVOS); + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobDetailExportReqVO.java index d61ce7aa..e16c486e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobDetailExportReqVO.java @@ -82,4 +82,7 @@ public class ProductionreceiptJobDetailExportReqVO { @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/productionreceiptJob/vo/ProductionreceiptJobMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobMainRespVO.java index 91a1ea69..a7fa9a43 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobMainRespVO.java @@ -3,10 +3,15 @@ package com.win.module.wms.controller.productionreceiptJob.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 ProductionreceiptJobMainRespVO extends ProductionreceiptJobMainBaseVO { + @Schema(description = "生产发料子表job_productionreceipt_detail", requiredMode = Schema.RequiredMode.REQUIRED) + private List subList; + } From 707bfe513ec6643a691bbf5c30324c876e61af53 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Tue, 7 Nov 2023 18:59:37 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=20=E6=A0=B9=E6=8D=AEid=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=B8=BB=E4=BB=BB=E5=8A=A1=E5=8F=8A=E5=AD=90=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductionreturnJobMainController.java | 24 +++++++++++++++++++ .../ProductionreturnJobDetailExportReqVO.java | 3 +++ .../vo/ProductionreturnJobMainRespVO.java | 5 ++++ 3 files changed, 32 insertions(+) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobMainController.java index c8018175..88ef73fa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobMainController.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.productionreturnJob.vo.*; +import com.win.module.wms.convert.productionreturnJob.ProductionreturnJobDetailConvert; import com.win.module.wms.convert.productionreturnJob.ProductionreturnJobMainConvert; +import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobDetailDO; import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobMainDO; +import com.win.module.wms.service.productionreturnJob.ProductionreturnJobDetailService; import com.win.module.wms.service.productionreturnJob.ProductionreturnJobMainService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -37,6 +40,9 @@ public class ProductionreturnJobMainController { @Resource private ProductionreturnJobMainService productionreturnJobMainService; + @Resource + private ProductionreturnJobDetailService productionreturnJobDetailService; + @Resource private AdminUserApi userApi; @@ -121,4 +127,22 @@ public class ProductionreturnJobMainController { return success(result); } + @GetMapping("/getProductionreturnJobById") + @Operation(summary = "APP获得生产退料主子表明细列表") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:productionreturn-job-main:query')") + public CommonResult getProductionreturnJobById(@RequestParam("id") Long id) { + ProductionreturnJobMainDO productionreturnJobMain = productionreturnJobMainService.getProductionreturnJobMain(id); + ProductionreturnJobMainRespVO result = ProductionreturnJobMainConvert.INSTANCE.convert(productionreturnJobMain); + if(result==null) { + return success(result); + }; + ProductionreturnJobDetailExportReqVO productionreturnJobDetailExportReqVO = new ProductionreturnJobDetailExportReqVO(); + productionreturnJobDetailExportReqVO.setMasterId(result.getId()); + List productionreturnJobDetailList = productionreturnJobDetailService.getProductionreturnJobDetailList(productionreturnJobDetailExportReqVO); + List productionreturnJobDetailExcelVOS = ProductionreturnJobDetailConvert.INSTANCE.convertList02(productionreturnJobDetailList); + result.setSubList(productionreturnJobDetailExcelVOS); + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobDetailExportReqVO.java index 4b9e9de6..b407c5e7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobDetailExportReqVO.java @@ -79,4 +79,7 @@ public class ProductionreturnJobDetailExportReqVO { @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/productionreturnJob/vo/ProductionreturnJobMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobMainRespVO.java index 986c4512..3611cdc3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobMainRespVO.java @@ -3,10 +3,15 @@ package com.win.module.wms.controller.productionreturnJob.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 ProductionreturnJobMainRespVO extends ProductionreturnJobMainBaseVO { + @Schema(description = "生产退料子表job_productionreturn_detail", requiredMode = Schema.RequiredMode.REQUIRED) + private List subList; + }