From 8b49d68405c9c77aecd4bcce05cf3f328ab23166 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Wed, 8 Nov 2023 14:46:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=B6=E5=93=81=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=20=E6=A0=B9=E6=8D=AEid=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=B8=BB=E4=BB=BB=E5=8A=A1=E5=8F=8A=E5=AD=90=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductreceiptJobMainController.java | 24 +++++++++++++++++++ .../ProductreceiptJobDetailExportReqVO.java | 3 +++ .../vo/ProductreceiptJobMainRespVO.java | 5 ++++ 3 files changed, 32 insertions(+) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobMainController.java index 658c7c85..1908b66c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobMainController.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.productreceiptJob.vo.*; +import com.win.module.wms.convert.productreceiptJob.ProductreceiptJobDetailConvert; import com.win.module.wms.convert.productreceiptJob.ProductreceiptJobMainConvert; +import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobDetailDO; import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobMainDO; +import com.win.module.wms.service.productreceiptJob.ProductreceiptJobDetailService; import com.win.module.wms.service.productreceiptJob.ProductreceiptJobMainService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -37,6 +40,9 @@ public class ProductreceiptJobMainController { @Resource private ProductreceiptJobMainService productreceiptJobMainService; + @Resource + private ProductreceiptJobDetailService productreceiptJobDetailService; + @Resource private AdminUserApi userApi; @@ -122,4 +128,22 @@ public class ProductreceiptJobMainController { return success(result); } + @GetMapping("/getProductreceiptJobById") + @Operation(summary = "APP获得制品收货任务主子表明细列表") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:productreceipt-job-main:query')") + public CommonResult getProductreceiptJobById(@RequestParam("id") Long id) { + ProductreceiptJobMainDO productreceiptJobMain = productreceiptJobMainService.getProductreceiptJobMain(id); + ProductreceiptJobMainRespVO result = ProductreceiptJobMainConvert.INSTANCE.convert(productreceiptJobMain); + if(result==null) { + return success(result); + }; + ProductreceiptJobDetailExportReqVO rxportReqVO = new ProductreceiptJobDetailExportReqVO(); + rxportReqVO.setMasterId(result.getId()); + List productreceiptJobDetailList = productreceiptJobDetailService.getProductreceiptJobDetailList(rxportReqVO); + List productreceiptJobDetailExcelVOS = ProductreceiptJobDetailConvert.INSTANCE.convertList02(productreceiptJobDetailList); + result.setSubList(productreceiptJobDetailExcelVOS); + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobDetailExportReqVO.java index 3a36eaa2..7c89754f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobDetailExportReqVO.java @@ -96,4 +96,7 @@ public class ProductreceiptJobDetailExportReqVO { @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/productreceiptJob/vo/ProductreceiptJobMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobMainRespVO.java index d67c6b58..307d222f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobMainRespVO.java @@ -3,6 +3,8 @@ package com.win.module.wms.controller.productreceiptJob.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import java.util.List; + @Schema(description = "管理后台 - 制品收货任务主 Response VO") @Data @EqualsAndHashCode(callSuper = true) @@ -12,4 +14,7 @@ public class ProductreceiptJobMainRespVO extends ProductreceiptJobMainBaseVO { @Schema(description = "并发乐观锁") private String concurrencyStamp; + @Schema(description = "制品收货任务子表job_productreceipt_detail", requiredMode = Schema.RequiredMode.REQUIRED) + private List subList; + } From 1b537e4a17604693712630965135f746643422fe Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Wed, 8 Nov 2023 14:49:03 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=B6=E5=93=81=E6=8B=86=E8=A7=A3?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=20=E6=A0=B9=E6=8D=AEid=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=B8=BB=E4=BB=BB=E5=8A=A1=E5=8F=8A=E5=AD=90=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductdismantleJobMainController.java | 24 +++++++++++++++++++ .../ProductdismantleJobDetailExportReqVO.java | 3 +++ .../vo/ProductdismantleJobMainRespVO.java | 4 ++++ 3 files changed, 31 insertions(+) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobMainController.java index 0fcb2706..71cc6253 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobMainController.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.productdismantleJob.vo.*; +import com.win.module.wms.convert.productdismantleJob.ProductdismantleJobDetailConvert; import com.win.module.wms.convert.productdismantleJob.ProductdismantleJobMainConvert; +import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJobDetailDO; import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJobMainDO; +import com.win.module.wms.service.productdismantleJob.ProductdismantleJobDetailService; import com.win.module.wms.service.productdismantleJob.ProductdismantleJobMainService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -37,6 +40,9 @@ public class ProductdismantleJobMainController { @Resource private ProductdismantleJobMainService productdismantleJobMainService; + @Resource + private ProductdismantleJobDetailService productdismantleJobDetailService; + @Resource private AdminUserApi userApi; @@ -121,4 +127,22 @@ public class ProductdismantleJobMainController { return success(result); } + @GetMapping("/getProductdismantleJobById") + @Operation(summary = "APP获得制品收货任务主子表明细列表") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:productdismantle-job-main:query')") + public CommonResult getProductdismantleJobById(@RequestParam("id") Long id) { + ProductdismantleJobMainDO productdismantleJobMain = productdismantleJobMainService.getProductdismantleJobMain(id); + ProductdismantleJobMainRespVO result = ProductdismantleJobMainConvert.INSTANCE.convert(productdismantleJobMain); + if(result==null) { + return success(result); + }; + ProductdismantleJobDetailExportReqVO exportReqVO = new ProductdismantleJobDetailExportReqVO(); + exportReqVO.setMasterId(result.getId()); + List productdismantleJobDetailList = productdismantleJobDetailService.getProductdismantleJobDetailList(exportReqVO); + List productdismantleJobDetailExcelVOS = ProductdismantleJobDetailConvert.INSTANCE.convertList02(productdismantleJobDetailList); + result.setSubList(productdismantleJobDetailExcelVOS); + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobDetailExportReqVO.java index d53a5c47..47a59a0c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobDetailExportReqVO.java @@ -93,4 +93,7 @@ public class ProductdismantleJobDetailExportReqVO { @Schema(description = "从货主代码") private String fromOwnerCode; + @Schema(description = "主表id") + private Long masterId; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobMainRespVO.java index a2bafa3d..2f02afc3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobMainRespVO.java @@ -3,10 +3,14 @@ package com.win.module.wms.controller.productdismantleJob.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 ProductdismantleJobMainRespVO extends ProductdismantleJobMainBaseVO { + @Schema(description = "制品拆解任务子表job_productdismantle_detail", requiredMode = Schema.RequiredMode.REQUIRED) + private List subList; } From df98ce0f4e26e70fe96dfa2389cc511e909398ce Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Wed, 8 Nov 2023 14:56:02 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8F=91=E8=B4=A7=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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverJob/DeliverJobMainController.java | 24 +++++++++++++++++++ .../vo/DeliverJobDetailExportReqVO.java | 5 ++++ .../deliverJob/vo/DeliverJobMainRespVO.java | 4 ++++ 3 files changed, 33 insertions(+) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobMainController.java index 1e313738..3e4c12db 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobMainController.java @@ -3,6 +3,9 @@ package com.win.module.wms.controller.deliverJob; 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.deliverJob.DeliverJobDetailConvert; +import com.win.module.wms.dal.dataobject.deliverJob.DeliverJobDetailDO; +import com.win.module.wms.service.deliverJob.DeliverJobDetailService; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -38,6 +41,9 @@ public class DeliverJobMainController { @Resource private DeliverJobMainService deliverJobMainService; + + @Resource + private DeliverJobDetailService deliverJobDetailService; @Resource private AdminUserApi userApi; @@ -121,4 +127,22 @@ public class DeliverJobMainController { ExcelUtils.write(response, "发货任务主.xls", "数据", DeliverJobMainExcelVO.class, datas); } + @GetMapping("/getDeliverJobById") + @Operation(summary = "APP获得发货任务主子表明细列表") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:deliver-job-main:query')") + public CommonResult getDeliverJobById(@RequestParam("id") Long id) { + DeliverJobMainDO deliverJobMain = deliverJobMainService.getDeliverJobMain(id); + DeliverJobMainRespVO result = DeliverJobMainConvert.INSTANCE.convert(deliverJobMain); + if(result==null) { + return success(result); + }; + DeliverJobDetailExportReqVO exportReqVO = new DeliverJobDetailExportReqVO(); + exportReqVO.setMasterId(result.getId()); + List deliverJobDetailList = deliverJobDetailService.getDeliverJobDetailList(exportReqVO); + List deliverJobDetailExcelVOS = DeliverJobDetailConvert.INSTANCE.convertList02(deliverJobDetailList); + result.setSubList(deliverJobDetailExcelVOS); + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailExportReqVO.java index f5a3d2ee..c4fa15fd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailExportReqVO.java @@ -74,4 +74,9 @@ public class DeliverJobDetailExportReqVO { @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/deliverJob/vo/DeliverJobMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobMainRespVO.java index 9dc1444d..25d1bd58 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobMainRespVO.java @@ -3,10 +3,14 @@ package com.win.module.wms.controller.deliverJob.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 DeliverJobMainRespVO extends DeliverJobMainBaseVO { + @Schema(description = "发货任务子表job_deliver_detail", requiredMode = Schema.RequiredMode.REQUIRED) + private List subList; } From b9738c11d411cd5ba2fc20f3c2fdcd137e9a671b Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Wed, 8 Nov 2023 15:00:46 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=BD=AC=E7=A7=BB?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=20=E6=A0=B9=E6=8D=AEid=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=B8=BB=E4=BB=BB=E5=8A=A1=E5=8F=8A=E5=AD=90=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BB=A5=E5=8F=8A=E4=BF=AE=E6=94=B9=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E6=B6=89=E5=8F=8A=E6=89=80=E6=9C=89createtime?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InventorymoveJobMainController.java | 24 +++++++++++++++++++ .../vo/InventorymoveJobDetailExportReqVO.java | 5 +++- .../vo/InventorymoveJobDetailPageReqVO.java | 2 +- .../vo/InventorymoveJobMainRespVO.java | 5 ++++ .../InventorymoveJobDetailDO.java | 2 +- .../InventorymoveJobDetailMapper.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/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