From b27fac2368232913897e6dd4f126c0f8e837d741 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 15 九月 2025 09:08:52 +0800
Subject: [PATCH] 异常口入库日志打印
---
src/main/java/com/zy/controller/ConsoleController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/controller/ConsoleController.java b/src/main/java/com/zy/controller/ConsoleController.java
index 3da518a..97d924a 100644
--- a/src/main/java/com/zy/controller/ConsoleController.java
+++ b/src/main/java/com/zy/controller/ConsoleController.java
@@ -141,8 +141,8 @@
// Short totalBay = locMastMapper.selectTotalBay();
- vo.setOffset((double) new Random().nextInt(560)); // 鍫嗗灈鏈哄亸绉婚噺
- vo.setBay((short) (crnProtocol.getBay() - crn.getOffset())); // 褰撳墠鍒�
+ vo.setOffset((double) new Random().nextInt(500)); // 鍫嗗灈鏈哄亸绉婚噺
+ vo.setBay((short) (crnProtocol.getBay())); // 褰撳墠鍒�
/**
* 鍫嗗灈鏈虹姸鎬佸垽鏂�
*/
@@ -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