From f1fdf0c1e332227dd41c8d85411b2edc9744b65e Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 21 三月 2025 09:59:10 +0800
Subject: [PATCH] Merge branch 'master' of http://159.223.171.199:10439/r/JiuMuMES
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/PrimitiveTaskService.java | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/PrimitiveTaskService.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/PrimitiveTaskService.java
index a5c216e..8c465f7 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/PrimitiveTaskService.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/PrimitiveTaskService.java
@@ -1,8 +1,12 @@
package com.mes.md.service;
import com.github.yulichang.base.MPJBaseService;
+import com.mes.md.entity.Machine;
import com.mes.md.entity.PrimitiveTask;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.mes.md.entity.Tasking;
+
+import java.util.List;
/**
* <p>
@@ -13,7 +17,39 @@
* @since 2024-08-28
*/
public interface PrimitiveTaskService extends MPJBaseService<PrimitiveTask> {
- // 鏇存柊鎶ュ伐鏁伴噺
+
+ Tasking convertListTasking(PrimitiveTask primitiveTask, Long LineConfigurationId);
+ /**
+ *鏌ヨ鏍囧噯鏈畬鎴愮殑浠诲姟
+ * @return
+ */
+ List<PrimitiveTask> findPrimitiveTaskNotFinish();
+
+ /**
+ *鏌ヨ鏍囧噯姝ょ嚎璺凡棰嗗彇鐨勪换鍔�
+ * @return
+ */
+ List<PrimitiveTask> findPrimitiveTasking(Machine machine,Long line);
+ /**
+ * 鏍囧噯锛氶鍙栦换鍔� /缁撴潫浠诲姟
+ * @return
+ */
+ int startOrStopPrimitiveTasking(PrimitiveTask primitiveTask);
+
+ /**
+ *鎵爜鏇存柊瀹氬埗鐜荤拑鐨勬姤宸ユ暟閲�
+ * @return
+ */
boolean updateReportCount(String scanId);
+ /**
+ *鎵嬪姩鏇存柊鎶ュ伐鏁伴噺
+ * @return
+ */
+ boolean updatePrimitiveTask(PrimitiveTask task);
+ /**
+ *鏌ヨ寰呮姤宸ョ殑鏁版嵁
+ * @return
+ */
+ List<PrimitiveTask> selectPrimitiveTask(PrimitiveTask task);
}
--
Gitblit v1.8.0