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

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestMainController.java

@@ -3,6 +3,9 @@ package com.win.module.wms.controller.deliverRequest;
 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.convert.deliverRequest.DeliverRequestDetailConvert;
+import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestDetailDO;
+import com.win.module.wms.service.deliverRequest.DeliverRequestDetailService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -39,6 +42,9 @@ public class DeliverRequestMainController {
     @Resource
     private DeliverRequestMainService deliverRequestMainService;
 
+    @Resource
+    private DeliverRequestDetailService deliverRequestDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -122,4 +128,22 @@ public class DeliverRequestMainController {
         ExcelUtils.write(response, "发货申请主.xls", "数据", DeliverRequestMainExcelVO.class, datas);
     }
 
+    @GetMapping("/getDeliverRequestById")
+    @Operation(summary = "APP获得发货申请主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:deliver-request-main:query')")
+    public CommonResult<DeliverRequestMainRespVO> getDeliverRequestById(@RequestParam("id") Long id) {
+        DeliverRequestMainDO deliverRequestMain = deliverRequestMainService.getDeliverRequestMain(id);
+        DeliverRequestMainRespVO result = DeliverRequestMainConvert.INSTANCE.convert(deliverRequestMain);
+        if(result==null) {
+            return success(result);
+        };
+        DeliverRequestDetailExportReqVO reqVO = new DeliverRequestDetailExportReqVO();
+        reqVO.setMasterId(result.getId());
+        List<DeliverRequestDetailDO> list = deliverRequestDetailService.getDeliverRequestDetailList(reqVO);
+        List<DeliverRequestDetailExcelVO> vos = DeliverRequestDetailConvert.INSTANCE.convertList02(list);
+        result.setSubList(vos);
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestDetailExportReqVO.java

@@ -83,4 +83,7 @@ public class DeliverRequestDetailExportReqVO {
     @Schema(description = "从货主代码")
     private String fromOwnerCode;
 
+    @Schema(description = "主表id")
+    private Long masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestMainRespVO.java

@@ -3,10 +3,14 @@ package com.win.module.wms.controller.deliverRequest.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 DeliverRequestMainRespVO extends DeliverRequestMainBaseVO {
 
+    @Schema(description = "发货申请子表request_deliver_detail", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/deliverRequest/DeliverRequestDetailMapper.java

@@ -53,6 +53,7 @@ public interface DeliverRequestDetailMapper extends BaseMapperX<DeliverRequestDe
 
     default List<DeliverRequestDetailDO> selectList(DeliverRequestDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<DeliverRequestDetailDO>()
+                .eqIfPresent(DeliverRequestDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(DeliverRequestDetailDO::getSoNumber, reqVO.getSoNumber())
                 .eqIfPresent(DeliverRequestDetailDO::getSoLine, reqVO.getSoLine())
                 .eqIfPresent(DeliverRequestDetailDO::getPackingNumber, reqVO.getPackingNumber())