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

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/IssueRequestMainController.java

@@ -5,7 +5,10 @@ import com.win.framework.dict.core.util.DictFrameworkUtils;
 import com.win.framework.excel.core.util.ConvertUtil;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.convert.issueRequest.IssueRequestDetailConvert;
+import com.win.module.wms.dal.dataobject.issueRequest.IssueRequestDetailDO;
 import com.win.module.wms.enums.DictTypeConstants;
+import com.win.module.wms.service.issueRequest.IssueRequestDetailService;
 import io.swagger.v3.oas.annotations.Parameters;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -46,6 +49,9 @@ public class IssueRequestMainController {
     @Resource
     private IssueRequestMainService issueRequestMainService;
 
+    @Resource
+    private IssueRequestDetailService issueRequestDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -170,4 +176,22 @@ public class IssueRequestMainController {
         }
         return success(returnMap);
     }
+
+    @GetMapping("/getIssueRequestById")
+    @Operation(summary = "APP获得发料申请主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:issue-request-main:query')")
+    public CommonResult<IssueRequestMainRespVO> getIssueRequestById(@RequestParam("id") Long id) {
+        IssueRequestMainDO issueRequestMain = issueRequestMainService.getIssueRequestMain(id);
+        IssueRequestMainRespVO result = IssueRequestMainConvert.INSTANCE.convert(issueRequestMain);
+        if(result==null) {
+            return success(result);
+        };
+        IssueRequestDetailExportReqVO reqVO = new IssueRequestDetailExportReqVO();
+        reqVO.setMasterId(result.getId());
+        List<IssueRequestDetailDO> issueRequestDetailList = issueRequestDetailService.getIssueRequestDetailList(reqVO);
+        List<IssueRequestDetailExcelVO> vos = IssueRequestDetailConvert.INSTANCE.convertList02(issueRequestDetailList);
+        result.setSubList(vos);
+        return success(result);
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestDetailExportReqVO.java

@@ -83,4 +83,7 @@ public class IssueRequestDetailExportReqVO {
     @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/issueRequest/vo/IssueRequestMainRespVO.java

@@ -3,10 +3,15 @@ package com.win.module.wms.controller.issueRequest.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 IssueRequestMainRespVO extends IssueRequestMainBaseVO {
 
+    @Schema(description = " 发料申请子表request_issue_detail", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRequest/IssueRequestDetailMapper.java

@@ -51,6 +51,7 @@ public interface IssueRequestDetailMapper extends BaseMapperX<IssueRequestDetail
     }
     default List<IssueRequestDetailDO> selectList(IssueRequestDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<IssueRequestDetailDO>()
+                .eqIfPresent(IssueRequestDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(IssueRequestDetailDO::getProductionLineCode, reqVO.getProductionLineCode())
                 .eqIfPresent(IssueRequestDetailDO::getWorkStationCode, reqVO.getWorkStationCode())
                 .eqIfPresent(IssueRequestDetailDO::getInventoryStatus, reqVO.getInventoryStatus())