From 865e425cdf7395fece0a53a6def75e2c84d6dbf0 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 15 十月 2024 09:56:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/TaskingService.java | 100 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 99 insertions(+), 1 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/TaskingService.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/TaskingService.java
index de729da..7052df9 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/TaskingService.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/TaskingService.java
@@ -1,8 +1,10 @@
package com.mes.md.service;
import com.github.yulichang.base.MPJBaseService;
+import com.mes.md.entity.Machine;
import com.mes.md.entity.Tasking;
-import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
/**
* <p>
@@ -13,5 +15,101 @@
* @since 2024-08-28
*/
public interface TaskingService extends MPJBaseService<Tasking> {
+// /**
+// * 鏇存敼涓婄墖妯″紡
+// * @return boolean
+// */
+// boolean updateStatus(Integer state);
+// /**
+// *鏇存敼鑱旀満鐘舵��
+// * @return boolean
+// */
+// boolean updateLoadState(Integer state);
+// /**
+// * 鐐瑰嚮鐮存崯
+// * @return boolean
+// */
+// boolean updateDamage(Tasking tasking);
+// /**
+// * 鏌ヨ褰撳墠妯″紡杩囧幓鐨勭幓鐠�
+// * @return List<Tasking>
+// */
+// List<Tasking> selectTasking();
+// /**
+// * 鏍规嵁涓嶅悓宸ヨ壓鏌ヨ鍗冲皢涓婄墖鐨勬暟鎹�
+// * @return List<Tasking>
+// */
+// Tasking selectTasking(Tasking tasking);
+ /**
+ * 瀹氬埗妯″紡涓嬪皢鎵爜鍑烘潵id鑾峰彇鎴愮幓鐠冩暟鎹祴鍊肩粰褰撳墠鏈�鏂扮殑glassId
+ * @return List<Tasking>
+ */
+ Boolean insertTaskingPro(String scanId);
+ /**
+ * 鏍规嵁鏍囧噯妯″紡鐨勪换鍔￠『搴忚幏鍙栫幓鐠冩暟鎹�
+ * @return List<Tasking>
+ */
+ Boolean insertTasking(String status);
+ /**
+ * 琛ュ叏浠诲姟鏁版嵁
+ * @return List<Tasking>
+ */
+ boolean updateTasking(String scanId);
+ /**
+ * 鏇存敼浠诲姟琛ㄧ姸鎬�
+ * @return List<Tasking>
+ */
+ boolean updateTaskingState(Tasking tasking);
+
+
+
+ /**
+ * @param machine
+ * 鏌ヨ褰撳墠璁惧锛岀嚎涓婃湭瀹屽伐鐨勪换鍔� (绾夸笂/姝ｅ父)
+ * @return
+ */
+ List<Tasking> findMachineTask(Machine machine);
+ /**
+ * @param machine锛寃orkState
+ * 鏌ヨ褰撳墠璁惧锛岀嚎涓娿�愮瓑寰�/宸ヤ綔/瀹屽伐銆戠殑浠诲姟 鍗囧簭 (绾夸笂/姝ｅ父)
+ * @return
+ */
+ List<Tasking> findMachineWorkStateTask(Machine machine, String workState);
+ /**
+ * @param machine
+ * 褰撳墠璁惧鏍囪姝ｅ湪宸ヤ綔锛氱嚎涓婄瓑寰呯殑浠诲姟绗竴鏉� (绾夸笂/姝ｅ父)
+ * @return
+ */
+ Tasking startMachineTask(Machine machine);
+ /**
+ * @param machine
+ * 褰撳墠璁惧鏍囪瀹屾垚锛氭鍦ㄥ伐浣滅殑绗竴涓换鍔� (绾夸笂/姝ｅ父) 杩斿洖瀹屾垚鏁伴噺
+ * @return
+ */
+ int finishMachineTask(Machine machine);
+ /**
+ * @param machine
+ * 褰撳墠璁惧鏍囪澶辫触锛屾鍦ㄥ伐浣滅殑鏈�鍚庝竴涓换鍔� (绾夸笂/姝ｅ父) 杩斿洖澶辫触鏁伴噺
+ * @return
+ */
+ int loseMachineTask(Machine machine);
+ /**
+ * @param tasking
+ * 鐮存崯鐜荤拑锛� (绾夸笂/姝ｅ父) 杩斿洖鐮存崯鏁伴噺
+ * @return
+ */
+ int damagedTask(Tasking tasking);
+ /**
+ * @param tasking
+ * 淇敼鐘舵�� 銆愪笅绾裤��
+ * @return
+ */
+ int glassDownLine(Tasking tasking);
+ /**
+ * @param taskingList
+ * 鎵归噺淇敼鐘舵�� 銆愪笂绾裤��
+ * @return
+ */
+ int glassTopLine(List<Tasking> taskingList);
}
--
Gitblit v1.8.0