From 06cffc25e145c7a2e6e0122f6f3db8fac1db8bb1 Mon Sep 17 00:00:00 2001
From: pjb <1@qq.com>
Date: 星期四, 28 十一月 2024 10:59:15 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/MainProcess.java |   54 +++++-------------------------------------------------
 1 files changed, 5 insertions(+), 49 deletions(-)

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 3341f0a..3b9a7e8 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涓绘祦绋�
@@ -26,6 +24,7 @@
     private Thread thread;
     // 棰戠巼
     private int i = 0;
+    private int k = 0;
     private boolean rgcWrk = true;
 
     /**
@@ -45,22 +44,16 @@
                     }
 
                     // 婕旂ず
-                    mainService.crnDemoOfLocMove1();
-                    //鍒锋柊RGV鍦板浘
-                    mainService.refreshRgvMap();
-
-                    // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
-//                    mainService.ioConvert();
-
+//                    mainService.crnDemoOfLocMove1();
                     // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
-//                    mainService.stnToCrnStnPick(3);
+                    mainService.stnToCrnStnPick(3);
                     mainService.stnToCrnStnPick2();
 
                     // 鍏ュ簱  ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
                     mainService.generateStoreWrkFile(1); // 缁勬墭
 //                    mainService.generateStoreWrkFile0(2); // WMS鍏ュ簱
-                    Thread.sleep(500);
-
+                    Thread.sleep(100);
+                    mainService.forwardAGVInTasks();
                     // 鍑哄簱  ===>>  鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
                     mainService.crnStnToOutStn(4);
                     // 鍏ュ嚭搴�  ===>>  鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
@@ -79,43 +72,6 @@
                     mainService.ledReset();
 
                     mainService.outOfDevp(11);
-
-                    if (i>10){
-                        //绌烘墭鐩樿嚜鍔ㄥ嚭搴�
-                        mainService.autoEmptyOut();
-                        //绌烘墭鐩樿嚜鍔ㄥ叆搴�
-                        mainService.autoEmptyIn();
-                        i=0;
-                    }
-                    i++;
-
-                    // 鍏朵粬  ===>> 鍏ュ嚭搴撴ā寮忓垏鎹�
-//                    i++;
-//                    if (i > 1) {
-//                        mainService.ioConvert();
-//                        i = 0;
-//                    }
-
-                    /////////////////////////////////////RGV璋冨害/////////////////////////////////////
-//
-                    //瀹屾垚灏忚溅浠诲姟
-                    mainService.rgvCompleteWrkMastSta();
-
-//                    //鎵ц灏忚溅绌烘澘鎼繍浠诲姟
-//                    mainService.rgvRunWrkMastEmptyStaPut();//鏀�
-//                    mainService.rgvRunWrkMastEmptyStaTake();//鍙�
-//                    if (rgcWrk){
-//                        //鎵ц灏忚溅璐х墿鎼繍浠诲姟
-                        mainService.rgvRunWrkMastFullSta();
-//                        rgcWrk = false;
-//                    }else {
-//                        mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
-//                        rgcWrk = true;
-//                    }
-
-
-                    /////////////////////////////////////RGV璋冨害/////////////////////////////////////
-
                 } catch (Exception e) {
                     e.printStackTrace();
                 }

--
Gitblit v1.9.1