From ef942fc4483059aa0526e913f9be41982df7bb79 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期二, 29 四月 2025 10:37:02 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/MainProcess.java |   44 ++++++++++++++++++++++++++++++++++----------
 1 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 084bd25..ef1a16b 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -33,29 +33,44 @@
             while (!Thread.currentThread().isInterrupted()) {
                 try {
 
-                    // 闂撮殧
-                    Thread.sleep(300);
 
                     // 绯荤粺杩愯鐘舵�佸垽鏂�
                     if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
                         continue;
                     }
+                    //鍒濆鍖栧疄鏃跺湴鍥�
+                    mainService.initRealtimeBasMap();
+
                     //zhangc
                     //杈撻�佺嚎
                     // 鍏ュ簱
                     mainService.generateInboundWrk();
-                    mainService.generateInboundWrk2();
+                    mainService.noLiftIn();
+                    // 闂撮殧
+                    Thread.sleep(50);
                     // 鍑哄簱
-                    mainService.stnToOutStn();
+                    mainService.outFirst();
+                    mainService.stnToOutStn();//杈撻�佺嚎
+                    //杈撻�佺嚎瀹屾垚鍒ゆ柇
+                    mainService.devpFinished();
 
-                    //鍒濆鍖栧疄鏃跺湴鍥�
-                    mainService.initRealtimeBasMap();
-                    // 鍏ュ簱  ===>>  鍥涘悜绌挎杞﹀叆搴撲綔涓氫笅鍙�
-                    mainService.shuttleInExecute();
-                    // 鍑哄簱  ===>>  鍥涘悜绌挎杞﹀嚭搴撲綔涓氫笅鍙�
-                    mainService.shuttleOutExecute();
+
+//                    // 鍏ュ簱  ===>>  鍥涘悜绌挎杞﹀叆搴撲綔涓氫笅鍙�
+//                    mainService.shuttleInExecute();
+//                    // 鍑哄簱  ===>>  鍥涘悜绌挎杞﹀嚭搴撲綔涓氫笅鍙�
+//                    mainService.shuttleOutExecute();
+                    //鎻愬崌鏈哄叆搴撲换鍔�
+                    mainService.liftInExecute();
+                    // 闂撮殧
+                    Thread.sleep(50);
+                    //鎻愬崌鏈哄嚭搴撲换鍔�
+                    mainService.liftOutExecute();
+                    // 闂撮殧
+                    Thread.sleep(50);
                     //鍥涘悜绌挎杞︿换鍔″畬鎴�
                     mainService.shuttleFinished();
+                    // 闂撮殧
+                    Thread.sleep(50);
                     //鎵ц绉诲簱浠诲姟
                     mainService.shuttleLocMoveExecute();
 //                    //璐у弶鎻愬崌鏈轰换鍔�
@@ -66,6 +81,8 @@
 //                    mainService.liftIoExecute();
                     //鎻愬崌鏈轰换鍔″畬鎴�
                     mainService.liftFinished();
+                    // 闂撮殧
+                    Thread.sleep(50);
                     //鎵ц灏忚溅绉诲姩浠诲姟
                     mainService.shuttleMoveExecute();
                     // 寮傚父淇℃伅璁板綍
@@ -74,6 +91,13 @@
                     mainService.loopShuttleCharge();
                     mainService.executeShuttleCharge();
 
+                    // 鍏朵粬  ===>> // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
+                    i++;
+                    if (i > 1) {
+                        mainService.ioConvert();
+                        i = 0;
+                    }
+
                     // 闂撮殧
                     Thread.sleep(200);
                 } catch (Exception e) {

--
Gitblit v1.9.1