原料退料申请查询主子表详情信息接口

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestMainController.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.productionreturnRequest.vo.*;
+import com.win.module.wms.convert.productionreturnRequest.ProductionreturnRequestDetailConvert;
 import com.win.module.wms.convert.productionreturnRequest.ProductionreturnRequestMainConvert;
+import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestDetailDO;
 import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestMainDO;
+import com.win.module.wms.service.productionreturnRequest.ProductionreturnRequestDetailService;
 import com.win.module.wms.service.productionreturnRequest.ProductionreturnRequestMainService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -37,6 +40,9 @@ public class ProductionreturnRequestMainController {
     @Resource
     private ProductionreturnRequestMainService productionreturnRequestMainService;
 
+    @Resource
+    private ProductionreturnRequestDetailService productionreturnRequestDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -121,4 +127,22 @@ public class ProductionreturnRequestMainController {
         return success(result);
     }
 
+    @GetMapping("/getProductionreturnRequestById")
+    @Operation(summary = "APP获得生产退料申请主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:productionreturn-request-main:query')")
+    public CommonResult<ProductionreturnRequestMainRespVO> getProductionreturnRequestById(@RequestParam("id") Long id) {
+        ProductionreturnRequestMainDO productionreturnRequestMain = productionreturnRequestMainService.getProductionreturnRequestMain(id);
+        ProductionreturnRequestMainRespVO result = ProductionreturnRequestMainConvert.INSTANCE.convert(productionreturnRequestMain);
+        if(result==null) {
+            return success(result);
+        };
+        ProductionreturnRequestDetailExportReqVO reqVO = new ProductionreturnRequestDetailExportReqVO();
+        reqVO.setMasterId(result.getId());
+        List<ProductionreturnRequestDetailDO> list = productionreturnRequestDetailService.getProductionreturnRequestDetailList(reqVO);
+        List<ProductionreturnRequestDetailExcelVO> vos = ProductionreturnRequestDetailConvert.INSTANCE.convertList02(list);
+        result.setSubList(vos);
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestDetailExportReqVO.java

@@ -83,4 +83,7 @@ public class ProductionreturnRequestDetailExportReqVO {
     @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/productionreturnRequest/vo/ProductionreturnRequestMainRespVO.java

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

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRequest/ProductionreturnRequestDetailMapper.java

@@ -53,6 +53,7 @@ public interface ProductionreturnRequestDetailMapper extends BaseMapperX<Product
 
     default List<ProductionreturnRequestDetailDO> selectList(ProductionreturnRequestDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductionreturnRequestDetailDO>()
+                .eqIfPresent(ProductionreturnRequestDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(ProductionreturnRequestDetailDO::getProductionLineCode, reqVO.getProductionLineCode())
                 .eqIfPresent(ProductionreturnRequestDetailDO::getWorkStationCode, reqVO.getWorkStationCode())
                 .eqIfPresent(ProductionreturnRequestDetailDO::getInventoryStatus, reqVO.getInventoryStatus())