From 1577c2e2874c1fad9ac684356bf0e568c3015045 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 27 十一月 2024 09:46:15 +0800
Subject: [PATCH] 1、大理片笼新增进笼规则,计算本工程下所有玻璃的虚拟格子信息,按照虚拟格子,匹配笼内的实际格子,进笼之后查看格子是否有到齐的,执行调度任务 2、卧理修改任务执行顺序,移除捕获异常操作 3、不覆盖原有逻辑,新增opc任务,避免任务重复执行报错

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java |   42 ++++++++++++++++++++++++++++++++++--------
 1 files changed, 34 insertions(+), 8 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..b62a160 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
@@ -12,19 +12,45 @@
  * @since 2024-04-07
  */
 public interface TemperingGlassInfoService extends MPJBaseService<TemperingGlassInfo> {
-
+    /**
+     * 绛夊緟涓殑鐜荤拑
+     * @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);
 
 }

--
Gitblit v1.8.0