From bf18e7de3ebfa4d258b1b4c94451a2221a17cd42 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 03 四月 2024 14:06:14 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/ShuttleProtocol.java | 63 ++++++++++++++++++++++++++++++-
1 files changed, 61 insertions(+), 2 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 325a2f5..97b5d64 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
@@ -1,14 +1,22 @@
package com.zy.asrs.wcs.rcs.model.protocol;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
+import com.zy.asrs.wcs.core.entity.Loc;
+import com.zy.asrs.wcs.core.service.LocService;
+import com.zy.asrs.wcs.core.utils.RedisUtil;
+import com.zy.asrs.wcs.rcs.constant.DeviceRedisConstant;
import com.zy.asrs.wcs.rcs.model.enums.ShuttleDeviceStatusType;
import com.zy.asrs.wcs.rcs.model.enums.ShuttleProtocolStatusType;
import com.zy.asrs.wcs.rcs.entity.Device;
import com.zy.asrs.wcs.rcs.entity.ShuttleDeviceStatus;
+import com.zy.asrs.wcs.rcs.model.enums.SlaveType;
import com.zy.asrs.wcs.rcs.service.ShuttleDeviceStatusService;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
+
+import java.util.HashMap;
/**
* 鍥涘悜绌挎杞�
@@ -21,12 +29,12 @@
/**
* 鍥涘悜绌挎杞﹀彿
*/
- private String shuttleNo;
+ private Integer shuttleNo;
/**
* 浠诲姟鍙�
*/
- private String taskNo;
+ private Integer taskNo;
/**
* 褰撳墠灏忚溅鐘舵�侊紙鍐呴儴鑷垜缁存姢锛�
@@ -81,6 +89,11 @@
* 鏄惁椤跺崌
*/
private Boolean hasLift;
+
+ /**
+ * 鏄惁鏈夋墭鐩�
+ */
+ private Boolean hasPallet;
/**
* 琛岄┒鏂瑰悜
@@ -155,6 +168,11 @@
private Device device;
/**
+ * 鎵╁睍瀛楁
+ */
+ private Object extend;
+
+ /**
* 璁剧疆灏忚溅鐘舵��
*/
public void setProtocolStatus(Integer status) {
@@ -211,4 +229,45 @@
return false;//榛樿涓嶇┖闂�
}
+ public Integer getTaskNo() {
+ RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
+ if (null != redisUtil) {
+ Object o = redisUtil.get(DeviceRedisConstant.SHUTTLE_FLAG + this.shuttleNo);
+ if (!Cools.isEmpty(o)) {
+ this.taskNo = Integer.parseInt(String.valueOf(o));
+ }
+ }
+ return this.taskNo == null ? 0 : this.taskNo;
+ }
+
+ public void setTaskNo(Integer taskNo) {
+ RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
+ if (null != redisUtil) {
+ redisUtil.set(DeviceRedisConstant.SHUTTLE_FLAG + this.shuttleNo, taskNo);
+ this.taskNo = taskNo;
+ }
+ }
+
+ //閫氳繃褰撳墠浜岀淮鐮佽幏鍙栧綋鍓嶅簱浣嶅彿
+ public String getCurrentLocNo() {
+ LocService locService = SpringUtils.getBean(LocService.class);
+ if (locService == null) {
+ return null;
+ }
+ if (this.currentCode == null) {
+ return null;
+ }
+
+ //婧愬簱浣�(灏忚溅褰撳墠浣嶇疆)
+ LambdaQueryWrapper<Loc> wrapper = new LambdaQueryWrapper<Loc>()
+ .eq(Loc::getCode, this.currentCode)
+ .eq(Loc::getHostId, this.device.getHostId());
+ Loc currentLoc = locService.getOne(wrapper);
+ if (currentLoc == null) {
+ return null;
+ }
+
+ return currentLoc.getLocNo();
+ }
+
}
--
Gitblit v1.9.1