From f3c0b41a36c719d3874de916b9c8178bb669a140 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 16 十二月 2024 16:55:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/EngineeringService.java | 24 +++++++++++++++++++++++-
1 files changed, 23 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..270ebe1 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,43 @@
* 寮�濮�/鏆傚仠浠诲姟
* @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);
+
+ boolean deleteTask(String engineerId);
+
+
+// boolean changeTask(String engineerId, Integer state, Integer filmRemove, Integer stationCell);
}
--
Gitblit v1.8.0