生产退料任务

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

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobMainController.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.productionreturnJob.vo.*;
+import com.win.module.wms.convert.productionreturnJob.ProductionreturnJobDetailConvert;
 import com.win.module.wms.convert.productionreturnJob.ProductionreturnJobMainConvert;
+import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobDetailDO;
 import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobMainDO;
+import com.win.module.wms.service.productionreturnJob.ProductionreturnJobDetailService;
 import com.win.module.wms.service.productionreturnJob.ProductionreturnJobMainService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -37,6 +40,9 @@ public class ProductionreturnJobMainController {
     @Resource
     private ProductionreturnJobMainService productionreturnJobMainService;
 
+    @Resource
+    private ProductionreturnJobDetailService productionreturnJobDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -121,4 +127,22 @@ public class ProductionreturnJobMainController {
         return success(result);
     }
 
+    @GetMapping("/getProductionreturnJobById")
+    @Operation(summary = "APP获得生产退料主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:productionreturn-job-main:query')")
+    public CommonResult<ProductionreturnJobMainRespVO> getProductionreturnJobById(@RequestParam("id") Long id) {
+        ProductionreturnJobMainDO productionreturnJobMain = productionreturnJobMainService.getProductionreturnJobMain(id);
+        ProductionreturnJobMainRespVO result = ProductionreturnJobMainConvert.INSTANCE.convert(productionreturnJobMain);
+        if(result==null) {
+            return success(result);
+        };
+        ProductionreturnJobDetailExportReqVO productionreturnJobDetailExportReqVO = new ProductionreturnJobDetailExportReqVO();
+        productionreturnJobDetailExportReqVO.setMasterId(result.getId());
+        List<ProductionreturnJobDetailDO> productionreturnJobDetailList = productionreturnJobDetailService.getProductionreturnJobDetailList(productionreturnJobDetailExportReqVO);
+        List<ProductionreturnJobDetailExcelVO> productionreturnJobDetailExcelVOS = ProductionreturnJobDetailConvert.INSTANCE.convertList02(productionreturnJobDetailList);
+        result.setSubList(productionreturnJobDetailExcelVOS);
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobDetailExportReqVO.java

@@ -79,4 +79,7 @@ public class ProductionreturnJobDetailExportReqVO {
     @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/productionreturnJob/vo/ProductionreturnJobMainRespVO.java

@@ -3,10 +3,15 @@ package com.win.module.wms.controller.productionreturnJob.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 ProductionreturnJobMainRespVO extends ProductionreturnJobMainBaseVO {
 
+    @Schema(description = "生产退料子表job_productionreturn_detail", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
+
 }