From 09fcc4ec56a1ce6c0fcb308348d8dd5e2c08d336 Mon Sep 17 00:00:00 2001
From: fyxc <fyxc@qq.com>
Date: 星期四, 22 五月 2025 14:33:06 +0800
Subject: [PATCH] server commit files

---
 src/main/java/com/zy/core/MainProcess.java |   59 +++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 1778208..c2c2871 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -28,50 +28,73 @@
     /**
      * =====>>  寮�濮嬪伐浣�
      */
-    public void start(){
+    public void start() {
         thread = new Thread(() -> {
             while (!Thread.currentThread().isInterrupted()) {
                 try {
 
-                    // 闂撮殧
-                    Thread.sleep(300);
 
                     // 绯荤粺杩愯鐘舵�佸垽鏂�
                     if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
                         continue;
                     }
-
-//                    // 鍏ュ簱  ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
-//                    mainService.generateStoreWrkFile(); // 缁勬墭
-
                     //鍒濆鍖栧疄鏃跺湴鍥�
                     mainService.initRealtimeBasMap();
-//                    // 鎷f枡銆佸苟鏉垮啀鍏ュ簱
-//                    mainService.stnToCrnStnPick();
-//                    // 鐩樼偣鍐嶅叆搴�
-//                    mainService.stnToCrnStnPlate();
+
+                    //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.liftIoExecute();
-                    //璐у弶鎻愬崌鏈轰换鍔″畬鎴�
-                    mainService.forkLiftFinished();
-                    //鎵ц灏忚溅绉诲簱浠诲姟
+                    //鎻愬崌鏈轰换鍔″畬鎴�
+                    mainService.liftFinished();
+                    // 闂撮殧
+                    //鎵ц灏忚溅绉诲姩浠诲姟
                     mainService.shuttleMoveExecute();
                     // 寮傚父淇℃伅璁板綍
                     mainService.recErr();
-//                    // 鍏ュ簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
-//                    mainService.storeEmptyPlt();
                     // 绌挎杞� ===>> 灏忚溅鐢甸噺妫�娴嬪厖鐢�
                     mainService.loopShuttleCharge();
                     mainService.executeShuttleCharge();
 
+                    // 鍏朵粬  ===>> // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
+                    i++;
+                    if (i > 1) {
+                        mainService.ioConvert();
+                        i = 0;
+                    }
+
                     // 闂撮殧
-                    Thread.sleep(200);
+                    Thread.sleep(300);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -81,7 +104,7 @@
     }
 
     @PreDestroy
-    public void shutDown(){
+    public void shutDown() {
         if (thread != null) thread.interrupt();
     }
 

--
Gitblit v1.9.1