计划外出库申请查询主子表详情信息接口

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestMainController.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.unplannedissueRequest.vo.*;
+import com.win.module.wms.convert.unplannedissueRequest.UnplannedissueRequestDetailConvert;
+import com.win.module.wms.dal.dataobject.unplannedissueRequest.UnplannedissueRequestDetailDO;
+import com.win.module.wms.service.unplannedissueRequest.UnplannedissueRequestDetailService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -38,6 +41,9 @@ public class UnplannedissueRequestMainController {
     @Resource
     private UnplannedissueRequestMainService unplannedissueRequestMainService;
 
+    @Resource
+    private UnplannedissueRequestDetailService unplannedissueRequestDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -122,4 +128,22 @@ public class UnplannedissueRequestMainController {
         ExcelUtils.write(response, "计划外出库申请主.xls", "数据", UnplannedissueRequestMainExcelVO.class, datas);
     }
 
+    @GetMapping("/getUnplannedissueRequestById")
+    @Operation(summary = "APP获得计划外出库申请主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:unplannedissue-request-main:query')")
+    public CommonResult<UnplannedissueRequestMainRespVO> getUnplannedissueRequestById(@RequestParam("id") Long id) {
+        UnplannedissueRequestMainDO unplannedissueRequestMain = unplannedissueRequestMainService.getUnplannedissueRequestMain(id);
+        UnplannedissueRequestMainRespVO result = UnplannedissueRequestMainConvert.INSTANCE.convert(unplannedissueRequestMain);
+        if(result==null) {
+            return success(result);
+        };
+        UnplannedissueRequestDetailExportReqVO reqVO = new UnplannedissueRequestDetailExportReqVO();
+        reqVO.setMasterId(result.getId());
+        List<UnplannedissueRequestDetailDO> list = unplannedissueRequestDetailService.getUnplannedissueRequestDetailList(reqVO);
+        List<UnplannedissueRequestDetailExcelVO> vos = UnplannedissueRequestDetailConvert.INSTANCE.convertList02(list);
+        result.setSubList(vos);
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/vo/UnplannedissueRequestDetailExportReqVO.java

@@ -77,4 +77,7 @@ public class UnplannedissueRequestDetailExportReqVO {
     @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/unplannedissueRequest/vo/UnplannedissueRequestMainRespVO.java

@@ -3,10 +3,15 @@ package com.win.module.wms.controller.unplannedissueRequest.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 UnplannedissueRequestMainRespVO extends UnplannedissueRequestMainBaseVO {
 
+    @Schema(description = "计划外出库库申请子表request_unplannedissue_detail", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRequest/UnplannedissueRequestDetailMapper.java

@@ -51,6 +51,7 @@ public interface UnplannedissueRequestDetailMapper extends BaseMapperX<Unplanned
 
     default List<UnplannedissueRequestDetailDO> selectList(UnplannedissueRequestDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<UnplannedissueRequestDetailDO>()
+                .eqIfPresent(UnplannedissueRequestDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(UnplannedissueRequestDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode())
                 .eqIfPresent(UnplannedissueRequestDetailDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(UnplannedissueRequestDetailDO::getContainerNumber, reqVO.getContainerNumber())