From f8c8d0f2bedddddfb856a485441abbb50fa1ea6d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 05 六月 2024 13:30:33 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/MainProcess.java |   42 +++++++++++++++++++++++++-----------------
 1 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 1b40995..de7ccb0 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -37,7 +37,7 @@
                 try {
 
                     // 闂撮殧
-                    Thread.sleep(500);
+                    Thread.sleep(1000);
 
                     // 绯荤粺杩愯鐘舵�佸垽鏂�
                     if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
@@ -45,18 +45,22 @@
                     }
 
                     // 婕旂ず
-                    mainService.crnDemoOfLocMove1();
+//                    mainService.crnDemoOfLocMove1();
                     //鍒锋柊RGV鍦板浘
                     mainService.refreshRgvMap();
 
                     // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
 //                    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);
                     // 鍏ュ嚭搴�  ===>>  鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
@@ -72,14 +76,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++;
@@ -96,14 +104,14 @@
 //                    //鎵ц灏忚溅绌烘澘鎼繍浠诲姟
 //                    mainService.rgvRunWrkMastEmptyStaPut();//鏀�
 //                    mainService.rgvRunWrkMastEmptyStaTake();//鍙�
-                    if (rgcWrk){
-                        //鎵ц灏忚溅璐х墿鎼繍浠诲姟
+//                    if (rgcWrk){
+//                        //鎵ц灏忚溅璐х墿鎼繍浠诲姟
                         mainService.rgvRunWrkMastFullSta();
-                        rgcWrk = false;
-                    }else {
-                        mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
-                        rgcWrk = true;
-                    }
+//                        rgcWrk = false;
+//                    }else {
+//                        mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
+//                        rgcWrk = true;
+//                    }
 
 
                     /////////////////////////////////////RGV璋冨害/////////////////////////////////////

--
Gitblit v1.9.1