diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java index 39ded59d..c9f1135f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java @@ -3,6 +3,9 @@ package com.win.module.wms.controller.inventorymoveJob; 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.inventorymoveJob.InventorymoveJobDetailConvert; +import com.win.module.wms.dal.dataobject.inventorymoveJob.InventorymoveJobDetailDO; +import com.win.module.wms.service.inventorymoveJob.InventorymoveJobDetailService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -39,6 +42,9 @@ public class InventorymoveJobMainController { @Resource private InventorymoveJobMainService inventorymoveJobMainService; + @Resource + private InventorymoveJobDetailService inventorymoveJobDetailService; + @Resource private AdminUserApi userApi; @@ -123,4 +129,22 @@ public class InventorymoveJobMainController { ExcelUtils.write(response, "库存转移任务主.xls", "数据", InventorymoveJobMainExcelVO.class, datas); } + @GetMapping("/getInventorymoveJobById") + @Operation(summary = "APP获得库存转移主子表明细列表") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:inventorymove-job-main:query')") + public CommonResult getInventorymoveJobById(@RequestParam("id") Long id) { + InventorymoveJobMainDO inventorymoveJobMain = inventorymoveJobMainService.getInventorymoveJobMain(id); + InventorymoveJobMainRespVO result = InventorymoveJobMainConvert.INSTANCE.convert(inventorymoveJobMain); + if(result==null) { + return success(result); + }; + InventorymoveJobDetailExportReqVO exportReqVO = new InventorymoveJobDetailExportReqVO(); + exportReqVO.setMasterId(result.getId()); + List inventorymoveJobDetailList = inventorymoveJobDetailService.getInventorymoveJobDetailList(exportReqVO); + List inventorymoveJobDetailExcelVOS = InventorymoveJobDetailConvert.INSTANCE.convertList02(inventorymoveJobDetailList); + result.setSubList(inventorymoveJobDetailExcelVOS); + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailExportReqVO.java index f7cf4433..4828b81b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailExportReqVO.java @@ -44,7 +44,7 @@ public class InventorymoveJobDetailExportReqVO { @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createtime; + private LocalDateTime[] createTime; @Schema(description = "创建者Id") private String creator; @@ -79,4 +79,7 @@ public class InventorymoveJobDetailExportReqVO { @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/inventorymoveJob/vo/InventorymoveJobDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailPageReqVO.java index 4caeafef..85b8a1ee 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailPageReqVO.java @@ -46,7 +46,7 @@ public class InventorymoveJobDetailPageReqVO 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/inventorymoveJob/vo/InventorymoveJobMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobMainRespVO.java index 4092c584..dd055f51 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobMainRespVO.java @@ -3,10 +3,15 @@ package com.win.module.wms.controller.inventorymoveJob.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 InventorymoveJobMainRespVO extends InventorymoveJobMainBaseVO { + @Schema(description = "库存转移任务子表job_inventorymove_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/inventorymoveJob/InventorymoveJobDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveJob/InventorymoveJobDetailDO.java index dba816be..75dbbcbb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveJob/InventorymoveJobDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveJob/InventorymoveJobDetailDO.java @@ -71,7 +71,7 @@ public class InventorymoveJobDetailDO extends BaseDO { /** * 创建时间 */ - private LocalDateTime createtime; + private LocalDateTime createTime; /** * 创建者用户名 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveJob/InventorymoveJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveJob/InventorymoveJobDetailMapper.java index 7a65e9c9..f889a223 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveJob/InventorymoveJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveJob/InventorymoveJobDetailMapper.java @@ -31,7 +31,7 @@ public interface InventorymoveJobDetailMapper extends BaseMapperX