From 020f48adb61a0350924783c1b397bd381d20ddc8 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期四, 19 六月 2025 11:13:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxtlfwcs' into jxtlfwcs

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

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 48dcaa0..cf3409a 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -61,17 +61,18 @@
                     // 鍏ュ簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
                     mainService.storeEmptyPlt();
                     // 鍑哄簱  ===>> 宸ヤ綔妗d俊鎭啓鍏ed鏄剧ず鍣�
-//                    mainService.ledExecute();
+//                    mainService.ledExecute(1);
                     // 鍏朵粬  ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
-//                    mainService.ledReset();
+                    mainService.ledReset();
+//                    mainService.outOfDevp();
 
-                    mainService.outOfDevp();
+                    //鍚姩銆佸畬鎴愩�佹殏鍋滄祴璇曠郴缁熸祴璇�
+                    mainService.packTest1();
+//                    //鐏锛岀粰鍫嗗灈鏈哄彂閫佺伀璀﹁鎶�
+//                    mainService.fierCrn();
 
-                    //鍚姩娴嬭瘯绯荤粺娴嬭瘯
-                    mainService.startTest();
-
-                    //娴嬭瘯绯荤粺瀹屾垚娴嬭瘯纭
-                    mainService.finishTest();
+                    //鑷姩鍑虹┖鏉�
+                    mainService.automaticEmptyBoardOutbound();
 
                 } catch (Exception e) {
                     e.printStackTrace();

--
Gitblit v1.9.1