From ba714cd764bb95cb00c57e93017905c5a03e4079 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 30 十月 2025 12:12:14 +0800
Subject: [PATCH] 1、 二号线禁用时且一拖二情况下优化
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 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..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
@@ -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,15 @@
*/
List<TemperingGlassInfo> selectGlassInfoById(Integer id);
+ GlassInfo selectTempering(GlassInfo glassInfo);
+
+ List<LoadGlassInfo> selectTemperingGlass(GlassInfo glassInfo);
+
+ /**
+ * 鑾峰彇閽㈠寲楗煎浘淇℃伅
+ * @return
+ */
+ List<PieChartVO> queryPieChart();
+
+ List<TemperingGlassInfo> queryEngineerAndLayoutId();
}
--
Gitblit v1.8.0