From 49a91016f3da4a779cbbc3f7b18571cf4472c5ae Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 28 三月 2024 08:36:26 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/ShuttleProtocol.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
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 d9a3147..ad5496b 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
@@ -16,6 +16,8 @@
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
+import java.util.HashMap;
+
/**
* 鍥涘悜绌挎杞�
*/
@@ -220,7 +222,7 @@
public Integer getTaskNo() {
RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
if (null != redisUtil) {
- Object o = redisUtil.get(DeviceRedisConstant.SHUTTLE_FLAG + this.taskNo);
+ Object o = redisUtil.get(DeviceRedisConstant.SHUTTLE_FLAG + this.shuttleNo);
if (!Cools.isEmpty(o)) {
this.taskNo = Integer.parseInt(String.valueOf(o));
}
@@ -239,9 +241,10 @@
}
//婧愬簱浣�(灏忚溅褰撳墠浣嶇疆)
- Loc currentLoc = locService.getOne(new LambdaQueryWrapper<Loc>()
+ LambdaQueryWrapper<Loc> wrapper = new LambdaQueryWrapper<Loc>()
.eq(Loc::getCode, this.currentCode)
- .eq(Loc::getHostId, this.device.getHostId()));
+ .eq(Loc::getHostId, this.device.getHostId());
+ Loc currentLoc = locService.getOne(wrapper);
if (currentLoc == null) {
return null;
}
@@ -249,4 +252,23 @@
return currentLoc.getLocNo();
}
+ // 鏄惁澶勪簬绌洪棽寰呭懡鐘舵��
+ public Boolean isIdle() {
+ if (this.deviceStatus == null
+ || this.pakMk == null
+ || this.errorCode == null
+ || this.protocolStatus == null
+ ) {
+ return false;
+ }
+
+ boolean res = this.deviceStatus.equals(ShuttleDeviceStatusType.IDLE)
+ && this.pakMk
+ && !this.errorCode.equals("0")
+ && this.getTaskNo() == 0
+ && this.protocolStatus.intValue() == ShuttleProtocolStatusType.IDLE.id
+ ;
+ return res;
+ }
+
}
--
Gitblit v1.9.1