From 35c3d65ff0926fc7516c8f26c08c63b807806e3a Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 18 七月 2023 08:55:34 +0800
Subject: [PATCH] RgvNode增加任务号
---
src/main/java/com/zy/common/utils/RgvUtils.java | 10 ++++++----
src/main/java/com/zy/asrs/entity/RgvNode.java | 2 ++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 8 ++++----
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/RgvNode.java b/src/main/java/com/zy/asrs/entity/RgvNode.java
index 644f8ff..03ced84 100644
--- a/src/main/java/com/zy/asrs/entity/RgvNode.java
+++ b/src/main/java/com/zy/asrs/entity/RgvNode.java
@@ -11,6 +11,8 @@
private Integer rgvNo = 0;//RGV鍙�
+ private Integer wrkNo = 0;//浠诲姟鍙�
+
public RgvNode(Integer path) {
this.path = path;
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 46291f8..d4fda9b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -647,7 +647,7 @@
continue;
}
//琛岃蛋璺緞绌洪棽锛岄攣瀹氳矾寰�
- RgvUtils.lockPath(startPath, endPath, rgvProtocol.getRgvNo(), true);
+ RgvUtils.lockPath(startPath, endPath, rgvProtocol.getRgvNo(), wrkMast.getWrkNo(), true);
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
RgvCommand rgvCommand = new RgvCommand();
@@ -693,7 +693,7 @@
continue;
}
//琛岃蛋璺緞绌洪棽锛岄攣瀹氳矾寰�
- RgvUtils.lockPath(startPath, endPath, rgvProtocol.getRgvNo(), true);
+ RgvUtils.lockPath(startPath, endPath, rgvProtocol.getRgvNo(), wrkMast.getWrkNo(), true);
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
RgvCommand rgvCommand = new RgvCommand();
@@ -736,7 +736,7 @@
continue;
}
//琛岃蛋璺緞绌洪棽锛岄攣瀹氳矾寰�
- RgvUtils.lockPath(startPath, endPath, rgvProtocol.getRgvNo(), true);
+ RgvUtils.lockPath(startPath, endPath, rgvProtocol.getRgvNo(), wrkMast.getWrkNo(), true);
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
RgvCommand rgvCommand = new RgvCommand();
@@ -782,7 +782,7 @@
continue;
}
//琛岃蛋璺緞绌洪棽锛岄攣瀹氳矾寰�
- RgvUtils.lockPath(startPath, endPath, rgvProtocol.getRgvNo(), true);
+ RgvUtils.lockPath(startPath, endPath, rgvProtocol.getRgvNo(), wrkMast.getWrkNo(), true);
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
RgvCommand rgvCommand = new RgvCommand();
diff --git a/src/main/java/com/zy/common/utils/RgvUtils.java b/src/main/java/com/zy/common/utils/RgvUtils.java
index 8284f61..972607b 100644
--- a/src/main/java/com/zy/common/utils/RgvUtils.java
+++ b/src/main/java/com/zy/common/utils/RgvUtils.java
@@ -39,13 +39,13 @@
}
//閿佸畾/瑙ｉ攣璺緞
- public static void lockPath(Integer startPath, Integer endPath, Integer rgvNo, boolean lock) {
+ public static void lockPath(Integer startPath, Integer endPath, Integer rgvNo, Integer wrkNo, boolean lock) {
List<RgvNode> pathList = getPathList(startPath, endPath);//閫氳繃璧风偣鍜岀洰鏍囩偣鑾峰彇琛岃蛋璺緞
- lockPath(pathList, rgvNo, lock);
+ lockPath(pathList, rgvNo, wrkNo, lock);
}
//閿佸畾/瑙ｉ攣璺緞
- public static void lockPath(List<RgvNode> pathList, Integer rgvNo, boolean lock) {
+ public static void lockPath(List<RgvNode> pathList, Integer rgvNo, Integer wrkNo, boolean lock) {
RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
Object data = redisUtil.get("rgv_map");
List<RgvNode> rgvNodes = JSON.parseArray(data.toString(), RgvNode.class);//瀹炴椂鍦板浘
@@ -59,10 +59,12 @@
//璺緞鐩稿悓
if (lock) {
rgvNode.setLock(true);//閿佸畾
- rgvNode.setRgvNo(rgvNo);
+ rgvNode.setRgvNo(rgvNo);//RGV鍙�
+ rgvNode.setWrkNo(wrkNo);//宸ヤ綔鍙�
} else {
rgvNode.setLock(false);//瑙ｉ攣
rgvNode.setRgvNo(0);
+ rgvNode.setRgvNo(0);
}
}
}
--
Gitblit v1.9.1