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

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/PickRequestMainController.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.pickRequest.vo.*;
+import com.win.module.wms.convert.pickRequest.PickRequestDetailConvert;
 import com.win.module.wms.convert.pickRequest.PickRequestMainConvert;
+import com.win.module.wms.dal.dataobject.pickRequest.PickRequestDetailDO;
 import com.win.module.wms.dal.dataobject.pickRequest.PickRequestMainDO;
+import com.win.module.wms.service.pickRequest.PickRequestDetailService;
 import com.win.module.wms.service.pickRequest.PickRequestMainService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -37,6 +40,9 @@ public class PickRequestMainController {
     @Resource
     private PickRequestMainService pickRequestMainService;
 
+    @Resource
+    private PickRequestDetailService pickRequestDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -121,4 +127,23 @@ public class PickRequestMainController {
         return success(result);
     }
 
+    @GetMapping("/getPickRequestById")
+    @Operation(summary = "APP获得拣料申请主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:pick-request-main:query')")
+    public CommonResult<PickRequestMainRespVO> getPickRequestById(@RequestParam("id") Long id) {
+        PickRequestMainDO pickRequestMain = pickRequestMainService.getPickRequestMain(id);
+        PickRequestMainRespVO result = PickRequestMainConvert.INSTANCE.convert(pickRequestMain);
+        if(result==null) {
+            return success(result);
+        };
+        PickRequestDetailExportReqVO reqVO = new PickRequestDetailExportReqVO();
+        reqVO.setMasterId(result.getId());
+        List<PickRequestDetailDO> pickRequestDetailList = pickRequestDetailService.getPickRequestDetailList(reqVO);
+        List<PickRequestDetailExcelVO> vos = PickRequestDetailConvert.INSTANCE.convertList02(pickRequestDetailList);
+        result.setSubList(vos);
+        return success(result);
+    }
+
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/vo/PickRequestDetailExportReqVO.java

@@ -68,4 +68,7 @@ public class PickRequestDetailExportReqVO {
     @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/pickRequest/vo/PickRequestMainRespVO.java

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

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRequest/PickRequestDetailMapper.java

@@ -65,6 +65,7 @@ public interface PickRequestDetailMapper extends BaseMapperX<PickRequestDetailDO
                 .eqIfPresent(PickRequestDetailDO::getUpdater, reqVO.getUpdater())
                 .eqIfPresent(PickRequestDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode())
                 .eqIfPresent(PickRequestDetailDO::getToOwnerCode, reqVO.getToOwnerCode())
+                .eqIfPresent(PickRequestDetailDO::getMasterId, reqVO.getMasterId())
                 .orderByDesc(PickRequestDetailDO::getId));
     }