From 2c2413760b6467bf62402dba7338bd3bbcbd7341 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期二, 20 五月 2025 14:20:38 +0800
Subject: [PATCH] 添加产量报表功能页面
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/TaskingService.java | 130 +++++++++++++++++++++++++++++++++----------
1 files changed, 100 insertions(+), 30 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 6caea98..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
@@ -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,13 @@
* @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();
+
/**
* 瀹氬埗妯″紡涓嬪皢鎵爜鍑烘潵id鑾峰彇鎴愮幓鐠冩暟鎹祴鍊肩粰褰撳墠鏈�鏂扮殑glassId
* @return List<Tasking>
*/
Boolean insertTaskingPro(String scanId);
- /**
- * 鏍规嵁涓嶅悓宸ヨ壓鏌ヨ鍗冲皢涓婄墖鐨勬暟鎹�
- * @return List<Tasking>
- */
- Tasking selectTasking(Tasking tasking);
+
/**
* 鏍规嵁鏍囧噯妯″紡鐨勪换鍔￠『搴忚幏鍙栫幓鐠冩暟鎹�
* @return List<Tasking>
@@ -54,14 +32,106 @@
* @return List<Tasking>
*/
boolean updateTasking(String scanId);
-
/**
- * 鏌ヨ褰撳墠宸ヨ壓锛屾煇宸ヤ綔鐘舵�佺殑绾夸笂浠诲姟
+ * 鏇存敼浠诲姟琛ㄧ姸鎬�
* @return List<Tasking>
*/
- List<Tasking> findCraftTasking(Tasking tasking);
+ boolean updateTaskingState(Tasking tasking);
- int updateCraftTasking(Tasking tasking);
- int updateDownLine(Tasking tasking);
+ /**
+ * @param machine
+ * 鎵爜璁惧娣诲姞浠诲姟
+ * @return
+ */
+ int scanMachineAdd(Machine machine, String scanId);
+
+
+ /**
+ * @param machine
+ * 鏌ヨ褰撳墠璁惧锛岀嚎涓婃湭瀹屽伐鐨勪换鍔� (绾夸笂/姝ｅ父)
+ * @return
+ */
+ List<Tasking> findMachineTask(Machine machine);
+ /**
+ * @param machine锛寃orkState
+ * 鏌ヨ褰撳墠璁惧锛岀嚎涓娿�愮瓑寰�/宸ヤ綔/瀹屽伐銆戠殑浠诲姟 鍗囧簭 (绾夸笂/姝ｅ父)
+ * @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
+ * 褰撳墠璁惧鏍囪澶辫触锛屾鍦ㄥ伐浣滅殑鏈�鍚庝竴涓换鍔� (绾夸笂/姝ｅ父) 杩斿洖澶辫触鏁伴噺
+ * @return
+ */
+ int loseMachineTask(Machine machine);
+ /**
+ * @param tasking
+ * 鐮存崯鐜荤拑锛� (绾夸笂/姝ｅ父) 杩斿洖鐮存崯鏁伴噺
+ * @return
+ */
+ int damagedTask(Tasking tasking);
+ /**
+ * @param machine
+ * 淇敼鐘舵�� 銆愪笅绾裤��
+ * @return
+ */
+ int glassDownLineOne(Machine machine);
+ /**
+ * @param tasking
+ * 淇敼鐘舵�� 銆愪笅绾裤��
+ * @return
+ */
+ int glassDownLine(Tasking tasking);
+ /**
+ * @param taskingList
+ * 鎵归噺淇敼鐘舵�� 銆愪笂绾裤��
+ * @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