From 9d0acfb65c80c4948c305ca01338f894b87346a0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 四月 2024 09:44:37 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/LiftProtocol.java | 7 ++++++-
1 files changed, 6 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 920f2ff..40af86a 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
@@ -135,6 +135,11 @@
private Device device;
/**
+ * 鎵╁睍瀛楁
+ */
+ private Object extend;
+
+ /**
* 璁剧疆鎻愬崌鏈虹姸鎬�
*/
public void setProtocolStatus(Integer status) {
@@ -150,7 +155,7 @@
this.protocolStatusType = status;
}
- public void setTaskNo(Integer taskNo) {
+ public synchronized void setTaskNo(Integer taskNo) {
RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
if (null != redisUtil) {
redisUtil.set(DeviceRedisConstant.LIFT_FLAG + this.liftNo, taskNo);
--
Gitblit v1.9.1