Merge remote-tracking branch 'origin/master'

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<DeliverJobMainRespVO> 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<DeliverJobDetailDO> deliverJobDetailList = deliverJobDetailService.getDeliverJobDetailList(exportReqVO);
+        List<DeliverJobDetailExcelVO> deliverJobDetailExcelVOS = DeliverJobDetailConvert.INSTANCE.convertList02(deliverJobDetailList);
+        result.setSubList(deliverJobDetailExcelVOS);
+        return success(result);
+    }
+
 }

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;
+
+
+
 }

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;
 }

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<InventorymoveJobMainRespVO> 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<InventorymoveJobDetailDO> inventorymoveJobDetailList = inventorymoveJobDetailService.getInventorymoveJobDetailList(exportReqVO);
+        List<InventorymoveJobDetailExcelVO> inventorymoveJobDetailExcelVOS = InventorymoveJobDetailConvert.INSTANCE.convertList02(inventorymoveJobDetailList);
+        result.setSubList(inventorymoveJobDetailExcelVOS);
+        return success(result);
+    }
+
 }

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;
+
 }

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;

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;
+
 }

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<ProductdismantleJobMainRespVO> 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<ProductdismantleJobDetailDO> productdismantleJobDetailList = productdismantleJobDetailService.getProductdismantleJobDetailList(exportReqVO);
+        List<ProductdismantleJobDetailExcelVO> productdismantleJobDetailExcelVOS = ProductdismantleJobDetailConvert.INSTANCE.convertList02(productdismantleJobDetailList);
+        result.setSubList(productdismantleJobDetailExcelVOS);
+        return success(result);
+    }
+
 }

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;
+
 }

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;
 }

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<ProductreceiptJobMainRespVO> 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<ProductreceiptJobDetailDO> productreceiptJobDetailList = productreceiptJobDetailService.getProductreceiptJobDetailList(rxportReqVO);
+        List<ProductreceiptJobDetailExcelVO> productreceiptJobDetailExcelVOS = ProductreceiptJobDetailConvert.INSTANCE.convertList02(productreceiptJobDetailList);
+        result.setSubList(productreceiptJobDetailExcelVOS);
+        return success(result);
+    }
+
 }

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;
+
 }

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;
+
 }

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;
     /**
      * 创建者用户名
      */

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<InventorymoveJ
                 .eqIfPresent(InventorymoveJobDetailDO::getUom, reqVO.getUom())
                 .eqIfPresent(InventorymoveJobDetailDO::getNumber, reqVO.getNumber())
                 .eqIfPresent(InventorymoveJobDetailDO::getRemark, reqVO.getRemark())
-                .betweenIfPresent(InventorymoveJobDetailDO::getCreatetime, reqVO.getCreatetime())
+                .betweenIfPresent(InventorymoveJobDetailDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(InventorymoveJobDetailDO::getCreator, reqVO.getCreator())
                 .eqIfPresent(InventorymoveJobDetailDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(InventorymoveJobDetailDO::getContainerNumber, reqVO.getContainerNumber())
@@ -59,7 +59,7 @@ public interface InventorymoveJobDetailMapper extends BaseMapperX<InventorymoveJ
                 .eqIfPresent(InventorymoveJobDetailDO::getUom, reqVO.getUom())
                 .eqIfPresent(InventorymoveJobDetailDO::getNumber, reqVO.getNumber())
                 .eqIfPresent(InventorymoveJobDetailDO::getRemark, reqVO.getRemark())
-                .betweenIfPresent(InventorymoveJobDetailDO::getCreatetime, reqVO.getCreatetime())
+                .betweenIfPresent(InventorymoveJobDetailDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(InventorymoveJobDetailDO::getCreator, reqVO.getCreator())
                 .eqIfPresent(InventorymoveJobDetailDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(InventorymoveJobDetailDO::getContainerNumber, reqVO.getContainerNumber())