From a454c4e3e56ed63a7676348f260a240fa18be481 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 05 六月 2025 14:02:31 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/MainProcess.java |   62 +++++++++++--------------------
 1 files changed, 22 insertions(+), 40 deletions(-)

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 3341f0a..7e35314 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -1,6 +1,10 @@
 package com.zy.core;
 
 import com.zy.asrs.service.impl.MainServiceImpl;
+import com.zy.common.utils.News;
+import com.zy.core.cache.MessageQueue;
+import com.zy.core.enums.SlaveType;
+import com.zy.core.model.Task;
 import com.zy.core.properties.SystemProperties;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
@@ -45,22 +49,22 @@
                     }
 
                     // 婕旂ず
-                    mainService.crnDemoOfLocMove1();
-                    //鍒锋柊RGV鍦板浘
-                    mainService.refreshRgvMap();
+//                    mainService.crnDemoOfLocMove1();
 
                     // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
 //                    mainService.ioConvert();
 
-                    // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
-//                    mainService.stnToCrnStnPick(3);
-                    mainService.stnToCrnStnPick2();
+
+                  //  mainService.stnToCrnStnPick2();
 
                     // 鍏ュ簱  ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
                     mainService.generateStoreWrkFile(1); // 缁勬墭
 //                    mainService.generateStoreWrkFile0(2); // WMS鍏ュ簱
-                    Thread.sleep(500);
+                    Thread.sleep(200);
 
+
+                    // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
+                    mainService.stnToCrnStnPick(3);
                     // 鍑哄簱  ===>>  鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
                     mainService.crnStnToOutStn(4);
                     // 鍏ュ嚭搴�  ===>>  鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
@@ -75,46 +79,24 @@
                     mainService.storeEmptyPlt(8);
                     // 鍑哄簱  ===>> 宸ヤ綔妗d俊鎭啓鍏ed鏄剧ず鍣�
                     mainService.ledExecute(9);
+//                    if(MessageQueue.offer(SlaveType.Led, 1, new Task(3,  "鏉$爜宸插瓨鍦ㄧ姸鎬佷负锛� 2.璁惧涓婅蛋 锛夌殑浠诲姟,宸ヤ綔鍙�="))){
+//                        News.info("杈撳叆鎴愬姛");
+//                    }
                     // 鍏朵粬  ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
                     mainService.ledReset();
 
-                    mainService.outOfDevp(11);
 
-                    if (i>10){
-                        //绌烘墭鐩樿嚜鍔ㄥ嚭搴�
-                        mainService.autoEmptyOut();
-                        //绌烘墭鐩樿嚜鍔ㄥ叆搴�
-                        mainService.autoEmptyIn();
-                        i=0;
-                    }
-                    i++;
+//                    mainService.outOfDevp(11);
 
-                    // 鍏朵粬  ===>> 鍏ュ嚭搴撴ā寮忓垏鎹�
+//                    if (i>10){
+//                        //绌烘墭鐩樿嚜鍔ㄥ嚭搴�
+//                        mainService.autoEmptyOut();
+//                        //绌烘墭鐩樿嚜鍔ㄥ叆搴�
+//                        mainService.autoEmptyIn();
+//                        i=0;
+//                    }
 //                    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