From 23a2e30f0f70c1f526a04bffda38fd124ed47630 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 18 四月 2025 14:51:52 +0800
Subject: [PATCH] 999

---
 src/main/java/com/zy/core/MainProcess.java |   45 +++++++++++++++++++++++++++++++--------------
 1 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 1f0250b..ae2db7f 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -28,7 +28,7 @@
     /**
      * =====>>  寮�濮嬪伐浣�
      */
-    public void start(){
+    public void start() {
         thread = new Thread(() -> {
             while (!Thread.currentThread().isInterrupted()) {
                 try {
@@ -40,21 +40,41 @@
                     if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
                         continue;
                     }
-
                     //鍒濆鍖栧疄鏃跺湴鍥�
                     mainService.initRealtimeBasMap();
-                    // 鍏ュ簱  ===>>  鍥涘悜绌挎杞﹀叆搴撲綔涓氫笅鍙�
-                    mainService.shuttleInExecute();
-                    // 鍑哄簱  ===>>  鍥涘悜绌挎杞﹀嚭搴撲綔涓氫笅鍙�
-                    mainService.shuttleOutExecute();
+
+                    //zhangc
+                    //杈撻�佺嚎
+                    // 鍏ュ簱
+                    mainService.generateInboundWrk();
+                    mainService.noLiftIn();
+                    // 鍑哄簱
+                    mainService.outFirst();
+                    mainService.stnToOutStn();//杈撻�佺嚎
+                    //杈撻�佺嚎瀹屾垚鍒ゆ柇
+                    mainService.devpFinished();
+
+
+//                    // 鍏ュ簱  ===>>  鍥涘悜绌挎杞﹀叆搴撲綔涓氫笅鍙�
+//                    mainService.shuttleInExecute();
+//                    // 鍑哄簱  ===>>  鍥涘悜绌挎杞﹀嚭搴撲綔涓氫笅鍙�
+//                    mainService.shuttleOutExecute();
+                    //鎻愬崌鏈哄叆搴撲换鍔�
+                    mainService.liftInExecute();
+                    //鎻愬崌鏈哄嚭搴撲换鍔�
+                    mainService.liftOutExecute();
                     //鍥涘悜绌挎杞︿换鍔″畬鎴�
                     mainService.shuttleFinished();
                     //鎵ц绉诲簱浠诲姟
                     mainService.shuttleLocMoveExecute();
-                    //璐у弶鎻愬崌鏈轰换鍔�
-                    mainService.forkLiftIoExecute();
-                    //璐у弶鎻愬崌鏈轰换鍔″畬鎴�
-                    mainService.forkLiftFinished();
+//                    //璐у弶鎻愬崌鏈轰换鍔�
+//                    mainService.forkLiftIoExecute();
+//                    //璐у弶鎻愬崌鏈轰换鍔″畬鎴�
+//                    mainService.forkLiftFinished();
+//                    //鎻愬崌鏈轰换鍔�
+//                    mainService.liftIoExecute();
+                    //鎻愬崌鏈轰换鍔″畬鎴�
+                    mainService.liftFinished();
                     //鎵ц灏忚溅绉诲姩浠诲姟
                     mainService.shuttleMoveExecute();
                     // 寮傚父淇℃伅璁板綍
@@ -62,9 +82,6 @@
                     // 绌挎杞� ===>> 灏忚溅鐢甸噺妫�娴嬪厖鐢�
                     mainService.loopShuttleCharge();
                     mainService.executeShuttleCharge();
-
-                    //鑷姩鍒囨崲鍑哄叆搴撴ā寮�
-                    mainService.autoSwitchForkLiftIOMode();
 
                     // 闂撮殧
                     Thread.sleep(200);
@@ -77,7 +94,7 @@
     }
 
     @PreDestroy
-    public void shutDown(){
+    public void shutDown() {
         if (thread != null) thread.interrupt();
     }
 

--
Gitblit v1.9.1