From b21caa5499c50384f3a3a5dd795a7a0ad197d36f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 06 十一月 2025 21:26:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java
index 23f2995..11ee6cf 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java
@@ -19,16 +19,28 @@
public interface TemperingGlassInfoService extends MPJBaseService<TemperingGlassInfo> {
/**
* 绛夊緟涓殑鐜荤拑
+ *
+ * @return
+ */
+ List<TemperingGlassInfo> selectWaitingGlassByOpc();
+
+ /**
+ * 绛夊緟涓殑鐜荤拑
+ *
* @return
*/
List<TemperingGlassInfo> selectWaitingGlass();
+
/**
* 杩涚倝涓殑鐜荤拑
+ *
* @return
*/
List<TemperingGlassInfo> selectIntoGlass(TemperingGlassInfo temperingGlassInfo);
+
/**
* 鍑虹倝涓殑鐜荤拑
+ *
* @return
*/
List<TemperingGlassInfo> selectOutGlass();
@@ -67,4 +79,6 @@
* @return
*/
List<PieChartVO> queryPieChart();
+
+ List<TemperingGlassInfo> queryEngineerAndLayoutId();
}
--
Gitblit v1.8.0