From 1ae988d3154d5281209c898e46e9b14ec5495a82 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Wed, 8 Nov 2023 15:29:07 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=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?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E6=95=B4=E7=90=86createtime?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../countJob/CountJobMainController.java | 33 ++++++++++++++++++- .../vo/CountJobDetailExportReqVO.java | 3 ++ .../countJob/vo/CountJobMainRespVO.java | 4 +++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/CountJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/CountJobMainController.java index 8664b5fa..f158cea1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/CountJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/CountJobMainController.java @@ -1,9 +1,17 @@ package com.win.module.wms.controller.countJob; import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.security.core.util.SecurityFrameworkUtils; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.countJob.vo.*; +import com.win.module.wms.controller.rule.vo.RuleRespVO; +import com.win.module.wms.convert.countJob.CountJobDetailConvert; +import com.win.module.wms.dal.dataobject.countJob.CountJobDetailDO; + +import com.win.module.wms.service.countJob.CountJobDetailService; +import com.win.module.wms.service.rule.RuleService; +import io.swagger.v3.core.util.Json; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -26,7 +34,6 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; -import com.win.module.wms.controller.countJob.vo.*; import com.win.module.wms.dal.dataobject.countJob.CountJobMainDO; import com.win.module.wms.convert.countJob.CountJobMainConvert; import com.win.module.wms.service.countJob.CountJobMainService; @@ -40,6 +47,12 @@ public class CountJobMainController { @Resource private CountJobMainService countJobMainService; + @Resource + private CountJobDetailService countJobDetailService; + + @Resource + private RuleService ruleService; + @Resource private AdminUserApi userApi; @@ -122,4 +135,22 @@ public class CountJobMainController { ExcelUtils.write(response, "盘点任务主.xls", "数据", CountJobMainExcelVO.class, datas); } + @GetMapping("/getCountJobById") + @Operation(summary = "APP获得盘点主子表明细列表") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:count-job-main:query')") + public CommonResult getCountJobById(@RequestParam("id") Long id) { + CountJobMainDO countJobMain = countJobMainService.getCountJobMain(id); + CountJobMainRespVO result = CountJobMainConvert.INSTANCE.convert(countJobMain); + if(result==null) { + return success(result); + }; + CountJobDetailExportReqVO reqVO = new CountJobDetailExportReqVO(); + reqVO.setMasterId(result.getId()); + List countJobDetailList = countJobDetailService.getCountJobDetailList(reqVO); + List vos = CountJobDetailConvert.INSTANCE.convertList02(countJobDetailList); + result.setSubList(vos); + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobDetailExportReqVO.java index cc0562a9..a3dba026 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobDetailExportReqVO.java @@ -67,4 +67,7 @@ public class CountJobDetailExportReqVO { @Schema(description = "创建者Id") private String creator; + @Schema(description = "主表id") + private Long masterId; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainRespVO.java index 5224a363..bf970527 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainRespVO.java @@ -3,10 +3,14 @@ package com.win.module.wms.controller.countJob.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 CountJobMainRespVO extends CountJobMainBaseVO { + @Schema(description = "盘点任务子表job_count_detail", requiredMode = Schema.RequiredMode.REQUIRED) + private List subList; }