From fbd31387721424c65b173cbb23b03202f3e7dce6 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 12 五月 2025 21:13:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java |   19 +++++++++++++++++++
 1 files changed, 19 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 de870f1..a964b6d 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
@@ -3,6 +3,7 @@
 import com.github.yulichang.base.MPJBaseService;
 import com.mes.glassinfo.entity.GlassInfo;
 import com.mes.glassinfo.entity.LoadGlassInfo;
+import com.mes.largenscreen.entity.PieChartVO;
 import com.mes.temperingglass.entity.TemperingGlassInfo;
 
 import java.util.List;
@@ -18,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();
@@ -60,4 +73,10 @@
     GlassInfo selectTempering(GlassInfo glassInfo);
 
     List<LoadGlassInfo> selectTemperingGlass(GlassInfo glassInfo);
+
+    /**
+     * 鑾峰彇閽㈠寲楗煎浘淇℃伅
+     * @return
+     */
+    List<PieChartVO> queryPieChart();
 }

--
Gitblit v1.8.0