From f0e2feba85291e700eae3b0a8cedd28f37b44c02 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 19 四月 2025 20:04:34 +0800
Subject: [PATCH] 999
---
src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java | 74 +++++++++++++++++++++++-------------
1 files changed, 47 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java b/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
index 9b14b9f..036411d 100644
--- a/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
+++ b/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
@@ -177,16 +177,20 @@
//褰撳墠绌挎杞﹀簱浣嶅彿
String currentLocNo = shuttleProtocol.getCurrentLocNo();
int currentLev = Utils.getLev(currentLocNo);
- List<WrkMast> wrkMasts1 = wrkMastService.selectNoShuttleWrkByLev(currentLev);//鍒ゆ柇褰撳墠绌挎杞︽ゼ灞傛槸鍚︽湁寰呭垎閰嶈溅杈嗙殑浠诲姟锛屽鏋滄湁鍒欎笉鍒嗛厤杩欒締杞�
- int shuttleCount = this.getShuttleCountByLev(currentLev);//鑾峰彇绌挎杞︽ゼ灞傝溅杈嗘暟閲�
- if (!wrkMasts1.isEmpty() && shuttleCount <= 1) {
- //瀛樺湪鍏朵粬浠诲姟涓斿彲鐢ㄥ皬杞︽暟閲忓皬浜庣瓑浜�1锛岃烦杩囪繖杈嗚溅
- continue;
- }
+// List<WrkMast> wrkMasts1 = wrkMastService.selectNoShuttleWrkByLev(currentLev);//鍒ゆ柇褰撳墠绌挎杞︽ゼ灞傛槸鍚︽湁寰呭垎閰嶈溅杈嗙殑浠诲姟锛屽鏋滄湁鍒欎笉鍒嗛厤杩欒締杞�
+// int shuttleCount = this.getShuttleCountByLev(currentLev);//鑾峰彇绌挎杞︽ゼ灞傝溅杈嗘暟閲�
+// if (!wrkMasts1.isEmpty() && shuttleCount <= 1) {
+// //瀛樺湪鍏朵粬浠诲姟涓斿彲鐢ㄥ皬杞︽暟閲忓皬浜庣瓑浜�1锛岃烦杩囪繖杈嗚溅
+// continue;
+// }
//ABS(鐩爣妤煎眰 - 褰撳墠妤煎眰) 寰楀埌宸窛锛屽彇鏈�灏忓樊鍊�
int currentValue = Math.abs(lev - currentLev);
- diffShuttles.put(currentValue, shuttleThread);
+ if (diffShuttles.get(currentValue) != null) {
+ diffShuttles.put(currentValue + 1, shuttleThread);
+ } else {
+ diffShuttles.put(currentValue, shuttleThread);
+ }
}
//灏濊瘯璋冨害璺ㄦゼ灞傚皬杞�
@@ -203,7 +207,7 @@
}
}
- News.info("{}鐩爣搴撲綅娌℃湁鎼滅储鍒板彲鐢ㄧ┛姊溅", locNo);
+ //News.info("{}鐩爣搴撲綅娌℃湁鎼滅储鍒板彲鐢ㄧ┛姊溅", locNo);
return false;
}
@@ -240,7 +244,7 @@
int currentLev = Utils.getLev(shuttleProtocol.getCurrentLocNo());//灏忚溅褰撳墠灞傞珮
String currentLocNo = shuttleProtocol.getCurrentLocNo();//灏忚溅褰撳墠搴撲綅鍙�
- if (currentLocNo.equals(locNo)) {
+ if (currentLocNo.equals(locNo) || currentLocNo.equals(sourceLocNo)) {
//杞﹁締褰撳墠浣嶇疆宸茬粡鏄洰鏍囧簱浣嶏紝璋冨害璇ヨ溅
//缁欏伐浣滄。缁戝畾灏忚溅鍙�
WrkMast wrkMast1 = wrkMastService.selectByWorkNo(wrkNo);
@@ -274,12 +278,22 @@
sameShuttles.put(-1, shuttleThread);
continue;
}
-
- //褰撳墠绌挎杞︾嚎绋嬪埌鐩爣鍦扮偣璺濈
- List<NavigateNode> currentShuttlePath = navigateUtils.calc(currentLocNo, locNo, NavigationMapType.NORMAL.id, Utils.getShuttlePoints(shuttleNo, Utils.getLev(currentLocNo)), null);//鎼滅储绌洪棽绌挎杞︼紝浣跨敤姝ｅ父閫氶亾鍦板浘
- if (currentShuttlePath == null) {
- continue;
+ //TODO
+ List<NavigateNode> currentShuttlePath;
+ if (Utils.getLev(currentLocNo) != Utils.getLev(locNo)) {
+ //褰撳墠绌挎杞︾嚎绋嬪埌鐩爣鍦扮偣璺濈
+ currentShuttlePath = navigateUtils.calc(currentLocNo, sourceLocNo, NavigationMapType.NORMAL.id, Utils.getShuttlePoints(shuttleNo, Utils.getLev(currentLocNo)), null);//鎼滅储绌洪棽绌挎杞︼紝浣跨敤姝ｅ父閫氶亾鍦板浘
+ if (currentShuttlePath == null) {
+ continue;
+ }
+ } else {
+ //褰撳墠绌挎杞︾嚎绋嬪埌鐩爣鍦扮偣璺濈
+ currentShuttlePath = navigateUtils.calc(currentLocNo, locNo, NavigationMapType.NORMAL.id, Utils.getShuttlePoints(shuttleNo, Utils.getLev(currentLocNo)), null);//鎼滅储绌洪棽绌挎杞︼紝浣跨敤姝ｅ父閫氶亾鍦板浘
+ if (currentShuttlePath == null) {
+ continue;
+ }
}
+
Integer currentAllDistance = navigateUtils.getOriginPathAllDistance(currentShuttlePath);//璁＄畻褰撳墠璺緞琛岃蛋鎬昏窛绂�
sameShuttles.put(currentAllDistance, shuttleThread);
}
@@ -319,16 +333,20 @@
//褰撳墠绌挎杞﹀簱浣嶅彿
String currentLocNo = shuttleProtocol.getCurrentLocNo();
int currentLev = Utils.getLev(currentLocNo);
- List<WrkMast> wrkMasts1 = wrkMastService.selectNoShuttleWrkByLev(currentLev);//鍒ゆ柇褰撳墠绌挎杞︽ゼ灞傛槸鍚︽湁寰呭垎閰嶈溅杈嗙殑浠诲姟锛屽鏋滄湁鍒欎笉鍒嗛厤杩欒締杞�
- int shuttleCount = this.getShuttleCountByLev(currentLev);//鑾峰彇绌挎杞︽ゼ灞傝溅杈嗘暟閲�
- if (!wrkMasts1.isEmpty() && shuttleCount <= 1) {
- //瀛樺湪鍏朵粬浠诲姟涓斿彲鐢ㄥ皬杞︽暟閲忓皬浜庣瓑浜�1锛岃烦杩囪繖杈嗚溅
- continue;
- }
+// List<WrkMast> wrkMasts1 = wrkMastService.selectNoShuttleWrkByLev(currentLev);//鍒ゆ柇褰撳墠绌挎杞︽ゼ灞傛槸鍚︽湁寰呭垎閰嶈溅杈嗙殑浠诲姟锛屽鏋滄湁鍒欎笉鍒嗛厤杩欒締杞�
+// int shuttleCount = this.getShuttleCountByLev(currentLev);//鑾峰彇绌挎杞︽ゼ灞傝溅杈嗘暟閲�
+// if (!wrkMasts1.isEmpty() && shuttleCount <= 1) {
+// //瀛樺湪鍏朵粬浠诲姟涓斿彲鐢ㄥ皬杞︽暟閲忓皬浜庣瓑浜�1锛岃烦杩囪繖杈嗚溅
+// continue;
+// }
//ABS(鐩爣妤煎眰 - 褰撳墠妤煎眰) 寰楀埌宸窛锛屽彇鏈�灏忓樊鍊�
int currentValue = Math.abs(lev - currentLev);
- diffShuttles.put(currentValue, shuttleThread);
+ if (diffShuttles.get(currentValue) != null) {
+ diffShuttles.put(currentValue + 1, shuttleThread);
+ } else {
+ diffShuttles.put(currentValue, shuttleThread);
+ }
}
//灏濊瘯璋冨害璺ㄦゼ灞傚皬杞�
@@ -348,6 +366,7 @@
News.info("{}鐩爣搴撲綅娌℃湁鎼滅储鍒板彲鐢ㄧ┛姊溅", locNo);
return false;
}
+
/**
* 灏忚溅杩佺Щ浠诲姟鐢熸垚
@@ -387,18 +406,20 @@
News.info("{}鍙峰皬杞︼紝瀛樺湪绉诲姩浠诲姟锛岀瓑寰呮墽琛屽畬鎴愬悗鍐嶇敓鎴愭柊鐨勪换鍔�", shuttleNo);
return false;
}
-
+ WrkMast mainWrkMast = null;
//鑾峰彇涓诲伐浣滄。淇℃伅
- WrkMast mainWrkMast = wrkMastService.selectByWorkNo(wrkNo);
+ if (wrkNo != null) {
+ mainWrkMast = wrkMastService.selectByWorkNo(wrkNo);
+ }
//鍒ゆ柇鏄惁鏈夊叾浠栦换鍔℃鍦ㄤ娇鐢ㄧ┛姊溅
- WrkMast wrkMast2 = wrkMastService.selectShuttleWorking(shuttleNo);
+ WrkMast wrkMast2 = wrkMastService.selectShuttleWorking2(shuttleNo, wrkNo, mainWrkMast != null ? mainWrkMast.getMainWrkNo() : null);
if (wrkMast2 != null && !disableCheck) {//灏忚溅瀛樺湪鍏朵粬宸ヤ綔妗ｄ换鍔★紝绛夊緟鎵ц瀹屾垚鍚庡啀鐢熸垚鏂扮殑浠诲姟
if (mainWrkMast == null) {
News.info("{}鍙峰皬杞︼紝瀛樺湪鍏朵粬宸ヤ綔妗ｄ换鍔★紝绛夊緟鎵ц瀹屾垚鍐嶇敓鎴愭柊鐨勪换鍔�", shuttleNo);
return false;
} else {
- if (!mainWrkMast.getShuttleNo().equals(shuttleNo)) {
+ if (mainWrkMast.getShuttleNo() != null && !mainWrkMast.getShuttleNo().equals(shuttleNo)) {
News.info("{}鍙峰皬杞︼紝瀛樺湪鍏朵粬宸ヤ綔妗ｄ换鍔★紝绛夊緟鎵ц瀹屾垚鍐嶇敓鎴愭柊鐨勪换鍔�", shuttleNo);
return false;
}
@@ -425,9 +446,8 @@
wrkMast.setLocNo(locNo); // 鐩爣搴撲綅
wrkMast.setAppeTime(now);
wrkMast.setModiTime(now);
- wrkMast.setMainWrkNo(mainWrkMast.getWrkNo());
- if ("TRANSPORT_LIFT".equals(flag)) {
+ if ("TRANSPORT_LIFT".equalsIgnoreCase(flag) || "TRANSPORT_DEVP".equalsIgnoreCase(flag)) {
wrkMast.setMainWrkNo(wrkNo);
}
--
Gitblit v1.9.1