From 77ee4fbf68b83bf2ff0577d6751bbfbe85312f9f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 17 九月 2025 10:33:07 +0800
Subject: [PATCH] 堆垛机空闲10秒有入库任务回原点,空闲两分钟回原点

---
 src/main/java/com/zy/core/MainProcess.java |   53 ++++++++++++++++++++++++-----------------------------
 1 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index c5b90fb..64f353c 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -1,11 +1,10 @@
 package com.zy.core;
 
-import com.zy.asrs.service.impl.MainServiceImpl;
+import com.zy.service.impl.MainServiceImpl;
 import com.zy.core.properties.SystemProperties;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PreDestroy;
@@ -21,11 +20,9 @@
 
     @Autowired
     private MainServiceImpl mainService;
+
     // 鎵�灞炵嚎绋�
     private Thread thread;
-    @Value("${crnBackHp.enable}")
-    private boolean crnBackHp;
-    private boolean look = true;
 
     /**
      * =====>>  寮�濮嬪伐浣�
@@ -43,42 +40,40 @@
                         continue;
                     }
 
-                    // 婕旂ず
-                    mainService.crnDemoOfLocMove1();
-                    // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
-//                    mainService.ioConvert();
+                    // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
+                    mainService.stnToCrnStnPick(3);
+
                     // 鍏ュ簱  ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
                     mainService.generateStoreWrkFile(); // 缁勬墭
-                    mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
-                    // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
-                    mainService.stnToCrnStnPick();
+
                     // 鍑哄簱  ===>>  鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
-                    mainService.crnStnToOutStn();
+                    mainService.crnStnToOutStn(4);
+
                     // 鍏ュ嚭搴�  ===>>  鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
-                    mainService.crnIoExecute();
-                    // 鍏ュ嚭搴撳寮� ===>> 鍫嗗灈鏈哄懡浠や笅鍙戝悗锛屽紓姝ヤ慨鏀瑰伐浣滄。鐘舵��
-//                    mainService.crnIoWrkMast();
+                    mainService.crnIoExecute(5);
+
                     // 鍏ュ簱  ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
-                    mainService.storeFinished();
+                    mainService.storeFinished(6);
+
                     // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
-                    mainService.recCrnErr();
+                    mainService.recCrnErr(7);
+
+                    // 杈撻�佺嚎寮傚父淇℃伅璁板綍
+                    mainService.recDevpErr();
+
                     // 鍏ュ簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
-//                    mainService.storeEmptyPlt();
+                    mainService.storeEmptyPlt(8);
+
                     // 鍑哄簱  ===>> 宸ヤ綔妗d俊鎭啓鍏ed鏄剧ず鍣�
-                    mainService.ledExecute();
+                    mainService.ledExecute(9);
+
                     // 鍏朵粬  ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
                     mainService.ledReset();
 
-//                    if (crnBackHp) {
-//                        if (look) {
-//                            //鍫嗗灈鏈烘病鏈夋墽琛屼腑浠诲姟锛岃澶囧瓨鍦ㄥ叆搴撲换鍔℃椂鍙洖鍘熺偣
-//                            mainService.crnRebackHp();
-//                        }
-//                    }
-//                    look  = !look;
+                    mainService.outOfDevp(11);
 
-
-                    mainService.outOfDevp();
+                    // 鍫嗗灈鏈哄洖鍘熺偣
+                    mainService.originGo();
 
                 } catch (Exception e) {
                     e.printStackTrace();

--
Gitblit v1.9.1