From 88a1fbd68cfb38c921fbf83c92d17b38a4a5975a Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 02 八月 2023 09:14:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java b/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java
index 1390aa8..041362d 100644
--- a/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java
+++ b/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java
@@ -45,14 +45,14 @@
/**
* 璋冨害杞﹁締-璋冨害鎸囧畾绌挎杞�
*/
- public void dispatchShuttle(Integer wrkNo, String locNo, Integer shuttleNo) {
- shuttleMoveGenerate(wrkNo, locNo, shuttleNo);
+ public boolean dispatchShuttle(Integer wrkNo, String locNo, Integer shuttleNo) {
+ return shuttleMoveGenerate(wrkNo, locNo, shuttleNo);
}
/**
* 璋冨害杞﹁締
*/
- public void dispatchShuttle(Integer wrkNo, String locNo) {
+ public boolean dispatchShuttle(Integer wrkNo, String locNo) {
ArrayList<NyShuttleThread> sameLev = new ArrayList<>();//鐩稿悓妤煎眰鐨勭┛姊溅
ArrayList<NyShuttleThread> diffLev = new ArrayList<>();//涓嶅悓妤煎眰鐨勭┛姊溅
@@ -135,18 +135,18 @@
}
if (recentShuttle == null) {//娌℃湁鎼滅储鍒板彲鐢ㄧ┛姊溅
- return;
+ return false;
}
//鎼滅储鍒板彲鐢ㄧ┛姊溅锛岃皟搴﹁杞�
- shuttleMoveGenerate(wrkNo, locNo, recentShuttle.getSlave().getId());
+ return shuttleMoveGenerate(wrkNo, locNo, recentShuttle.getSlave().getId());
}
/**
* 灏忚溅杩佺Щ浠诲姟鐢熸垚
*/
@Transactional
- public boolean shuttleMoveGenerate(Integer wrkNo, String locNo, Integer shuttleNo) {
+ private boolean shuttleMoveGenerate(Integer wrkNo, String locNo, Integer shuttleNo) {
Date now = new Date();
//鑾峰彇鍥涘悜绌挎杞︾嚎绋�
NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleNo);
--
Gitblit v1.9.1