From 959a3e15699e4547706b05f07dff190b503d2390 Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期五, 17 一月 2025 11:32:30 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject --- hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassRelationInfoController.java | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassRelationInfoController.java b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassRelationInfoController.java index 7bddf61..7d72eb5 100644 --- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassRelationInfoController.java +++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassRelationInfoController.java @@ -3,10 +3,13 @@ import com.mes.hollow.entity.dto.FlowCardGlassInfoDTO; import com.mes.hollow.entity.dto.LackDetailsDTO; +import com.mes.hollow.entity.vo.HollowBigStorageDetailsQueryVO; import com.mes.hollow.service.HollowGlassRelationInfoService; import com.mes.utils.Result; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -20,6 +23,7 @@ * @author makejava * @since 2024-11-23 15:59:27 */ +@Api(tags = "娴佺▼鍗″叧绯�") @RestController @RequestMapping("hollowGlassRelationInfo") public class HollowGlassRelationInfoController { @@ -29,8 +33,8 @@ @ApiOperation("鐣岄潰鐐瑰嚮鍒涘缓浠诲姟锛氭煡璇腑绌烘墍鏈夋祦绋嬪崱瀵瑰簲鐨勭幓鐠冧俊鎭�") @PostMapping("/queryHollowAllFlowCard") - public Result<Map<String, List<FlowCardGlassInfoDTO>>> queryHollowAllFlowCard() { - Map<String, List<FlowCardGlassInfoDTO>> bigStorageCageDetails = hollowGlassRelationInfoService.queryHollowAllFlowCard(); + public Result<Map<String, List<FlowCardGlassInfoDTO>>> queryHollowAllFlowCard(@RequestBody HollowBigStorageDetailsQueryVO query) { + Map<String, List<FlowCardGlassInfoDTO>> bigStorageCageDetails = hollowGlassRelationInfoService.queryHollowAllFlowCard(query); return Result.success(bigStorageCageDetails); } @@ -41,5 +45,12 @@ return Result.success(lackDetailsList); } +// @ApiOperation("鏌ヨ鎸囧畾娴佺▼鍗″強灞傛暟鐨勭己鐗囪鎯�") +// @PostMapping("/queryLackByFlowCard") +// public Result<List<LackDetailsDTO>> queryLackByFlowCard(String flowCardId) { +// List<LackDetailsDTO> lackDetailsList = hollowGlassRelationInfoService.queryLackByFlowCard(flowCardId); +// return Result.success(lackDetailsList); +// } + } -- Gitblit v1.8.0