From dacf6715218c6061d53220b456c75a559bc5af8f Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 14 三月 2025 11:30:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 b2a6af1..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,7 +1,9 @@
package com.mes.glassinfo.service;
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;
@@ -19,7 +21,7 @@
* 鏌ヨ灏忕墖琛�
* @return List<GlassInfo>
*/
- List<GlassInfo> selectGlassInfo(String engineeringId);
+ List<GlassInfo> selectGlassInfo(Engineering engineeringId);
/**
* 淇濆瓨灏忕墖琛�
*/
@@ -33,7 +35,10 @@
List<Map<String, Object>> getFlowCardId();
+ List<HollowGlassInfoDTO> listBySize(String engineerId);
+ void deleteTask(String engineerId);
+ List<GlassInfo> selectEdgGlassInfo(String engineering);
}
--
Gitblit v1.8.0