From 04502e0ce301a09c76c2374b66ab728c4dd7ddd1 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Wed, 8 Nov 2023 15:32:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=20=E6=A0=B9=E6=8D=AEid=E6=9F=A5=E8=AF=A2=E4=B8=BB?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8F=8A=E5=AD=90=E4=BB=BB=E5=8A=A1=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=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 --- .../CustomerreturnJobMainController.java | 24 +++++++++++++++++++ .../CustomerreturnJobDetailExportReqVO.java | 5 +++- .../vo/CustomerreturnJobDetailPageReqVO.java | 2 +- .../vo/CustomerreturnJobMainRespVO.java | 5 ++++ .../CustomerreturnJobDetailDO.java | 2 +- .../CustomerreturnJobDetailMapper.java | 4 ++-- 6 files changed, 37 insertions(+), 5 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobMainController.java index 7a1bcc3e..6a3c7bbe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobMainController.java @@ -4,6 +4,9 @@ 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.controller.customerreturnJob.vo.*; +import com.win.module.wms.convert.customerreturnJob.CustomerreturnJobDetailConvert; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobDetailDO; +import com.win.module.wms.service.customerreturnJob.CustomerreturnJobDetailService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -40,6 +43,9 @@ public class CustomerreturnJobMainController { @Resource private CustomerreturnJobMainService customerreturnJobMainService; + @Resource + private CustomerreturnJobDetailService customerreturnJobDetailService; + @Resource private AdminUserApi userApi; @@ -123,4 +129,22 @@ public class CustomerreturnJobMainController { ExcelUtils.write(response, "客户退货任务主.xls", "数据", CustomerreturnJobMainExcelVO.class, datas); } + @GetMapping("/getCustomerreturnJobById") + @Operation(summary = "APP获得客户退货任务主子表明细列表") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:customerreturn-job-main:query')") + public CommonResult getCustomerreturnJobById(@RequestParam("id") Long id) { + CustomerreturnJobMainDO customerreturnJobMain = customerreturnJobMainService.getCustomerreturnJobMain(id); + CustomerreturnJobMainRespVO result = CustomerreturnJobMainConvert.INSTANCE.convert(customerreturnJobMain); + if(result==null) { + return success(result); + }; + CustomerreturnJobDetailExportReqVO reqVO = new CustomerreturnJobDetailExportReqVO(); + reqVO.setMasterId(result.getId()); + List customerreturnJobDetailList = customerreturnJobDetailService.getCustomerreturnJobDetailList(reqVO); + List customerreturnJobDetailExcelVOS = CustomerreturnJobDetailConvert.INSTANCE.convertList02(customerreturnJobDetailList); + result.setSubList(customerreturnJobDetailExcelVOS); + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailExportReqVO.java index 2e3eceac..7c34244f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailExportReqVO.java @@ -71,9 +71,12 @@ public class CustomerreturnJobDetailExportReqVO { @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createtime; + private LocalDateTime[] createTime; @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/customerreturnJob/vo/CustomerreturnJobDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailPageReqVO.java index 39a1f2f2..c74a7e62 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailPageReqVO.java @@ -73,7 +73,7 @@ public class CustomerreturnJobDetailPageReqVO extends PageParam { @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createtime; + private LocalDateTime[] createTime; @Schema(description = "创建者Id") private String creator; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobMainRespVO.java index 9499c75a..855a04c2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobMainRespVO.java @@ -3,10 +3,15 @@ package com.win.module.wms.controller.customerreturnJob.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 CustomerreturnJobMainRespVO extends CustomerreturnJobMainBaseVO { + @Schema(description = "客户退货任务子表job_customerreturn_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/customerreturnJob/CustomerreturnJobDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnJob/CustomerreturnJobDetailDO.java index 18ca8969..0d924036 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnJob/CustomerreturnJobDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnJob/CustomerreturnJobDetailDO.java @@ -109,7 +109,7 @@ public class CustomerreturnJobDetailDO extends BaseDO { /** * 创建时间 */ - private LocalDateTime createtime; + //private LocalDateTime createtime; /** * 地点ID */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnJob/CustomerreturnJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnJob/CustomerreturnJobDetailMapper.java index 496a90d5..9de69599 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnJob/CustomerreturnJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customerreturnJob/CustomerreturnJobDetailMapper.java @@ -40,7 +40,7 @@ public interface CustomerreturnJobDetailMapper extends BaseMapperX