From d1099b48aecf383fcefbe7b5a7ac3c2de0f0793f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 06 十一月 2024 23:22:03 +0800
Subject: [PATCH] 1、卧理进出片功能已完成开发,与电气调试中,新增磨边队列表 2、卧理新增历史任务表,记录卧理两台设备执行过的历史数据 3、大理片笼opc任务,新增玻璃进笼计算方式:在笼内存储同炉的多片玻璃,笼内玻璃顺序可不按照固定的顺序进笼 4、上片任务初步完成开发,新增历史任务表记录上片的历史信息

---
 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/EngineeringService.java |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/EngineeringService.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/EngineeringService.java
index b36640b..7841c36 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/EngineeringService.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/EngineeringService.java
@@ -20,21 +20,38 @@
      * 寮�濮�/鏆傚仠浠诲姟
      * @return boolean
      */
-    boolean  changeTask(String projectId, Integer state);
+    boolean changeTask(String projectId, Integer state);
     /**
      * 鏌ヨ閽㈠寲淇℃伅
      * @return List<Engineering>
      */
     List<Engineering> selectEngineering(String engineeringId);
+
     /**
      * 淇濆瓨閽㈠寲淇℃伅
      */
     void saveEngineering(List<Engineering> engineering);
+
     /**
      * 鏌ヨ鏄惁鏈変笂鐗囦换鍔�
+     *
      * @return Engineering
      */
     Engineering selectInitiate(Integer state);
 
+    /**
+     * 鏌ヨ鏄惁鏈変笂鐗囦换鍔w
+     *
+     * @return Engineering
+     */
+    Engineering selectUpInitiate(Integer state, Integer equipmentId);
+
+    /**
+     * 鏌ヨ涓婄墖浠诲姟
+     *
+     * @return Engineering
+     */
     List<Engineering> selectTask();
+
+    boolean pauseTask(String engineerId, Integer state);
 }

--
Gitblit v1.8.0