From 9d7d209d4a4bdc3f70c46c5a51d202cd17b1e469 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Wed, 23 Apr 2025 08:43:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BD=92=E9=9B=B6=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/a8k/app/constant/AppConstant.java              |  2 +-
 .../app/service/lowerctrl/DeviceMoveToZeroCtrlService.java   |  4 ++--
 .../service/mainctrl/mainflowctrl/MainFlowCtrlScheduler.java | 12 +++---------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/main/java/a8k/app/constant/AppConstant.java b/src/main/java/a8k/app/constant/AppConstant.java
index 8e06851..8e59cca 100644
--- a/src/main/java/a8k/app/constant/AppConstant.java
+++ b/src/main/java/a8k/app/constant/AppConstant.java
@@ -5,7 +5,7 @@ public class AppConstant {
 	public static final int    CONSUMABLE_COL_NUM = 5;
 	public static final int    CONSUMABLE_ROW_NUM = 5;
 	public static final int    TIP_NUM            = 120;
-	public static final String APP_VERSION        = "1.1.4";
+	public static final String APP_VERSION        = "1.1.5";
 
 	public static final int CONSUMABLE_CHANNEL_NUM = 6;
 
diff --git a/src/main/java/a8k/app/service/lowerctrl/DeviceMoveToZeroCtrlService.java b/src/main/java/a8k/app/service/lowerctrl/DeviceMoveToZeroCtrlService.java
index f72f68c..f735fe0 100644
--- a/src/main/java/a8k/app/service/lowerctrl/DeviceMoveToZeroCtrlService.java
+++ b/src/main/java/a8k/app/service/lowerctrl/DeviceMoveToZeroCtrlService.java
@@ -179,10 +179,10 @@ public class DeviceMoveToZeroCtrlService {
 			log.info("入料平移电机回零");
 			stepMotorCtrlDriver.stepMotorEasyMoveToZeroBlock(StepMotorMId.FeedingModXM);
 			//板夹仓初始化
-			log.info("板夹仓Y轴电机回零");
-			stepMotorCtrlDriver.stepMotorEasyMoveToZeroBlock(StepMotorMId.PlatesBoxYM);
 			log.info("板夹仓推板电机回零");
 			stepMotorCtrlDriver.stepMotorEasyMoveToZeroBlock(StepMotorMId.PlatesBoxPusherM);
+			log.info("板夹仓Y轴电机回零");
+			stepMotorCtrlDriver.stepMotorEasyMoveToZeroBlock(StepMotorMId.PlatesBoxYM);
 			//光学模组初始化
 			log.info("光学模组扫码电机回零");
 			stepMotorCtrlDriver.stepMotorEasyMoveToZeroBlock(StepMotorMId.OptModScannerM);
diff --git a/src/main/java/a8k/app/service/mainctrl/mainflowctrl/MainFlowCtrlScheduler.java b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/MainFlowCtrlScheduler.java
index 7d0a838..eb2cf1f 100644
--- a/src/main/java/a8k/app/service/mainctrl/mainflowctrl/MainFlowCtrlScheduler.java
+++ b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/MainFlowCtrlScheduler.java
@@ -289,15 +289,9 @@ public class MainFlowCtrlScheduler implements ApplicationListener<ApplicationSta
 			}
 
 			switch (state.workState) {
-				case IDLE -> {
-					onIDLE();
-				}
-				case WORKING -> {
-					onWorking();
-				}
-				case PAUSE -> {
-					onPause();
-				}
+				case IDLE -> onIDLE();
+				case WORKING -> onWorking();
+				case PAUSE -> onPause();
 			}
 
 			onPostProcessing();