From 80d97d40c44165674ee0168be5f08c8ca52d3c06 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 09 六月 2025 09:36:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtwcs' into jxgtwcs
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/LiftProtocol.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
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 3288912..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
@@ -98,6 +98,11 @@
private Boolean hasCar;
/**
+ * 鏁呴殰
+ */
+ private Boolean error;
+
+ /**
* 鏁呴殰鐮�
*/
private String errorCode;
@@ -213,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();
--
Gitblit v1.9.1