From 05f1c60ff38516bae256e0a02d9678aee0c71724 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 20 一月 2024 19:28:17 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 1a27093..674ee1c 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -36,7 +36,7 @@
                 try {
 
                     // 闂撮殧
-                    Thread.sleep(1000);
+                    Thread.sleep(500);
 
                     // 绯荤粺杩愯鐘舵�佸垽鏂�
                     if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
@@ -45,31 +45,35 @@
 
                     // 婕旂ず
                     mainService.crnDemoOfLocMove1();
+                    //鍒锋柊RGV鍦板浘
+                    mainService.refreshRgvMap();
+
                     // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
 //                    mainService.ioConvert();
                     // 鍏ュ簱  ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
-                    mainService.generateStoreWrkFile(); // 缁勬墭
-                    mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
+                    mainService.generateStoreWrkFile(1); // 缁勬墭
+                    mainService.generateStoreWrkFile0(2); // WMS鍏ュ簱
+                    Thread.sleep(500);
                     // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
-                    mainService.stnToCrnStnPick();
+                    mainService.stnToCrnStnPick(3);
                     // 鍑哄簱  ===>>  鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
-                    mainService.crnStnToOutStn();
+                    mainService.crnStnToOutStn(4);
                     // 鍏ュ嚭搴�  ===>>  鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
-                    mainService.crnIoExecute();
+                    mainService.crnIoExecute(5);
                     // 鍏ュ嚭搴撳寮� ===>> 鍫嗗灈鏈哄懡浠や笅鍙戝悗锛屽紓姝ヤ慨鏀瑰伐浣滄。鐘舵��
 //                    mainService.crnIoWrkMast();
                     // 鍏ュ簱  ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
-                    mainService.storeFinished();
+                    mainService.storeFinished(6);
                     // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
-                    mainService.recCrnErr();
+                    mainService.recCrnErr(7);
                     // 鍏ュ簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
-                    mainService.storeEmptyPlt();
+                    mainService.storeEmptyPlt(8);
                     // 鍑哄簱  ===>> 宸ヤ綔妗d俊鎭啓鍏ed鏄剧ず鍣�
-                    mainService.ledExecute();
+                    mainService.ledExecute(9);
                     // 鍏朵粬  ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
-                    mainService.ledReset();
+                    mainService.ledReset(10);
 
-                    mainService.outOfDevp();
+                    mainService.outOfDevp(11);
 
                     //绌烘墭鐩樿嚜鍔ㄥ嚭搴�
 //                    mainService.autoEmptyOut();
@@ -83,6 +87,20 @@
 //                        i = 0;
 //                    }
 
+                    /////////////////////////////////////RGV璋冨害/////////////////////////////////////
+//
+                    //瀹屾垚灏忚溅浠诲姟
+                    mainService.rgvCompleteWrkMastSta();
+                    //鎵ц灏忚溅璐х墿鎼繍浠诲姟
+                    mainService.rgvRunWrkMastFullSta();
+//                    //鎵ц灏忚溅绌烘澘鎼繍浠诲姟
+//                    mainService.rgvRunWrkMastEmptyStaPut();//鏀�
+//                    mainService.rgvRunWrkMastEmptyStaTake();//鍙�
+                    mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
+
+
+                    /////////////////////////////////////RGV璋冨害/////////////////////////////////////
+
                 } catch (Exception e) {
                     e.printStackTrace();
                 }

--
Gitblit v1.9.1