供货商发货记录主子表详细接口

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordMainController.java

@@ -3,7 +3,17 @@ package com.win.module.wms.controller.supplierdeliverRecord;
 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.InspectRequestDetailExcelVO;
+import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailExportReqVO;
+import com.win.module.wms.controller.inspectRequest.vo.InspectRequestMainRespVO;
 import com.win.module.wms.controller.supplierdeliverRecord.vo.*;
+import com.win.module.wms.convert.inspectRequest.InspectRequestDetailConvert;
+import com.win.module.wms.convert.inspectRequest.InspectRequestMainConvert;
+import com.win.module.wms.convert.supplierdeliverRecord.SupplierdeliverRecordDetailConvert;
+import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO;
+import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestMainDO;
+import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO;
+import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordDetailService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -34,6 +44,8 @@ public class SupplierdeliverRecordMainController {
     @Resource
     private SupplierdeliverRecordMainService supplierdeliverRecordMainService;
 
+    @Resource
+    private SupplierdeliverRecordDetailService supplierdeliverRecordDetailService;
     @Resource
     private AdminUserApi userApi;
 
@@ -112,4 +124,22 @@ public class SupplierdeliverRecordMainController {
         ExcelUtils.write(response, "供应商发货记录主.xls", "数据", SupplierdeliverRecordMainExcelVO.class, datas);
     }
 
+    @GetMapping("/getSupplierdeliverRecordById")
+    @Operation(summary = "APP获得供应商发货记录主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:supplierdeliver-record-main:query')")
+    public CommonResult<SupplierdeliverRecordMainRespVO> getSupplierdeliverRecordById(@RequestParam("id") Long id) {
+        SupplierdeliverRecordMainDO supplierdeliverRecordMain = supplierdeliverRecordMainService.getSupplierdeliverRecordMain(id);
+        SupplierdeliverRecordMainRespVO result = SupplierdeliverRecordMainConvert.INSTANCE.convert(supplierdeliverRecordMain);
+        if(result==null) {
+            return success(result);
+        };
+        SupplierdeliverRecordDetailExportReqVO reqVO = new SupplierdeliverRecordDetailExportReqVO();
+        reqVO.setMasterId(result.getId());
+        List<SupplierdeliverRecordDetailDO> list = supplierdeliverRecordDetailService.getSupplierdeliverRecordDetailList(reqVO);
+        List<SupplierdeliverRecordDetailExcelVO> vos = SupplierdeliverRecordDetailConvert.INSTANCE.convertList02(list);
+        result.setSubList(vos);
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordDetailExportReqVO.java

@@ -130,4 +130,7 @@ public class SupplierdeliverRecordDetailExportReqVO {
     @Schema(description = "到批次")
     private String toBatch;
 
+    @Schema(description = "主表id")
+    private Long masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordMainRespVO.java

@@ -3,10 +3,15 @@ package com.win.module.wms.controller.supplierdeliverRecord.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 SupplierdeliverRecordMainRespVO extends SupplierdeliverRecordMainBaseVO {
 
+    @Schema(description = "供应商发货记录子表record_supplierdeliver_detail", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRecord/SupplierdeliverRecordDetailMapper.java

@@ -66,6 +66,7 @@ public interface SupplierdeliverRecordDetailMapper extends BaseMapperX<Supplierd
     }
     default List<SupplierdeliverRecordDetailDO> selectList(SupplierdeliverRecordDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<SupplierdeliverRecordDetailDO>()
+                .eqIfPresent(SupplierdeliverRecordDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(SupplierdeliverRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber())
                 .eqIfPresent(SupplierdeliverRecordDetailDO::getToPackingNumber, reqVO.getToPackingNumber())
                 .eqIfPresent(SupplierdeliverRecordDetailDO::getFromBatch, reqVO.getFromBatch())