From 8a6708483dc45397c22fd276fe18c5827a7ae6e2 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期日, 24 八月 2025 16:18:16 +0800
Subject: [PATCH] 出库站点1031转换到1040显示屏显示
---
src/main/java/com/zy/controller/ConsoleController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/controller/ConsoleController.java b/src/main/java/com/zy/controller/ConsoleController.java
index 57ec3ec..97d924a 100644
--- a/src/main/java/com/zy/controller/ConsoleController.java
+++ b/src/main/java/com/zy/controller/ConsoleController.java
@@ -152,7 +152,7 @@
if (crnProtocol.getTaskNo()>0) {
WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
if (wrkMast != null) {
- vo.setCrnStatus(CrnStatusType.process(wrkMast.getIoType()));
+ vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO) ? CrnStatusType.process(wrkMast.getIoType()) : CrnStatusType.MACHINE_UN_AUTO);
} else {
vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO: CrnStatusType.MACHINE_UN_AUTO);
}
--
Gitblit v1.9.1