From a609def9badafcb8e8ffa97e8d54962271b1e108 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期六, 28 六月 2025 09:30:27 +0800
Subject: [PATCH] rgv功能完善

---
 src/main/java/com/zy/core/MainProcess.java |   32 +++++++++++++++++++-------------
 1 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 5786451..ff6b6ee 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -5,11 +5,9 @@
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PreDestroy;
-import java.util.ArrayList;
 
 /**
  * WCS涓绘祦绋�
@@ -29,6 +27,7 @@
     private int j = 0;
     private int k = 0;
     private int l = 0;
+    private int[] autoZ = new int[]{0,0,0,0,0,0,0};
 
     /**
      * =====>>  寮�濮嬪伐浣�
@@ -49,23 +48,30 @@
             while (!Thread.currentThread().isInterrupted()) {
                 try {
                     // 闂撮殧
-                    Thread.sleep(200);
+                    Thread.sleep(500);
 
                     // 绯荤粺杩愯鐘舵�佸垽鏂�
-                    if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
-                        continue;
-                    }
+//                    if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
+//                        continue;
+//                    }
 
-                    //鏇存柊浣嶇疆淇℃伅
-                    mainService.updateStePositionNearby();
-                    //鏇存柊浣嶇疆淇℃伅
-                    mainService.updateStePosition();
+                    //鏇存柊灏忚溅鎺掑簭
+//                    mainService.updateStePositionNearby();
+//                    //鏇存柊浣嶇疆淇℃伅
+//                    mainService.updateStePosition();
+//                    // 浠诲姟涓嬪彂
+//                    mainService.DevpTaskNoRun();
+
+                    // 灏忚溅鍙栬揣瓒婁綅,浠诲姟鍙栨秷
+                    mainService.rgvTaskCancel();
+
                     // 浠诲姟涓嬪彂
-                    mainService.DevpTaskNoRun();
+                    mainService.rgvTheHandlingTaskIsIssued();
+
                     // 浠诲姟瀹屾垚
-                    mainService.rgvCompleteWrkMastSta();
+                    mainService.rgvCompleteWrkMastSta(autoZ);
                     //鏇存柊浣嶇疆淇℃伅
-                    mainService.updateStePosition();
+//                    mainService.updateStePosition();
 
                 } catch (Exception e) {
                     e.printStackTrace();

--
Gitblit v1.9.1