From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/EngineeringService.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/EngineeringService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/EngineeringService.java
index 3828c3b..0066379 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/EngineeringService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/EngineeringService.java
@@ -1,7 +1,8 @@
package com.mes.engineering.service;
-import com.mes.engineering.entity.Engineering;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.mes.engineering.entity.Engineering;
+import com.mes.glassinfo.entity.GlassInfo;
import java.util.List;
@@ -20,21 +21,52 @@
* 寮�濮�/鏆傚仠浠诲姟
* @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);
+ Engineering selectInitiates(Integer state,Integer cell);
+ /**
+ * 鏌ヨ宸ョ▼琛ㄦ槸鍚﹀凡鏈夊伐绋嬪彿
+ *
+ * @return Engineering
+ */
+ Engineering selectUpInitiate(String engineerId);
+ /**
+ * 鏌ヨ灏忕墖琛ㄦ槸鍚﹀凡鏈夊伐绋嬪彿
+ *
+ * @return Engineering
+ */
+ GlassInfo selectGlassinfoIsnull(String engineerId);
+ /**
+ * 鏌ヨ涓婄墖浠诲姟
+ *
+ * @return Engineering
+ */
List<Engineering> selectTask();
+
+ boolean pauseTask(String engineerId, Integer state);
+
+ boolean deleteTask(String engineerId);
+
+ boolean changeTasks(Engineering engineering);
+
+
+
+// boolean changeTask(String engineerId, Integer state, Integer filmRemove, Integer stationCell);
}
--
Gitblit v1.8.0