From 8cac228f877e7183646aee6f474848ae5a38ca50 Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期四, 17 七月 2025 14:20:40 +0800
Subject: [PATCH] *

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

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 91a1d16..dfa182a 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -22,7 +22,7 @@
     private MainServiceImpl mainService;
     // 鎵�灞炵嚎绋�
     private Thread thread;
-//    private Thread thread2;
+    private Thread thread2;
 
     /**
      * =====>>  寮�濮嬪伐浣�
@@ -41,18 +41,12 @@
                     mainService.generateStoreWrkFile(); // 缁勬墭
 //                    mainService.generateStoreWrkFileIsEmptyMk(); // 缁勬墭  绌烘墭
                     mainService.generateStoreWrkFileWalk(); // wms鍏ュ簱浠诲姟涓嬪彂
-                    // 鍑哄簱  ===>>  鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
-                    mainService.crnStnToOutStn();
                     // 鍏ュ嚭搴�  ===>>  鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
                     mainService.crnIoExecute();
                     // 鍏ュ簱  ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
                     mainService.storeFinished();
-                    // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
-                    mainService.recCrnErr();
                     // 浠诲姟涓嬪彂
                     mainService.taskStart();
-                    // 鍑哄簱  ===>>  鍫嗗灈鏈�10鍒嗛挓鏃犱换鍔″垯鍥炲埌婧愮偣
-//                    mainService.crnStnToOutStnSou();
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -60,33 +54,39 @@
         });
         thread.start();
 
-//        thread2 = new Thread(() -> {
-//            while (!Thread.currentThread().isInterrupted()) {
-//                try {
-//                    // 闂撮殧
-//                    Thread.sleep(200);
-//                    // 绯荤粺杩愯鐘舵�佸垽鏂�
-//                    if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
-//                        continue;
-//                    }
-//                    // 杈撻�佺嚎寮傚父淇℃伅璁板綍
-////                    mainService.recDevErr();
-//                    // 鍑哄簱  ===>> 宸ヤ綔妗d俊鎭啓鍏ed鏄剧ず鍣�
-////                    mainService.ledExecute(9);
-//                    // 鍏朵粬  ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
-////                    mainService.ledReset(10);
-//                } catch (Exception e) {
-//                    e.printStackTrace();
-//                }
-//            }
-//        });
-//        thread2.start();
+        thread2 = new Thread(() -> {
+            while (!Thread.currentThread().isInterrupted()) {
+                try {
+                    // 闂撮殧
+                    Thread.sleep(200);
+                    // 绯荤粺杩愯鐘舵�佸垽鏂�
+                    if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
+                        continue;
+                    }
+                    // 鍑哄簱  ===>>  鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
+                    mainService.crnStnToOutStn();
+                    // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
+                    mainService.recCrnErr();
+                    // 鍑哄簱  ===>>  鍫嗗灈鏈�10鍒嗛挓鏃犱换鍔″垯鍥炲埌婧愮偣
+                    mainService.crnStnToOutStnSou();
+                    // 杈撻�佺嚎寮傚父淇℃伅璁板綍
+//                    mainService.recDevErr();
+                    // 鍑哄簱  ===>> 宸ヤ綔妗d俊鎭啓鍏ed鏄剧ず鍣�
+//                    mainService.ledExecute(9);
+                    // 鍏朵粬  ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
+//                    mainService.ledReset(10);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+        thread2.start();
     }
 
     @PreDestroy
     public void shutDown(){
         if (thread != null) thread.interrupt();
-//        if (thread2 != null) thread2.interrupt();
+        if (thread2 != null) thread2.interrupt();
     }
 
 }

--
Gitblit v1.9.1