From 9ef977ae778d6461def00495f194935fcc7b8884 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Thu, 9 Nov 2023 15:39:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E5=93=81=E4=B8=8A=E6=9E=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=9F=A5=E8=AF=A2=E4=B8=BB=E5=AD=90=E8=A1=A8=E8=AF=A6?= =?UTF-8?q?=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 --- .../ProductputawayJobMainController.java | 24 +++++++++++++++++++ .../ProductputawayJobDetailExportReqVO.java | 3 +++ .../vo/ProductputawayJobMainRespVO.java | 4 ++++ .../ProductputawayJobDetailMapper.java | 1 + 4 files changed, 32 insertions(+) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobMainController.java index d24b8dba..3f3adf91 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobMainController.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.productputawayJob.vo.*; +import com.win.module.wms.convert.productputawayJob.ProductputawayJobDetailConvert; import com.win.module.wms.convert.productputawayJob.ProductputawayJobMainConvert; +import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobDetailDO; import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobMainDO; +import com.win.module.wms.service.productputawayJob.ProductputawayJobDetailService; import com.win.module.wms.service.productputawayJob.ProductputawayJobMainService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -37,6 +40,9 @@ public class ProductputawayJobMainController { @Resource private ProductputawayJobMainService productputawayJobMainService; + @Resource + private ProductputawayJobDetailService productputawayJobDetailService; + @Resource private AdminUserApi userApi; @@ -121,4 +127,22 @@ public class ProductputawayJobMainController { return success(result); } + @GetMapping("/getProductputawayJobById") + @Operation(summary = "APP获得制品上架任务主子表明细列表") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:productputaway-job-main:query')") + public CommonResult getProductputawayJobById(@RequestParam("id") Long id) { + ProductputawayJobMainDO productputawayJobMain = productputawayJobMainService.getProductputawayJobMain(id); + ProductputawayJobMainRespVO result = ProductputawayJobMainConvert.INSTANCE.convert(productputawayJobMain); + if(result==null) { + return success(result); + }; + ProductputawayJobDetailExportReqVO reqVO = new ProductputawayJobDetailExportReqVO(); + reqVO.setMasterId(result.getId()); + List list = productputawayJobDetailService.getProductputawayJobDetailList(reqVO); + List vos = ProductputawayJobDetailConvert.INSTANCE.convertList02(list); + result.setSubList(vos); + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/vo/ProductputawayJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/vo/ProductputawayJobDetailExportReqVO.java index 99023649..33ac9787 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/vo/ProductputawayJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/vo/ProductputawayJobDetailExportReqVO.java @@ -79,4 +79,7 @@ public class ProductputawayJobDetailExportReqVO { @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/productputawayJob/vo/ProductputawayJobMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/vo/ProductputawayJobMainRespVO.java index 0d655617..950fe31f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/vo/ProductputawayJobMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/vo/ProductputawayJobMainRespVO.java @@ -3,10 +3,14 @@ package com.win.module.wms.controller.productputawayJob.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 ProductputawayJobMainRespVO extends ProductputawayJobMainBaseVO { + @Schema(description = "制品上架子表job_productputaway_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/productputawayJob/ProductputawayJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayJob/ProductputawayJobDetailMapper.java index 3976cfa1..b6d2689a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayJob/ProductputawayJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayJob/ProductputawayJobDetailMapper.java @@ -52,6 +52,7 @@ public interface ProductputawayJobDetailMapper extends BaseMapperX selectList(ProductputawayJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() + .eqIfPresent(ProductputawayJobDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(ProductputawayJobDetailDO::getPackingNumber, reqVO.getPackingNumber()) .eqIfPresent(ProductputawayJobDetailDO::getContainerNumber, reqVO.getContainerNumber()) .eqIfPresent(ProductputawayJobDetailDO::getBatch, reqVO.getBatch())