From afe6bc19be0bab2c46b7e9a59bb7987831e16ae3 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 17 一月 2025 11:18:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassRelationInfoService.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassRelationInfoService.java b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassRelationInfoService.java
index 193473b..b2a3218 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassRelationInfoService.java
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassRelationInfoService.java
@@ -5,6 +5,7 @@
import com.mes.hollow.entity.dto.FlowCardGlassInfoDTO;
import com.mes.hollow.entity.dto.HollowBigStorageDTO;
import com.mes.hollow.entity.dto.LackDetailsDTO;
+import com.mes.hollow.entity.vo.HollowBigStorageDetailsQueryVO;
import java.util.List;
import java.util.Map;
@@ -28,9 +29,12 @@
*/
void generateHollowGlassInfo(String flowCardId, int totalLayer, int layer);
- Map<String, List<FlowCardGlassInfoDTO>> queryHollowAllFlowCard();
+ Map<String, List<FlowCardGlassInfoDTO>> queryHollowAllFlowCard(HollowBigStorageDetailsQueryVO query);
- Map<Integer, List<LackDetailsDTO>> queryLackByFlowCard(String flowCardId);
+ Map<Integer, List<LackDetailsDTO>> queryLackByFlowCard(String flowCardId);
+
+ int queryLayerByFlowCardId(String flowCardId);
+// List<LackDetailsDTO> queryLackByFlowCard(String flowCardId);
}
--
Gitblit v1.8.0