From ff1fedd00c22aa232541f63ebcaa5a7f929b89b7 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 15 七月 2024 08:28:26 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/MybatisPlusConfig.java | 4 +++-
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/LiftProtocol.java | 1 -
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/ShuttleProtocol.java | 1 -
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/MybatisPlusConfig.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/MybatisPlusConfig.java
index 706a703..7038382 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/MybatisPlusConfig.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/config/MybatisPlusConfig.java
@@ -48,7 +48,9 @@
return Arrays.asList(
"sys_host",
"sys_user_role",
- "sys_role_menu"
+ "sys_role_menu",
+ "wcs_bas_shuttle_err",
+ "wcs_bas_lift_err"
).contains(tableName);
}
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/LiftProtocol.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/LiftProtocol.java
index ed84a25..60df86b 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/LiftProtocol.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/LiftProtocol.java
@@ -218,7 +218,6 @@
BasLiftErrService basLiftErrService = SpringUtils.getBean(BasLiftErrService.class);
BasLiftErr liftErr = basLiftErrService.getOne(new LambdaQueryWrapper<BasLiftErr>()
.eq(BasLiftErr::getErrorCode, this.errorCode)
- .eq(BasLiftErr::getHostId, this.device.getHostId())
.eq(BasLiftErr::getDevicePlc, this.device.getDevicePlc()));
if (liftErr != null) {
return this.errorCode + "-" + liftErr.getErrName();
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/ShuttleProtocol.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/ShuttleProtocol.java
index 9925d1e..2290603 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/ShuttleProtocol.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/ShuttleProtocol.java
@@ -233,7 +233,6 @@
BasShuttleErrService basShuttleErrService = SpringUtils.getBean(BasShuttleErrService.class);
BasShuttleErr shuttleErr = basShuttleErrService.getOne(new LambdaQueryWrapper<BasShuttleErr>()
.eq(BasShuttleErr::getErrorCode, this.errorCode)
- .eq(BasShuttleErr::getHostId, this.device.getHostId())
.eq(BasShuttleErr::getDevicePlc, this.device.getDevicePlc()));
if (shuttleErr != null) {
return this.errorCode + "-" + shuttleErr.getErrName();
--
Gitblit v1.9.1