From 7c45d0dd5988ef391bdd13ebf2d4e69afce93f95 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期六, 14 九月 2024 11:21:48 +0800
Subject: [PATCH] 展示数据方式BUG修改
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/TaskingService.java | 108 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 83 insertions(+), 25 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 fae12ff..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,6 +1,7 @@
package com.mes.md.service;
import com.github.yulichang.base.MPJBaseService;
+import com.mes.md.entity.Machine;
import com.mes.md.entity.Tasking;
import java.util.List;
@@ -14,36 +15,37 @@
* @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 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>
- */
- Tasking selectTasking(Tasking tasking);
+
/**
* 鏍规嵁鏍囧噯妯″紡鐨勪换鍔￠『搴忚幏鍙栫幓鐠冩暟鎹�
* @return List<Tasking>
@@ -54,4 +56,60 @@
* @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