From 3a0087aa5e3eed5d9d7a793a17dc01fd1d6df80c Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期四, 17 四月 2025 17:01:15 +0800
Subject: [PATCH] 看板大屏2修改页面
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/TaskingService.java | 72 +++++++++++++++++++++++------------
1 files changed, 47 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 7052df9..dc38ab8 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
@@ -15,31 +15,7 @@
* @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>
@@ -63,6 +39,13 @@
boolean updateTaskingState(Tasking tasking);
+ /**
+ * @param machine
+ * 鎵爜璁惧娣诲姞浠诲姟
+ * @return
+ */
+ int scanMachineAdd(Machine machine, String scanId);
+
/**
* @param machine
@@ -76,18 +59,36 @@
* @return
*/
List<Tasking> findMachineWorkStateTask(Machine machine, String workState);
+
+ /**
+ *
+ * 鏌ヨ绾夸笅鐨勭幓鐠�
+ * @return
+ */
+ List<Tasking> findDownLineTask();
/**
* @param machine
* 褰撳墠璁惧鏍囪姝ｅ湪宸ヤ綔锛氱嚎涓婄瓑寰呯殑浠诲姟绗竴鏉� (绾夸笂/姝ｅ父)
* @return
*/
Tasking startMachineTask(Machine machine);
+
+ Tasking startMachineTask(Machine machine, String glassId);
+
+ /**
+ * @param machine
+ * 褰撳墠璁惧 鐨勫墠鍏ㄩ儴宸ュ簭 鍒版湰宸ュ簭鐨� scan_id 浠诲姟鐘舵�佷负姝ｅ湪宸ヤ綔
+ * @return
+ */
+ Tasking startScanIdMachineTask(Machine machine, String scan_id);
/**
* @param machine
* 褰撳墠璁惧鏍囪瀹屾垚锛氭鍦ㄥ伐浣滅殑绗竴涓换鍔� (绾夸笂/姝ｅ父) 杩斿洖瀹屾垚鏁伴噺
* @return
*/
int finishMachineTask(Machine machine);
+
+ int finishMachineTask(Machine machine,Integer taskSequence);
/**
* @param machine
* 褰撳墠璁惧鏍囪澶辫触锛屾鍦ㄥ伐浣滅殑鏈�鍚庝竴涓换鍔� (绾夸笂/姝ｅ父) 杩斿洖澶辫触鏁伴噺
@@ -101,6 +102,12 @@
*/
int damagedTask(Tasking tasking);
/**
+ * @param machine
+ * 淇敼鐘舵�� 銆愪笅绾裤��
+ * @return
+ */
+ int glassDownLineOne(Machine machine);
+ /**
* @param tasking
* 淇敼鐘舵�� 銆愪笅绾裤��
* @return
@@ -112,4 +119,19 @@
* @return
*/
int glassTopLine(List<Tasking> taskingList);
+
+ /**
+ * @param tasking
+ * 鎵归噺淇敼鐘舵�� 銆愪笂绾裤��
+ * @return
+ */
+ int glassTopLine(Tasking tasking);
+
+ List<Tasking> findMachineTaskID(Machine machine,String scan_id);
+ /**
+ * @param tasking
+ * 浠诲姟缁撴潫
+ * @return
+ */
+ int stopTasking(Tasking tasking);
}
--
Gitblit v1.8.0