From 3124ce87407fe85f6780b3ba1a219d8d9e8d7475 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 30 十月 2025 13:21:32 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/YiWuProject
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java | 24 +++++++++++++++++++++++-
1 files changed, 23 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 8e1081f..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
@@ -2,6 +2,8 @@
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;
@@ -17,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();
@@ -58,5 +72,13 @@
GlassInfo selectTempering(GlassInfo glassInfo);
- List<GlassInfo> selectTemperingGlass(GlassInfo glassInfo);
+ List<LoadGlassInfo> selectTemperingGlass(GlassInfo glassInfo);
+
+ /**
+ * 鑾峰彇閽㈠寲楗煎浘淇℃伅
+ * @return
+ */
+ List<PieChartVO> queryPieChart();
+
+ List<TemperingGlassInfo> queryEngineerAndLayoutId();
}
--
Gitblit v1.8.0