From def1eb8623e1444164ae4bce9179d011a89b8c5e Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 03 十二月 2024 09:15:27 +0800
Subject: [PATCH] 现场对接批量更新

---
 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