From 6ba157825d34078a75fee36cb66ead17327f5b32 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 29 四月 2025 14:32:55 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index e55135e..858c5ba 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -26,6 +26,8 @@
     private Thread thread;
     // 棰戠巼
     private int i = 0;
+    private int k = 0;
+    private boolean rgcWrk = true;
 
     /**
      * =====>>  寮�濮嬪伐浣�
@@ -36,7 +38,7 @@
                 try {
 
                     // 闂撮殧
-                    Thread.sleep(500);
+                    Thread.sleep(1000);
 
                     // 绯荤粺杩愯鐘舵�佸垽鏂�
                     if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
@@ -50,12 +52,16 @@
 
                     // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
 //                    mainService.ioConvert();
+
+                    // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
+//                    mainService.stnToCrnStnPick(3);
+                    mainService.stnToCrnStnPick2();
+
                     // 鍏ュ簱  ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
                     mainService.generateStoreWrkFile(1); // 缁勬墭
-                    mainService.generateStoreWrkFile0(2); // WMS鍏ュ簱
+//                    mainService.generateStoreWrkFile0(2); // WMS鍏ュ簱
                     Thread.sleep(500);
-                    // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
-                    mainService.stnToCrnStnPick(3);
+
                     // 鍑哄簱  ===>>  鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
                     mainService.crnStnToOutStn(4);
                     // 鍏ュ嚭搴�  ===>>  鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
@@ -71,14 +77,18 @@
                     // 鍑哄簱  ===>> 宸ヤ綔妗d俊鎭啓鍏ed鏄剧ず鍣�
                     mainService.ledExecute(9);
                     // 鍏朵粬  ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
-                    mainService.ledReset(10);
+                    mainService.ledReset();
 
                     mainService.outOfDevp(11);
 
-                    //绌烘墭鐩樿嚜鍔ㄥ嚭搴�
-//                    mainService.autoEmptyOut();
-//                    //绌烘墭鐩樿嚜鍔ㄥ叆搴�
-//                    mainService.autoEmptyIn();
+                    if (i>10){
+                        //绌烘墭鐩樿嚜鍔ㄥ嚭搴�
+                        mainService.autoEmptyOut();
+                        //绌烘墭鐩樿嚜鍔ㄥ叆搴�
+                        mainService.autoEmptyIn();
+                        i=0;
+                    }
+                    i++;
 
                     // 鍏朵粬  ===>> 鍏ュ嚭搴撴ā寮忓垏鎹�
 //                    i++;
@@ -90,16 +100,40 @@
                     /////////////////////////////////////RGV璋冨害/////////////////////////////////////
 //
                     //瀹屾垚灏忚溅浠诲姟
-                    mainService.rgvCompleteWrkMastSta();
-                    //鎵ц灏忚溅璐х墿鎼繍浠诲姟
-                    mainService.rgvRunWrkMastFullSta();
+//                    mainService.rgvCompleteWrkMastSta();
+
 //                    //鎵ц灏忚溅绌烘澘鎼繍浠诲姟
 //                    mainService.rgvRunWrkMastEmptyStaPut();//鏀�
 //                    mainService.rgvRunWrkMastEmptyStaTake();//鍙�
-                    mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
+//                    if (rgcWrk){
+//                        //鎵ц灏忚溅璐х墿鎼繍浠诲姟
+//                        mainService.rgvRunWrkMastFullSta();
+//                        rgcWrk = false;
+//                    }else {
+//                        mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
+//                        rgcWrk = true;
+//                    }
 
 
                     /////////////////////////////////////RGV璋冨害/////////////////////////////////////
+                    /////////////////////////////////////RGV璋冨害/////////////////////////////////////
+                    k++;
+
+                    // RGV  ===>>  灏忚溅浠诲姟浣滀笟涓嬪彂
+                    try{
+                        boolean rgvIoExecuteSign = mainService.rgvRunWrkMastFullSta();
+                        if (rgvIoExecuteSign){
+                            k = 0;
+                        } else if (k>4){
+                            k = 0;
+                            mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
+                        }
+                    }catch (Exception e){
+                        log.error("RGV  ===>>  灏忚溅浠诲姟浣滀笟涓嬪彂寮傚父"+e);
+                    }
+                    //瀹屾垚灏忚溅浠诲姟
+                    mainService.rgvCompleteWrkMastSta();
+                    /////////////////////////////////////RGV璋冨害/////////////////////////////////////
 
                 } catch (Exception e) {
                     e.printStackTrace();

--
Gitblit v1.9.1