报废出库申请查询主子表详情信息接口

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestMainController.java

@@ -4,6 +4,9 @@ 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.controller.scrapRequest.vo.*;
+import com.win.module.wms.convert.scrapRequest.ScrapRequestDetailConvert;
+import com.win.module.wms.dal.dataobject.scrapRequest.ScrapRequestDetailDO;
+import com.win.module.wms.service.scrapRequest.ScrapRequestDetailService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -21,6 +24,7 @@ import static com.win.framework.common.pojo.CommonResult.success;
 import com.win.framework.excel.core.util.ExcelUtils;
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
+
 import com.win.module.wms.dal.dataobject.scrapRequest.ScrapRequestMainDO;
 import com.win.module.wms.convert.scrapRequest.ScrapRequestMainConvert;
 import com.win.module.wms.service.scrapRequest.ScrapRequestMainService;
@@ -34,9 +38,13 @@ public class ScrapRequestMainController {
     @Resource
     private ScrapRequestMainService scrapRequestMainService;
 
+    @Resource
+    private ScrapRequestDetailService scrapRequestDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
+
     @PostMapping("/create")
     @Operation(summary = "创建报废出库申请主")
     @PreAuthorize("@ss.hasPermission('wms:scrap-request-main:create')")
@@ -114,4 +122,23 @@ public class ScrapRequestMainController {
         ExcelUtils.write(response, "报废出库申请主.xls", "数据", ScrapRequestMainExcelVO.class, datas);
     }
 
+    @GetMapping("/getScrapRequestById")
+    @Operation(summary = "APP获得报废出库申请主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:scrap-request-main:query')")
+    public CommonResult<ScrapRequestMainRespVO> getScrapRequestById(@RequestParam("id") Long id) {
+
+        ScrapRequestMainDO scrapRequestMain = scrapRequestMainService.getScrapRequestMain(id);
+        ScrapRequestMainRespVO result = ScrapRequestMainConvert.INSTANCE.convert(scrapRequestMain);
+        if(result==null) {
+            return success(result);
+        };
+        ScrapRequestDetailExportReqVO reqVO = new ScrapRequestDetailExportReqVO();
+        reqVO.setMasterId(result.getId());
+        List<ScrapRequestDetailDO> list = scrapRequestDetailService.getScrapRequestDetailList(reqVO);
+        List<ScrapRequestDetailExcelVO> vos = ScrapRequestDetailConvert.INSTANCE.convertList02(list);
+        result.setSubList(vos);
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestDetailExportReqVO.java

@@ -77,4 +77,7 @@ public class ScrapRequestDetailExportReqVO {
     @Schema(description = "最后更新者用户名")
     private String updater;
 
+    @Schema(description = "主表id")
+    private Long masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestMainRespVO.java

@@ -3,10 +3,14 @@ package com.win.module.wms.controller.scrapRequest.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 ScrapRequestMainRespVO extends ScrapRequestMainBaseVO {
 
+    @Schema(description = "报废出库申请子表request_scrap_detail", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRequest/ScrapRequestDetailMapper.java

@@ -50,6 +50,7 @@ public interface ScrapRequestDetailMapper extends BaseMapperX<ScrapRequestDetail
     default List<ScrapRequestDetailDO> selectList(ScrapRequestDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ScrapRequestDetailDO>()
                 .eqIfPresent(ScrapRequestDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode())
+                .eqIfPresent(ScrapRequestDetailDO::getMasterid, reqVO.getMasterId())
                 .eqIfPresent(ScrapRequestDetailDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(ScrapRequestDetailDO::getContainerNumber, reqVO.getContainerNumber())
                 .eqIfPresent(ScrapRequestDetailDO::getBatch, reqVO.getBatch())