From 109e00f8a2b5ec34855816beca6dd59a83eb4f2b Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 21 四月 2025 08:40:05 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/core/MainProcess.java |   51 +++++++++++++++++++++++++++------------------------
 1 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index d12d9a3..227e183 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -9,6 +9,7 @@
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PreDestroy;
+import java.util.ArrayList;
 
 /**
  * WCS涓绘祦绋�
@@ -23,9 +24,9 @@
     private MainServiceImpl mainService;
     // 鎵�灞炵嚎绋�
     private Thread thread;
-    @Value("${crnBackHp.enable}")
-    private boolean crnBackHp;
-    private boolean look = true;
+    // 棰戠巼
+    private int i = 0;
+    private int k = 0;
 
     /**
      * =====>>  寮�濮嬪伐浣�
@@ -44,38 +45,40 @@
                     }
 
                     // 婕旂ず
-                    mainService.crnDemoOfLocMove1();
-                    // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
-//                    mainService.ioConvert();
+//                    mainService.crnDemoOfLocMove1();
                     // 鍏ュ簱  ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
                     mainService.generateStoreWrkFile(); // 缁勬墭
-                    mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
-                    // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
-                    mainService.stnToCrnStnPick();
                     // 鍑哄簱  ===>>  鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
                     mainService.crnStnToOutStn();
                     // 鍏ュ嚭搴�  ===>>  鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
                     mainService.crnIoExecute();
-                    // 鍏ュ嚭搴撳寮� ===>> 鍫嗗灈鏈哄懡浠や笅鍙戝悗锛屽紓姝ヤ慨鏀瑰伐浣滄。鐘舵��
-//                    mainService.crnIoWrkMast();
                     // 鍏ュ簱  ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
                     mainService.storeFinished();
+
                     // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
                     mainService.recCrnErr();
-                    // 鍏ュ簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
-//                    mainService.storeEmptyPlt();
-                    // 鍑哄簱  ===>> 宸ヤ綔妗d俊鎭啓鍏ed鏄剧ず鍣�
-                    mainService.ledExecute();
-                    // 鍏朵粬  ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
-                    mainService.ledReset();
 
-//                    if (crnBackHp) {
-//                        if (look) {
-//                            //鍫嗗灈鏈烘病鏈夋墽琛屼腑浠诲姟锛岃澶囧瓨鍦ㄥ叆搴撲换鍔℃椂鍙洖鍘熺偣
-//                            mainService.crnRebackHp();
-//                        }
-//                    }
-//                    look  = !look;
+
+                    i++;
+                    k++;
+                    if (i<7) {
+                        // RGV  ===>>  灏忚溅浠诲姟浣滀笟涓嬪彂
+                        try{
+                            boolean rgvIoExecuteSign = mainService.rgvIoExecute(i);
+                            if (rgvIoExecuteSign){
+                                k = 0;
+                            } else if (k>7){
+                                k = 0;
+                                mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
+                            }
+                        }catch (Exception e){
+                            log.error("RGV  ===>>  灏忚溅浠诲姟浣滀笟涓嬪彂寮傚父"+e);
+                        }
+                    }else {
+                        i = 0;
+                    }
+                    //瀹屾垚灏忚溅浠诲姟
+                    mainService.rgvCompleteWrkMastSta();
 
                 } catch (Exception e) {
                     e.printStackTrace();

--
Gitblit v1.9.1