From a2bf670143f51ce7fc9ae77ba0c4f113fca5f0e4 Mon Sep 17 00:00:00 2001
From: taisheng <taisheng@qq.com>
Date: 星期二, 25 二月 2025 15:40:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java | 38 +++++++++++++++++++++++++++-----------
1 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java b/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
index 72f341a..d8d6497 100644
--- a/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
+++ b/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
@@ -13,6 +13,7 @@
import com.zy.core.News;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
+import com.zy.core.enums.WrkIoType;
import com.zy.core.enums.WrkStsType;
import com.zy.core.model.ForkLiftSlave;
import com.zy.core.model.ShuttleSlave;
@@ -225,11 +226,21 @@
return false;
}
+ //鑾峰彇涓诲伐浣滄。淇℃伅
+ WrkMast mainWrkMast = wrkMastService.selectByWorkNo(wrkNo);
+
//鍒ゆ柇鏄惁鏈夊叾浠栦换鍔℃鍦ㄤ娇鐢ㄧ┛姊溅
WrkMast wrkMast2 = wrkMastService.selectShuttleWorking(shuttleNo);
if (wrkMast2 != null) {//灏忚溅瀛樺湪鍏朵粬宸ヤ綔妗ｄ换鍔★紝绛夊緟鎵ц瀹屾垚鍚庡啀鐢熸垚鏂扮殑浠诲姟
- News.info("{}鍙峰皬杞︼紝瀛樺湪鍏朵粬宸ヤ綔妗ｄ换鍔★紝绛夊緟鎵ц瀹屾垚鍐嶇敓鎴愭柊鐨勪换鍔�", shuttleNo);
- return false;
+ if (mainWrkMast == null) {
+ News.info("{}鍙峰皬杞︼紝瀛樺湪鍏朵粬宸ヤ綔妗ｄ换鍔★紝绛夊緟鎵ц瀹屾垚鍐嶇敓鎴愭柊鐨勪换鍔�", shuttleNo);
+ return false;
+ }else {
+ if (!mainWrkMast.getShuttleNo().equals(shuttleNo)) {
+ News.info("{}鍙峰皬杞︼紝瀛樺湪鍏朵粬宸ヤ綔妗ｄ换鍔★紝绛夊緟鎵ц瀹屾垚鍐嶇敓鎴愭柊鐨勪换鍔�", shuttleNo);
+ return false;
+ }
+ }
}
Integer sourceStaNo = null;//灏忚溅鎹㈠眰婧愮珯鐐�
@@ -243,19 +254,25 @@
return false;//娌℃湁鍙敤涓旂┖闂茬殑杈撻�佺珯鐐�
}
sourceStaNo = liftSta.getStaNo();//婧愮珯鐐�
- //鎻愬崌鏈哄彿*100+鐩爣妤煎眰=鐩爣绔欑偣
- staNo = liftSta.getLiftNo() * 100 + Utils.getLev(locNo);//鐩爣绔�
+
+ ForkLiftStaProtocol targetLiftSta = ForkLiftUtils.getLiftStaByLev(liftSta.getLiftNo(), Utils.getLev(locNo));
+ if (targetLiftSta == null) {
+ News.info("{}鍙峰皬杞︼紝{}鐩爣搴撲綅锛屾病鏈夌洰鏍囩珯鐐�", shuttleNo, locNo);
+ return false;//娌℃湁鎵惧埌鐩爣绔欑偣
+ }
+ //鐩爣绔欑偣
+ staNo = targetLiftSta.getStaNo();//鐩爣绔�
}
// 鑾峰彇宸ヤ綔鍙�
- int workNo = commonService.getWorkNo(0);
+ int workNo = commonService.getWorkNo(WrkIoType.SHUTTLE_MOVE.id);
// 淇濆瓨宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
wrkMast.setIoTime(now);
wrkMast.setWrkSts(WrkStsType.NEW_MOVE.sts); // 宸ヤ綔鐘舵�侊細301.鐢熸垚杩佺Щ浠诲姟
- wrkMast.setIoType(200); // 鍏ュ嚭搴撶姸鎬侊細 200.灏忚溅杩佺Щ
- wrkMast.setIoPri(20D);
+ wrkMast.setIoType(WrkIoType.SHUTTLE_MOVE.id); // 鍏ュ嚭搴撶姸鎬侊細 200.灏忚溅杩佺Щ
+ wrkMast.setIoPri(800D);
wrkMast.setShuttleNo(shuttleNo);//绌挎杞﹀彿
wrkMast.setSourceLocNo(shuttleProtocol.getCurrentLocNo()); // 婧愬簱浣� => 灏忚溅褰撳墠搴撲綅鍙�
wrkMast.setLocNo(locNo); // 鐩爣搴撲綅
@@ -270,10 +287,9 @@
}
//缁欏伐浣滄。缁戝畾灏忚溅鍙�
- WrkMast wrkMast1 = wrkMastService.selectByWorkNo(wrkNo);
- if (wrkMast1 != null) {
- wrkMast1.setShuttleNo(shuttleNo);
- wrkMastService.updateById(wrkMast1);
+ if (mainWrkMast != null) {
+ mainWrkMast.setShuttleNo(shuttleNo);
+ wrkMastService.updateById(mainWrkMast);
}
return true;
--
Gitblit v1.9.1