From 21ae3dfd9d2ec160d5f7ae61e1082228c5478dd4 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Wed, 15 Nov 2023 16:52:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E8=B4=A7=E5=95=86=E5=8F=91=E8=B4=A7?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=B8=BB=E5=AD=90=E8=A1=A8=E8=AF=A6=E7=BB=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SupplierdeliverRecordMainController.java | 30 +++++++++++++++++++ ...upplierdeliverRecordDetailExportReqVO.java | 3 ++ .../vo/SupplierdeliverRecordMainRespVO.java | 5 ++++ .../SupplierdeliverRecordDetailMapper.java | 1 + 4 files changed, 39 insertions(+) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordMainController.java index c20ea0bf..13b3f2d6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordMainController.java +++ b/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 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 list = supplierdeliverRecordDetailService.getSupplierdeliverRecordDetailList(reqVO); + List vos = SupplierdeliverRecordDetailConvert.INSTANCE.convertList02(list); + result.setSubList(vos); + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordDetailExportReqVO.java index 261605fd..83af28a2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordDetailExportReqVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordMainRespVO.java index 66cb2637..bc8fbd11 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordMainRespVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRecord/SupplierdeliverRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRecord/SupplierdeliverRecordDetailMapper.java index 7fdaf2b3..32e5cba9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRecord/SupplierdeliverRecordDetailMapper.java +++ b/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 selectList(SupplierdeliverRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() + .eqIfPresent(SupplierdeliverRecordDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(SupplierdeliverRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber()) .eqIfPresent(SupplierdeliverRecordDetailDO::getToPackingNumber, reqVO.getToPackingNumber()) .eqIfPresent(SupplierdeliverRecordDetailDO::getFromBatch, reqVO.getFromBatch())