From d724176dbcf033a096d7dcbd864c05485f021fbb Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 17 十二月 2025 08:30:56 +0800
Subject: [PATCH] 1、 钢化前钢化出片逻辑调整，避免卧转立信号对调度任务的影响 2、修改出片方式，当玻璃未在关系表时，默认出一片 3、中空新增进片线路校验，避免钢化重复报工
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java | 68 +++++++++++++++++++++++++++++++---
1 files changed, 62 insertions(+), 6 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 17e7aec..ea789c1 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;
/**
@@ -12,19 +17,70 @@
* @since 2024-04-07
*/
public interface TemperingGlassInfoService extends MPJBaseService<TemperingGlassInfo> {
+ /**
+ * 绛夊緟涓殑鐜荤拑
+ *
+ * @return
+ */
+ List<TemperingGlassInfo> selectWaitingGlassByOpc();
+ /**
+ * 绛夊緟涓殑鐜荤拑
+ *
+ * @return
+ */
List<TemperingGlassInfo> selectWaitingGlass();
- List<TemperingGlassInfo> selectIntoGlass(int layoutId);
+ /**
+ * 杩涚倝涓殑鐜荤拑
+ *
+ * @return
+ */
+ List<TemperingGlassInfo> selectIntoGlass(TemperingGlassInfo temperingGlassInfo);
+ /**
+ * 鍑虹倝涓殑鐜荤拑
+ *
+ * @return
+ */
List<TemperingGlassInfo> selectOutGlass();
-
+ /**
+ * 閽㈠寲鍚庣殑鐜荤拑
+ * @return
+ */
List<TemperingGlassInfo> selectOverGlass();
-
+ /**
+ * 鏌ヨ閽㈠寲鍚庣殑鐗堝浘id
+ * @return
+ */
List<TemperingGlassInfo> selectLayoutId();
-
+ /**
+ * 鏌ヨ閽㈠寲鐘舵��
+ * @return
+ */
List<TemperingGlassInfo> selectTaskType();
-
+ /**
+ * 閽㈠寲妯″潡鐮存崯
+ * @return
+ */
Integer updateTemperingState(TemperingGlassInfo temperingGlassInfo);
+ /**
+ * 鏍规嵁鐐夊彿鏌ラ挗鍖栫増鍥剧幓鐠冧俊鎭�
+ * @return
+ */
+ List<TemperingGlassInfo> selectGlassInfoById(Integer id);
+ GlassInfo selectTempering(GlassInfo glassInfo);
+
+ List<LoadGlassInfo> selectTemperingGlass(GlassInfo glassInfo);
+
+ /**
+ * 鑾峰彇閽㈠寲楗煎浘淇℃伅
+ * @return
+ */
+ List<PieChartVO> queryPieChart();
+
+ List<TemperingGlassInfo> queryEngineerAndLayoutId();
+
+ boolean saveBatch(List<TemperingGlassInfo> list);
}
--
Gitblit v1.8.0