From 9c3da520c38c813d6b615adb5b49e7519c994f6b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 13 六月 2025 12:53:45 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/core/MainProcess.java |   42 ++++++++++++++++++++++++++++++------------
 1 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 0a93935..95a133f 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -9,7 +9,6 @@
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PreDestroy;
-import java.util.ArrayList;
 
 /**
  * WCS涓绘祦绋�
@@ -27,10 +26,13 @@
     // 棰戠巼
     private int i = 0;
 
+    @Value("${wms.maxCirle}")
+    private Integer maxCount;
+
     /**
      * =====>>  寮�濮嬪伐浣�
      */
-    public void start(){
+    public void start() {
         thread = new Thread(() -> {
             while (!Thread.currentThread().isInterrupted()) {
                 try {
@@ -44,9 +46,11 @@
                     }
 
                     // 婕旂ず
-//                    mainService.crnDemoOfLocMove1();
+                    //mainService.crnDemoOfLocMove1();
                     // 鍏ュ簱  ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
-//                    mainService.generateStoreWrkFile(); // 缁勬墭
+                    mainService.generateStoreWrkFile1(); // 缁勬墭
+                    // 鍏ュ簱  ===>> 鎷f枡鐩樼偣鍥炲簱锛岃緭閫佺嚎宸ヤ綔鍙蜂繚鐣欑殑鎯呭喌涓嬪叆搴�
+                    //mainService.PickingAndReturningToTheWarehouse();
                     // 鍑哄簱  ===>>  鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
                     mainService.crnStnToOutStn();
                     // 鍏ュ嚭搴�  ===>>  鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
@@ -56,17 +60,31 @@
 
                     // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
                     mainService.recCrnErr();
-                    // 鍏ュ簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
-//                    mainService.storeEmptyPlt();
+
+                    // 鍏朵粬  ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
+                    mainService.ledReset(10);
+
 
 //                    mainService.outOfDevp();
 
                     // 鍏朵粬  ===>> // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
-                    i++;
-                    if (i > 1) {
-//                        mainService.ioConvert();
-                        i = 0;
-                    }
+                    //鐜舰寰幆鍑芥暟
+//                    mainService.shiftTargetToCyclePoint();
+//                    mainService.shiftCyclePointToTarget();
+//                    i++;
+//                    if (i > 2) {
+//                        //鐜舰寰幆鍑芥暟
+//                        mainService.shiftTargetToCyclePoint();
+//                        mainService.shiftCyclePointToTarget();
+//                        i = 0;
+//                    }
+
+                    //鑷姩娲惧彂浠诲姟
+                    //                 mainService.autoDistribute();
+                    //鑷姩瀹屾垚浠诲姟
+//                    mainService.autoCompleteTask();
+                    //agv鍙栨斁璐у畬鎴�
+//                    mainService.autoCompleteAGV();
 
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -77,7 +95,7 @@
     }
 
     @PreDestroy
-    public void shutDown(){
+    public void shutDown() {
         if (thread != null) thread.interrupt();
     }
 

--
Gitblit v1.9.1