From 721e56d2156cd820beaabd8b4e3e5c06fd87c809 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 04 九月 2025 15:38:23 +0800
Subject: [PATCH] Merge branch 'master' of git://10.153.19.25/YiWuProject
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassRelationInfoController.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassRelationInfoController.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassRelationInfoController.java
index 7d72eb5..a47878a 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassRelationInfoController.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/controller/HollowGlassRelationInfoController.java
@@ -1,8 +1,9 @@
package com.mes.hollow.controller;
-import com.mes.hollow.entity.dto.FlowCardGlassInfoDTO;
+import com.mes.damage.entity.request.DamageRequest;
import com.mes.hollow.entity.dto.LackDetailsDTO;
+import com.mes.hollow.entity.vo.HollowAllFlowCardVO;
import com.mes.hollow.entity.vo.HollowBigStorageDetailsQueryVO;
import com.mes.hollow.service.HollowGlassRelationInfoService;
import com.mes.utils.Result;
@@ -33,9 +34,9 @@
@ApiOperation("鐣岄潰鐐瑰嚮鍒涘缓浠诲姟锛氭煡璇腑绌烘墍鏈夋祦绋嬪崱瀵瑰簲鐨勭幓鐠冧俊鎭�")
@PostMapping("/queryHollowAllFlowCard")
- public Result<Map<String, List<FlowCardGlassInfoDTO>>> queryHollowAllFlowCard(@RequestBody HollowBigStorageDetailsQueryVO query) {
- Map<String, List<FlowCardGlassInfoDTO>> bigStorageCageDetails = hollowGlassRelationInfoService.queryHollowAllFlowCard(query);
- return Result.success(bigStorageCageDetails);
+ public Result<List<HollowAllFlowCardVO>> queryHollowAllFlowCard(@RequestBody HollowBigStorageDetailsQueryVO query) {
+ List<HollowAllFlowCardVO> hollowAllFlowCardVOList = hollowGlassRelationInfoService.queryHollowAllFlowCard(query);
+ return Result.success(hollowAllFlowCardVOList);
}
@ApiOperation("鏌ヨ鎸囧畾娴佺▼鍗″強灞傛暟鐨勭己鐗囪鎯�")
@@ -52,5 +53,11 @@
// return Result.success(lackDetailsList);
// }
+ @ApiOperation("涓┖缂虹墖鐖嗙牬绗兼姤鐮存崯")
+ @PostMapping("/hollowBigStorageGlassDamage")
+ public Result<Boolean> hollowBigStorageGlassDamage(@RequestBody DamageRequest request) {
+ return Result.build(200, "鎶ョ牬鎹熸垚鍔�", hollowGlassRelationInfoService.hollowBigStorageGlassDamage(request));
+ }
+
}
--
Gitblit v1.8.0