diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/ScrapRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/ScrapRecordMainController.java index 3a4c4c3c..e43b20c8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/ScrapRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/ScrapRecordMainController.java @@ -115,4 +115,12 @@ public class ScrapRecordMainController { ExcelUtils.write(response, "报废出库记录主.xls", "数据", ScrapRecordMainExcelVO.class, datas); } + @GetMapping("/getDetailInfoById") + @Operation(summary = "获取记录根据ID") + @PreAuthorize("@ss.hasPermission('wms:scrap-record-main:query')") + public CommonResult getDetailInfoById(@RequestParam("id") Long id) { + ScrapRecordMainRespVO scrapRecordMainRespVO = scrapRecordMainService.getDetailInfoById(id); + return success(scrapRecordMainRespVO); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordDetailExportReqVO.java index 6483b012..bda79c5b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordDetailExportReqVO.java @@ -92,6 +92,6 @@ public class ScrapRecordDetailExportReqVO { private String jobDetailId; @Schema(description = "主键ID") - private String masterId; + private Long masterId; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordMainRespVO.java index 290bacfb..d824e306 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordMainRespVO.java @@ -1,7 +1,12 @@ package com.win.module.wms.controller.scrapRecord.vo; +import com.win.framework.excel.core.annotations.SubObject; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.util.List; @Schema(description = "管理后台 - 报废出库记录主 Response VO") @Data @@ -9,4 +14,7 @@ import lombok.*; @ToString(callSuper = true) public class ScrapRecordMainRespVO extends ScrapRecordMainBaseVO { + @SubObject + @Schema(description = "子表数据") + private List subList; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordMainController.java index e8550e93..76f52034 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordMainController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.transferreceiptRecord; +import com.win.framework.common.pojo.CommonResult; import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +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.transferreceiptRecord.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.transferreceiptRecord.TransferreceiptRecordMainConvert; +import com.win.module.wms.dal.dataobject.transferreceiptRecord.TransferreceiptRecordMainDO; +import com.win.module.wms.service.transferreceiptRecord.TransferreceiptRecordMainService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.io.IOException; +import java.util.Collection; +import java.util.List; -import com.win.framework.common.pojo.PageResult; -import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - -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.dal.dataobject.transferreceiptRecord.TransferreceiptRecordMainDO; -import com.win.module.wms.convert.transferreceiptRecord.TransferreceiptRecordMainConvert; -import com.win.module.wms.service.transferreceiptRecord.TransferreceiptRecordMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 调拨入库记录主") @RestController @@ -123,4 +121,12 @@ public class TransferreceiptRecordMainController { ExcelUtils.write(response, "调拨入库记录主.xls", "数据", TransferreceiptRecordMainExcelVO.class, datas); } + @GetMapping("/getDetailInfoById") + @Operation(summary = "获取记录根据ID") + @PreAuthorize("@ss.hasPermission('wms:transferreceipt-record-main:query')") + public CommonResult getDetailInfoById(@RequestParam("id") Long id) { + TransferreceiptRecordMainRespVO transferreceiptRecordMainRespVO = transferreceiptRecordMainService.getDetailInfoById(id); + return success(transferreceiptRecordMainRespVO); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/vo/TransferreceiptRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/vo/TransferreceiptRecordDetailExportReqVO.java index 4ab8c938..dd660356 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/vo/TransferreceiptRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/vo/TransferreceiptRecordDetailExportReqVO.java @@ -104,6 +104,6 @@ public class TransferreceiptRecordDetailExportReqVO { private String toBatch; @Schema(description = "主键ID") - private String masterId; + private Long masterId; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/vo/TransferreceiptRecordMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/vo/TransferreceiptRecordMainBaseVO.java index 45a8347e..8ff1b30f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/vo/TransferreceiptRecordMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/vo/TransferreceiptRecordMainBaseVO.java @@ -24,7 +24,6 @@ public class TransferreceiptRecordMainBaseVO { private Long id; @Schema(description = "申请单号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "申请单号不能为空") private String requestNumber; @Schema(description = "任务单号") @@ -51,20 +50,16 @@ public class TransferreceiptRecordMainBaseVO { private String toWarehouseCode; @Schema(description = "出库事务类型", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "出库事务类型不能为空") private String outTransactionType; @Schema(description = "入库事务类型", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "入库事务类型不能为空") private String inTransactionType; @Schema(description = "执行时间", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "执行时间不能为空") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime executeTime; @Schema(description = "生效日期", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "生效日期不能为空") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime activeDate; @@ -77,35 +72,28 @@ public class TransferreceiptRecordMainBaseVO { private LocalDateTime dueTime; @Schema(description = "部门", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "部门不能为空") private String departmentCode; @Schema(description = "代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "代码不能为空") private String code; @Schema(description = "接口类型", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "接口类型不能为空") private String interfaceType; @Schema(description = "单据号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "单据号不能为空") private String number; @Schema(description = "业务类型", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "业务类型不能为空") private String businessType; @Schema(description = "备注") private String remark; @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "创建时间不能为空") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime createTime; @Schema(description = "创建者Id", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "创建者Id不能为空") private String creator; @Schema(description = "从库位类型范围") @@ -124,7 +112,6 @@ public class TransferreceiptRecordMainBaseVO { private String toAreaCodes; @Schema(description = "是否可用", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "是否可用不能为空") private String available; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/vo/TransferreceiptRecordMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/vo/TransferreceiptRecordMainRespVO.java index 5e02ffe2..f374b4a4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/vo/TransferreceiptRecordMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/vo/TransferreceiptRecordMainRespVO.java @@ -1,12 +1,19 @@ package com.win.module.wms.controller.transferreceiptRecord.vo; +import com.win.framework.excel.core.annotations.SubObject; +import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordDetailRespVO; 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 TransferreceiptRecordMainRespVO extends TransferreceiptRecordMainBaseVO { + @SubObject + @Schema(description = "子表数据") + private List subList; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordMainController.java index f3b5764e..dda70bee 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordMainController.java @@ -7,6 +7,7 @@ import com.win.framework.excel.core.util.ExcelUtils; 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.transferreceiptRecord.vo.TransferreceiptRecordMainRespVO; import com.win.module.wms.controller.unplannedissueRecord.vo.*; import com.win.module.wms.convert.unplannedissueRecord.UnplannedissueRecordMainConvert; import com.win.module.wms.dal.dataobject.unplannedissueRecord.UnplannedissueRecordMainDO; @@ -120,4 +121,12 @@ public class UnplannedissueRecordMainController { ExcelUtils.write(response, "计划外出库记录主.xls", "数据", UnplannedissueRecordMainExcelVO.class, datas); } + @GetMapping("/getDetailInfoById") + @Operation(summary = "获取记录根据ID") + @PreAuthorize("@ss.hasPermission('wms:unplannedissue-record-main:query')") + public CommonResult getDetailInfoById(@RequestParam("id") Long id) { + UnplannedissueRecordMainRespVO transferreceiptRecordMainRespVO = unplannedissueRecordMainService.getDetailInfoById(id); + return success(transferreceiptRecordMainRespVO); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordDetailExportReqVO.java index 1292f1b6..8d768ebe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordDetailExportReqVO.java @@ -92,6 +92,6 @@ public class UnplannedissueRecordDetailExportReqVO { private String jobDetailId; @Schema(description = "主键ID") - private String masterId; + private Long masterId; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainBaseVO.java index 584dd7fe..2eb0d34f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainBaseVO.java @@ -24,7 +24,6 @@ public class UnplannedissueRecordMainBaseVO { private Long id; @Schema(description = "申请单号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "申请单号不能为空") private String requestNumber; @Schema(description = "任务单号") @@ -37,12 +36,10 @@ public class UnplannedissueRecordMainBaseVO { private String inTransactionType; @Schema(description = "执行时间", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "执行时间不能为空") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime executeTime; @Schema(description = "生效日期", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "生效日期不能为空") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime activeDate; @@ -55,35 +52,28 @@ public class UnplannedissueRecordMainBaseVO { private LocalDateTime dueTime; @Schema(description = "部门", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "部门不能为空") private String departmentCode; @Schema(description = "接口类型", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "接口类型不能为空") private String interfaceType; @Schema(description = "代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "代码不能为空") private String code; @Schema(description = "单据号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "单据号不能为空") private String number; @Schema(description = "业务类型", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "业务类型不能为空") private String businessType; @Schema(description = "备注") private String remark; @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "创建时间不能为空") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime createTime; @Schema(description = "创建者Id", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "创建者Id不能为空") private String creator; @@ -100,7 +90,6 @@ public class UnplannedissueRecordMainBaseVO { private String fromDockCode; @Schema(description = "是否可用", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "是否可用不能为空") private String available; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainRespVO.java index 3c42b98d..6e8b9abd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainRespVO.java @@ -1,8 +1,12 @@ package com.win.module.wms.controller.unplannedissueRecord.vo; +import com.win.framework.excel.core.annotations.SubObject; +import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordDetailRespVO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import java.util.List; + @Schema(description = "管理后台 - 计划外出库记录主 Response VO") @Data @EqualsAndHashCode(callSuper = true) @@ -12,4 +16,8 @@ public class UnplannedissueRecordMainRespVO extends UnplannedissueRecordMainBase @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED) private String creator; + @SubObject + @Schema(description = "子表数据") + private List subList; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordMainController.java index 298fe1bf..5080021c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordMainController.java @@ -54,7 +54,6 @@ public class UnplannedreceiptRecordMainController { unplannedreceiptRecordMainService.updateUnplannedreceiptRecordMain(updateReqVO); return success(true); } - @DeleteMapping("/delete") @Operation(summary = "删除计划外入库记录主") @@ -120,4 +119,12 @@ public class UnplannedreceiptRecordMainController { ExcelUtils.write(response, "计划外入库记录主.xls", "数据", UnplannedreceiptRecordMainExcelVO.class, datas); } + @GetMapping("/getDetailInfoById") + @Operation(summary = "获取记录根据ID") + @PreAuthorize("@ss.hasPermission('wms:unplannedreceipt-record-main:query')") + public CommonResult getDetailInfoById(@RequestParam("id") Long id) { + UnplannedreceiptRecordMainRespVO unplannedreceiptRecordMainRespVO = unplannedreceiptRecordMainService.getDetailInfoById(id); + return success(unplannedreceiptRecordMainRespVO); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/vo/UnplannedreceiptRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/vo/UnplannedreceiptRecordDetailExportReqVO.java index c66a0c93..1e8a95b1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/vo/UnplannedreceiptRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/vo/UnplannedreceiptRecordDetailExportReqVO.java @@ -105,6 +105,6 @@ public class UnplannedreceiptRecordDetailExportReqVO { private String jobDetailId; @Schema(description = "主键ID") - private String masterId; + private Long masterId; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/vo/UnplannedreceiptRecordMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/vo/UnplannedreceiptRecordMainRespVO.java index 467739c5..f8375f66 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/vo/UnplannedreceiptRecordMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/vo/UnplannedreceiptRecordMainRespVO.java @@ -1,7 +1,12 @@ package com.win.module.wms.controller.unplannedreceiptRecord.vo; +import com.win.framework.excel.core.annotations.SubObject; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.util.List; @Schema(description = "管理后台 - 计划外入库记录主 Response VO") @Data @@ -9,4 +14,7 @@ import lombok.*; @ToString(callSuper = true) public class UnplannedreceiptRecordMainRespVO extends UnplannedreceiptRecordMainBaseVO { + @SubObject + @Schema(description = "子表数据") + private List subList; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainService.java index 64d77aea..19643e43 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainService.java @@ -4,10 +4,7 @@ import java.util.*; import javax.validation.*; import com.win.framework.common.pojo.CustomConditions; -import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordMainCreateReqVO; -import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordMainExportReqVO; -import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordMainPageReqVO; -import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordMainUpdateReqVO; +import com.win.module.wms.controller.scrapRecord.vo.*; import com.win.module.wms.dal.dataobject.scrapRecord.ScrapRecordMainDO; import com.win.framework.common.pojo.PageResult; @@ -79,4 +76,10 @@ public interface ScrapRecordMainService { */ List getScrapRecordMainList(ScrapRecordMainExportReqVO exportReqVO); + /** + * 获取记录明细 + * @param id 记录主键ID + * @return 记录明细 + */ + ScrapRecordMainRespVO getDetailInfoById(Long id); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainServiceImpl.java index 2c7b90f2..df9cef6a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainServiceImpl.java @@ -9,17 +9,12 @@ import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.enums.serialNumber.RuleCodeEnum; import com.win.module.wms.controller.scrapRecord.vo.*; import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO; -import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordDetailCreateReqVO; import com.win.module.wms.convert.scrapRecord.ScrapRecordDetailConvert; import com.win.module.wms.convert.scrapRecord.ScrapRecordMainConvert; -import com.win.module.wms.convert.unplannedissueRecord.UnplannedissueRecordDetailConvert; -import com.win.module.wms.convert.unplannedissueRecord.UnplannedissueRecordMainConvert; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; import com.win.module.wms.dal.dataobject.scrapRecord.ScrapRecordDetailDO; import com.win.module.wms.dal.dataobject.scrapRecord.ScrapRecordMainDO; import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO; -import com.win.module.wms.dal.dataobject.unplannedissueRecord.UnplannedissueRecordDetailDO; -import com.win.module.wms.dal.dataobject.unplannedissueRecord.UnplannedissueRecordMainDO; import com.win.module.wms.dal.mysql.scrapRecord.ScrapRecordDetailMapper; import com.win.module.wms.dal.mysql.scrapRecord.ScrapRecordMainMapper; import com.win.module.wms.service.recordsetting.RecordsettingService; @@ -102,7 +97,7 @@ public class ScrapRecordMainServiceImpl implements ScrapRecordMainService { BeanUtils.copyProperties(recordDetailDO, transactionCreateReqVO); //增加业务类型 transactionCreateReqVO.setBusinessType(businesstypeDO.getCode()); - TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType()); + TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getOutTransactionType()); transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction()); transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode()); transactionCreateReqVO.setBusinessType(scrapRecordMainDO.getBusinessType()); @@ -144,10 +139,12 @@ public class ScrapRecordMainServiceImpl implements ScrapRecordMainService { scrapRecordMainMapper.deleteById(id); } - private void validateScrapRecordMainExists(Long id) { - if (scrapRecordMainMapper.selectById(id) == null) { + private ScrapRecordMainDO validateScrapRecordMainExists(Long id) { + ScrapRecordMainDO scrapRecordMainDO = scrapRecordMainMapper.selectById(id); + if (scrapRecordMainDO == null) { throw exception(SCRAP_RECORD_MAIN_NOT_EXISTS); } + return scrapRecordMainDO; } @Override @@ -170,4 +167,21 @@ public class ScrapRecordMainServiceImpl implements ScrapRecordMainService { return scrapRecordMainMapper.selectList(exportReqVO); } + @Override + public ScrapRecordMainRespVO getDetailInfoById(Long id) { + ScrapRecordMainRespVO scrapRecordMainRespVO = new ScrapRecordMainRespVO(); + ScrapRecordMainDO scrapRecordMainDO = validateScrapRecordMainExists(id); + ScrapRecordDetailExportReqVO reqVO = new ScrapRecordDetailExportReqVO(); + reqVO.setMasterId(id); + List subList = scrapRecordDetailMapper.selectList(reqVO); + BeanUtils.copyProperties(scrapRecordMainDO,scrapRecordMainRespVO); + List detailList = new ArrayList<>(); + for(ScrapRecordDetailDO scrapRecordDetailDO:subList){ + ScrapRecordDetailRespVO scrapRecordDetailRespVO = ScrapRecordDetailConvert.INSTANCE.convert(scrapRecordDetailDO); + detailList.add(scrapRecordDetailRespVO); + } + scrapRecordMainRespVO.setSubList(detailList); + return scrapRecordMainRespVO; + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainService.java index f213389b..09f51bde 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainService.java @@ -2,10 +2,7 @@ package com.win.module.wms.service.transferreceiptRecord; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordMainCreateReqVO; -import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordMainExportReqVO; -import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordMainPageReqVO; -import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordMainUpdateReqVO; +import com.win.module.wms.controller.transferreceiptRecord.vo.*; import com.win.module.wms.dal.dataobject.transferreceiptRecord.TransferreceiptRecordMainDO; import javax.validation.Valid; @@ -80,4 +77,10 @@ public interface TransferreceiptRecordMainService { */ List getTransferreceiptRecordMainList(TransferreceiptRecordMainExportReqVO exportReqVO); + /** + * 返回记录详情数据 + * @param id 记录主键ID + * @return 调拨入库记录主ResponseVO + */ + TransferreceiptRecordMainRespVO getDetailInfoById(Long id); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainServiceImpl.java index 5af45ec2..d9cee79f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainServiceImpl.java @@ -90,6 +90,7 @@ public class TransferreceiptRecordMainServiceImpl implements TransferreceiptReco TransferreceiptRecordDetailDO recordDetailDO = TransferreceiptRecordDetailConvert.INSTANCE.convert(transferreceiptRecordDetailCreateReqVO); recordDetailDO.setNumber(number); recordDetailDO.setMasterId(transferreceiptRecordMainDO.getId()); + recordDetailDO.setId(null); transferreceiptRecordDetailMapper.insert(recordDetailDO); //添加库存事务list @@ -137,10 +138,12 @@ public class TransferreceiptRecordMainServiceImpl implements TransferreceiptReco transferreceiptRecordMainMapper.deleteById(id); } - private void validateTransferreceiptRecordMainExists(Long id) { - if (transferreceiptRecordMainMapper.selectById(id) == null) { + private TransferreceiptRecordMainDO validateTransferreceiptRecordMainExists(Long id) { + TransferreceiptRecordMainDO transferreceiptRecordMainDO = transferreceiptRecordMainMapper.selectById(id); + if (transferreceiptRecordMainDO == null) { throw exception(TRANSFERRECEIPT_RECORD_MAIN_NOT_EXISTS); } + return transferreceiptRecordMainDO; } @Override @@ -163,4 +166,21 @@ public class TransferreceiptRecordMainServiceImpl implements TransferreceiptReco return transferreceiptRecordMainMapper.selectList(exportReqVO); } + @Override + public TransferreceiptRecordMainRespVO getDetailInfoById(Long id) { + TransferreceiptRecordMainRespVO transferreceiptRecordMainRespVO = new TransferreceiptRecordMainRespVO(); + TransferreceiptRecordMainDO transferissueRecordMainDO = validateTransferreceiptRecordMainExists(id); + TransferreceiptRecordDetailExportReqVO reqVO = new TransferreceiptRecordDetailExportReqVO(); + reqVO.setMasterId(id); + List subList = transferreceiptRecordDetailMapper.selectList(reqVO); + BeanUtils.copyProperties(transferissueRecordMainDO,transferreceiptRecordMainRespVO); + List detailList = new ArrayList<>(); + for(TransferreceiptRecordDetailDO transferreceiptRecordDetailDO:subList){ + TransferreceiptRecordDetailRespVO transferreceiptRecordDetailRespVO = TransferreceiptRecordDetailConvert.INSTANCE.convert(transferreceiptRecordDetailDO); + detailList.add(transferreceiptRecordDetailRespVO); + } + transferreceiptRecordMainRespVO.setSubList(detailList); + return transferreceiptRecordMainRespVO; + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainService.java index e576bc76..8c53b718 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainService.java @@ -2,10 +2,7 @@ package com.win.module.wms.service.unplannedissueRecord; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordMainCreateReqVO; -import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordMainExportReqVO; -import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordMainPageReqVO; -import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordMainUpdateReqVO; +import com.win.module.wms.controller.unplannedissueRecord.vo.*; import com.win.module.wms.dal.dataobject.unplannedissueRecord.UnplannedissueRecordMainDO; import javax.validation.Valid; @@ -80,4 +77,10 @@ public interface UnplannedissueRecordMainService { */ List getUnplannedissueRecordMainList(UnplannedissueRecordMainExportReqVO exportReqVO); + /** + * 获取计划外出库记录 + * @param id 计划外出库记录 主键ID + * @return 计划外出库记录主ResponseVO + */ + UnplannedissueRecordMainRespVO getDetailInfoById(Long id); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainServiceImpl.java index 76bbbe49..01e48b8b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainServiceImpl.java @@ -97,7 +97,7 @@ public class UnplannedissueRecordMainServiceImpl implements UnplannedissueRecord BeanUtils.copyProperties(recordDetailDO, transactionCreateReqVO); //增加业务类型 transactionCreateReqVO.setBusinessType(businesstypeDO.getCode()); - TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType()); + TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getOutTransactionType()); transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction()); transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode()); transactionCreateReqVO.setBusinessType(unplannedissueRecordMainDO.getBusinessType()); @@ -134,10 +134,12 @@ public class UnplannedissueRecordMainServiceImpl implements UnplannedissueRecord unplannedissueRecordMainMapper.deleteById(id); } - private void validateUnplannedissueRecordMainExists(Long id) { - if (unplannedissueRecordMainMapper.selectById(id) == null) { + private UnplannedissueRecordMainDO validateUnplannedissueRecordMainExists(Long id) { + UnplannedissueRecordMainDO unplannedissueRecordMainDO = unplannedissueRecordMainMapper.selectById(id); + if (unplannedissueRecordMainDO == null) { throw exception(UNPLANNEDISSUE_RECORD_MAIN_NOT_EXISTS); } + return unplannedissueRecordMainDO; } @Override @@ -165,4 +167,21 @@ public class UnplannedissueRecordMainServiceImpl implements UnplannedissueRecord return unplannedissueRecordMainMapper.selectList(exportReqVO); } + @Override + public UnplannedissueRecordMainRespVO getDetailInfoById(Long id) { + UnplannedissueRecordMainRespVO unplannedissueRecordMainRespVO = new UnplannedissueRecordMainRespVO(); + UnplannedissueRecordMainDO unplannedissueRecordMainDO = validateUnplannedissueRecordMainExists(id); + UnplannedissueRecordDetailExportReqVO reqVO = new UnplannedissueRecordDetailExportReqVO(); + reqVO.setMasterId(id); + List subList = unplannedissueRecordDetailMapper.selectList(reqVO); + BeanUtils.copyProperties(unplannedissueRecordMainDO,unplannedissueRecordMainRespVO); + List detailList = new ArrayList<>(); + for(UnplannedissueRecordDetailDO unplannedissueRecordDetailDO:subList){ + UnplannedissueRecordDetailRespVO unplannedissueRecordDetailRespVO = UnplannedissueRecordDetailConvert.INSTANCE.convert(unplannedissueRecordDetailDO); + detailList.add(unplannedissueRecordDetailRespVO); + } + unplannedissueRecordMainRespVO.setSubList(detailList); + return unplannedissueRecordMainRespVO; + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainService.java index 1dfb4e11..08511448 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainService.java @@ -4,10 +4,7 @@ import java.util.*; import javax.validation.*; import com.win.framework.common.pojo.CustomConditions; -import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptRecordMainCreateReqVO; -import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptRecordMainExportReqVO; -import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptRecordMainPageReqVO; -import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptRecordMainUpdateReqVO; +import com.win.module.wms.controller.unplannedreceiptRecord.vo.*; import com.win.module.wms.dal.dataobject.unplannedreceiptRecord.UnplannedreceiptRecordMainDO; import com.win.framework.common.pojo.PageResult; @@ -80,4 +77,10 @@ public interface UnplannedreceiptRecordMainService { */ List getUnplannedreceiptRecordMainList(UnplannedreceiptRecordMainExportReqVO exportReqVO); + /** + * 计划外入库记录明细 + * @param id 记录主键ID + * @return 记录明细数据 + */ + UnplannedreceiptRecordMainRespVO getDetailInfoById(Long id); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainServiceImpl.java index 340a8f3f..ef6357ae 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainServiceImpl.java @@ -139,10 +139,12 @@ public class UnplannedreceiptRecordMainServiceImpl implements UnplannedreceiptRe unplannedreceiptRecordMainMapper.deleteById(id); } - private void validateUnplannedreceiptRecordMainExists(Long id) { - if (unplannedreceiptRecordMainMapper.selectById(id) == null) { + private UnplannedreceiptRecordMainDO validateUnplannedreceiptRecordMainExists(Long id) { + UnplannedreceiptRecordMainDO unplannedreceiptRecordMainDO = unplannedreceiptRecordMainMapper.selectById(id); + if (unplannedreceiptRecordMainDO == null) { throw exception(UNPLANNEDRECEIPT_RECORD_MAIN_NOT_EXISTS); } + return unplannedreceiptRecordMainDO; } @Override @@ -165,4 +167,21 @@ public class UnplannedreceiptRecordMainServiceImpl implements UnplannedreceiptRe return unplannedreceiptRecordMainMapper.selectList(exportReqVO); } + @Override + public UnplannedreceiptRecordMainRespVO getDetailInfoById(Long id) { + UnplannedreceiptRecordMainRespVO unplannedreceiptRecordMainRespVO = new UnplannedreceiptRecordMainRespVO(); + UnplannedreceiptRecordMainDO unplannedreceiptRecordMainDO = validateUnplannedreceiptRecordMainExists(id); + UnplannedreceiptRecordDetailExportReqVO reqVO = new UnplannedreceiptRecordDetailExportReqVO(); + reqVO.setMasterId(id); + List subList = unplannedreceiptRecordDetailMapper.selectList(reqVO); + BeanUtils.copyProperties(unplannedreceiptRecordMainDO,unplannedreceiptRecordMainRespVO); + List detailList = new ArrayList<>(); + for(UnplannedreceiptRecordDetailDO unplannedreceiptRecordDetailDO:subList){ + UnplannedreceiptRecordDetailRespVO unplannedreceiptRecordDetailRespVO = UnplannedreceiptRecordDetailConvert.INSTANCE.convert(unplannedreceiptRecordDetailDO); + detailList.add(unplannedreceiptRecordDetailRespVO); + } + unplannedreceiptRecordMainRespVO.setSubList(detailList); + return unplannedreceiptRecordMainRespVO; + } + }