From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java
index 746b5f4..4b69491 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java
@@ -1,9 +1,12 @@
package com.mes.glassinfo.service;
-import com.mes.glassinfo.entity.GlassInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
import com.github.yulichang.base.MPJBaseService;
+import com.mes.engineering.entity.Engineering;
+import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.glassinfo.entity.dto.HollowGlassInfoDTO;
+
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -14,6 +17,28 @@
* @since 2024-04-29
*/
public interface GlassInfoService extends MPJBaseService<GlassInfo> {
+ /**
+ * 鏌ヨ灏忕墖琛�
+ * @return List<GlassInfo>
+ */
+ List<GlassInfo> selectGlassInfo(Engineering engineeringId);
+ /**
+ * 淇濆瓨灏忕墖琛�
+ */
+ void saveGlassInfo(List<GlassInfo> glassinfo);
- List<GlassInfo> selectGlassInfo(String engineeringId);
+ int getGlassInfoCountByFlowCardId(String flowCardId, int layer);
+
+ /**
+ * @return 鏌ヨ鎵�鏈夊伐绋嬬姸鎬佷笉涓�300涓嶅悓娴佺▼鍗″彿
+ */
+ List<Map<String, Object>> getFlowCardId();
+
+
+ List<HollowGlassInfoDTO> listBySize(String engineerId);
+
+ void deleteTask(String engineerId);
+
+ List<GlassInfo> selectEdgGlassInfo(String engineering);
}
+
--
Gitblit v1.8.0