From 0b41a5c59028a61bff22f60e74cb1d6d53a40e61 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 13 五月 2025 14:01:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 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 b62a160..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
@@ -1,6 +1,11 @@
package com.mes.temperingglass.service;
-import com.mes.temperingglass.entity.TemperingGlassInfo;
+
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;
/**
@@ -14,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();
@@ -53,4 +70,13 @@
*/
List<TemperingGlassInfo> selectGlassInfoById(Integer id);
+ GlassInfo selectTempering(GlassInfo glassInfo);
+
+ List<LoadGlassInfo> selectTemperingGlass(GlassInfo glassInfo);
+
+ /**
+ * 鑾峰彇閽㈠寲楗煎浘淇℃伅
+ * @return
+ */
+ List<PieChartVO> queryPieChart();
}
--
Gitblit v1.8.0