制品收货任务

根据id查询主任务及子任务信息

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