检验申请主子表详细接口

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java

@@ -4,6 +4,16 @@ 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.inspectRequest.vo.*;
+import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestDetailExcelVO;
+import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestDetailExportReqVO;
+import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestMainRespVO;
+import com.win.module.wms.convert.inspectRequest.InspectRequestDetailConvert;
+import com.win.module.wms.convert.scrapRequest.ScrapRequestDetailConvert;
+import com.win.module.wms.convert.scrapRequest.ScrapRequestMainConvert;
+import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO;
+import com.win.module.wms.dal.dataobject.scrapRequest.ScrapRequestDetailDO;
+import com.win.module.wms.dal.dataobject.scrapRequest.ScrapRequestMainDO;
+import com.win.module.wms.service.inspectRequest.InspectRequestDetailService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -38,6 +48,9 @@ public class InspectRequestMainController {
 
     @Resource
     private InspectRequestMainService inspectRequestMainService;
+
+    @Resource
+    private InspectRequestDetailService inspectRequestDetailService;
     @Resource
     private AdminUserApi userApi;
 
@@ -120,4 +133,22 @@ public class InspectRequestMainController {
         ExcelUtils.write(response, "检验申请主.xls", "数据", InspectRequestMainExcelVO.class, datas);
     }
 
+    @GetMapping("/getInspectRequestById")
+    @Operation(summary = "APP获得检验申请主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:inspect-request-main:query')")
+    public CommonResult<InspectRequestMainRespVO> getInspectRequestById(@RequestParam("id") Long id) {
+        InspectRequestMainDO inspectRequestMain = inspectRequestMainService.getInspectRequestMain(id);
+        InspectRequestMainRespVO result = InspectRequestMainConvert.INSTANCE.convert(inspectRequestMain);
+        if(result==null) {
+            return success(result);
+        };
+        InspectRequestDetailExportReqVO reqVO = new InspectRequestDetailExportReqVO();
+        reqVO.setMasterId(result.getId());
+        List<InspectRequestDetailDO> list = inspectRequestDetailService.getInspectRequestDetailList(reqVO);
+        List<InspectRequestDetailExcelVO> vos = InspectRequestDetailConvert.INSTANCE.convertList02(list);
+        result.setSubList(vos);
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailExportReqVO.java

@@ -55,4 +55,7 @@ public class InspectRequestDetailExportReqVO {
     @Schema(description = "计量单位")
     private String uom;
 
+    @Schema(description = "主表id")
+    private Long masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainRespVO.java

@@ -3,10 +3,15 @@ package com.win.module.wms.controller.inspectRequest.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 InspectRequestMainRespVO extends InspectRequestMainBaseVO {
 
+    @Schema(description = "检验申请子表request_inspect_detail", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRequest/InspectRequestDetailMapper.java

@@ -44,6 +44,7 @@ public interface InspectRequestDetailMapper extends BaseMapperX<InspectRequestDe
 
     default List<InspectRequestDetailDO> selectList(InspectRequestDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<InspectRequestDetailDO>()
+                .eqIfPresent(InspectRequestDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(InspectRequestDetailDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(InspectRequestDetailDO::getContainerNumber, reqVO.getContainerNumber())
                 .eqIfPresent(InspectRequestDetailDO::getInventoryStatus, reqVO.getInventoryStatus())