From cbeff29a3261cb13ed3c5aada8bbd9cc4c1fee72 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 22 七月 2025 09:57:48 +0800
Subject: [PATCH] #空托盘程序

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

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 31836fd..99f2d98 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -61,26 +61,29 @@
                     mainService.storeFinished(6);
                     // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
                     mainService.recCrnErr(7);
-                    // 鍏ュ簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
+
+
+                    // 绌烘墭鐩樺叆搴�-绔嬪簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
                     mainService.storeEmptyPlt(8);
+                    // 绌烘墭鐩樺叆搴�-浜х嚎
+                    mainService.storeEmptyPltLine(13);
+
                     // 鍑哄簱  ===>> 宸ヤ綔妗d俊鎭啓鍏ed鏄剧ず鍣�
                     mainService.ledExecute(9);
                     // 鍏朵粬  ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
                     mainService.ledReset(10);
 
-                    mainService.outOfDevp(11);
+                    // RGV  ===>> 鎵ц瀵筊GV鎿嶄綔
+                    mainService.rgvExecute(11);
+                    // RGV  ===>> 鎵ц瀵筊GV宸ヤ綔妗g殑瀹屾垚鎿嶄綔
+                    mainService.rgvFinished(12);
+                    // RGV  ===>> 鎵ц瀵筊GV宸ヤ綔妗g殑瀹屾垚鎿嶄綔 绔欏埌绔�
+                    mainService.rgvFinished2(14);
 
-                    //绌烘墭鐩樿嚜鍔ㄥ嚭搴�
-//                    mainService.autoEmptyOut();
-//                    //绌烘墭鐩樿嚜鍔ㄥ叆搴�
-//                    mainService.autoEmptyIn();
-
-                    // 鍏朵粬  ===>> 鍏ュ嚭搴撴ā寮忓垏鎹�
-                    i++;
-                    if (i > 1) {
-                        mainService.ioConvert();
-                        i = 0;
-                    }
+                    //鍫嗗灈鏈烘棤浠诲姟涓ゅ垎閽燂紝鍥炲叆搴撳彛寰呮満
+                    mainService.crnMove();
+                    //鍫嗗灈鏈烘湁鍏ュ簱浠诲姟鏃讹紝鍥炲叆搴撳彛寰呮満
+                    mainService.crnMoveByInTask();
 
                 } catch (Exception e) {
                     e.printStackTrace();

--
Gitblit v1.9.1