From 6c6a1178f2e5900d56a381e12f9c9f998cf9b270 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 20 六月 2023 11:25:22 +0800
Subject: [PATCH] fix
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 483 +++++++++++++++++++++++++++++++----------------------
1 files changed, 283 insertions(+), 200 deletions(-)
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 45040ef..a3270f1 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.*;
@@ -684,6 +685,11 @@
//鍒ゆ柇鎻愬崌鏈烘槸鍚︾┖闂�
if (!liftProtocol.isIdle()) {
+ try {
+ Thread.sleep(1000);//浼戠湢1s
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
continue;//鎻愬崌鏈哄繖
}
@@ -695,7 +701,7 @@
continue;//鎻愬崌鏈轰笉鍦ㄧ洰鏍囨ゼ灞傝烦杩�
}
- Integer staNo = Utils.levToOutInStaNo(lev);
+ Integer staNo = Utils.levToOutInStaNo(lev >= 2 ? lev + 1 : lev);
//鑾峰彇鐩爣绔欎俊鎭�
StaProtocol staProtocol1 = devpThread.getStation().get(staNo);
if (staProtocol1 == null) {
@@ -743,9 +749,12 @@
//鍚屼竴灞傜洿鎺ュ彇璐ф棤闇�缁忚繃鎻愬崌鏈�
//鐩存帴璁＄畻杞﹀埌鎻愬崌鏈哄彇璐у啀鍒板簱浣嶈矾寰勬寚浠�
List<ShuttleCommand> commands = this.shuttleAssignCommand(wrkMast.getWrkSts() == 4 ? currentLocNo : liftSiteLocNo, liftSiteLocNo, locNo, assignCommand, shuttleThread);
+ if (commands == null) {
+ continue;//鎵句笉鍒拌矾寰勭瓑寰呬笅涓�娆�
+ }
if (wrkMast.getWrkSts() == 8) {
//姝ゆ椂杞﹀湪鎻愬崌鏈哄唴閮紝涓嬭揪涓�姝ユ寚浠よ杞︾Щ鍔ㄥ埌鎻愬崌鏈哄彛
- Integer staNo = Utils.levToOutInStaNo(currentLev);//绔欑偣鍙�
+ Integer staNo = Utils.levToOutInStaNo(currentLev >= 2 ? currentLev + 1 : currentLev);//绔欑偣鍙�
BasDevp basDevp = basDevpService.selectById(staNo);
short startCode = liftProtocol.getBarcode();//鎻愬崌鏈哄唴閮ㄤ簩缁寸爜
@@ -765,7 +774,10 @@
//涓嶅悓灞傦紝灏嗙洰鏍囧簱浣嶅垎閰嶆垚鎻愬崌鏈哄簱浣嶅彿
//灏忚溅绉诲姩鍒版彁鍗囨満鍙ｏ紝璁＄畻璺緞
- List<ShuttleCommand> commands = this.shuttleAssignCommand(currentLocNo, liftSiteLocNo, ShuttleTaskModeType.PAK_IN.id, assignCommand, shuttleThread);
+ List<ShuttleCommand> commands = this.shuttleAssignCommand(currentLocNo, liftSiteLocNo, NavigationMapType.NONE.id, assignCommand, shuttleThread);
+ if (commands == null) {
+ continue;//鏈壘鍒拌矾寰�
+ }
//鑾峰彇褰撳墠灏忚溅鎵�鍦ㄦゼ灞傜殑绔欑偣淇℃伅
BasDevp basDevp = basDevpService.queryByLocNo(liftSiteLocNo);
@@ -975,6 +987,11 @@
//鍒ゆ柇鎻愬崌鏈烘槸鍚︾┖闂�
if (!liftProtocol.isIdle()) {
+ try {
+ Thread.sleep(1000);//浼戠湢1s
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
continue;//鎻愬崌鏈哄繖
}
@@ -986,7 +1003,7 @@
continue;//鎻愬崌鏈轰笉鍦ㄧ洰鏍囨ゼ灞傝烦杩�
}
- Integer staNo = Utils.levToOutInStaNo(lev);
+ Integer staNo = Utils.levToOutInStaNo(lev >= 2 ? lev + 1 : lev);
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
//鑾峰彇鐩爣绔欎俊鎭�
StaProtocol staProtocol1 = devpThread.getStation().get(staNo);
@@ -1021,32 +1038,26 @@
continue;
}
- wrkMast.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());//缁欏伐浣滄。鍒嗛厤鍥涘悜绌挎杞﹀彿
- //婧愬簱浣�(灏忚溅褰撳墠浣嶇疆)
- String currentLocNo = shuttleProtocol.getCurrentLocNo();
-
- //灏忚溅褰撳墠灞傞珮
- Integer currentLev = Utils.getLev(currentLocNo);
- //鑾峰彇鎻愬崌鏈�
- LiftSlave liftSlave = slaveProperties.getLift().get(0);
- //褰撳墠妤煎眰鎻愬崌鏈鸿緭閫佺珯鐐瑰簱浣嶅彿
- String liftSiteLocNo = Utils.levToOutInStaLocNo(currentLev);
-
- //鍒嗛厤浠诲姟鍙�
- shuttleProtocol.setTaskNo(wrkMast.getWrkNo().shortValue());
- //鍒嗛厤婧愬簱浣�
- shuttleProtocol.setSourceLocNo(currentLocNo);
-
- ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
- //鍥涘悜绌挎杞﹀彿
- assignCommand.setShuttleNo(shuttleProtocol.getShuttleNo());
- //浠诲姟鍙�
- assignCommand.setTaskNo(wrkMast.getWrkNo().shortValue());
- //鍏ュ嚭搴撴ā寮�
- assignCommand.setTaskMode(ShuttleTaskModeType.PAK_OUT.id.shortValue());
- assignCommand.setSourceLocNo(currentLocNo);
-
if (wrkMast.getWrkSts() == 21) {
+
+ wrkMast.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());//缁欏伐浣滄。鍒嗛厤鍥涘悜绌挎杞﹀彿
+ //婧愬簱浣�(灏忚溅褰撳墠浣嶇疆)
+ String currentLocNo = shuttleProtocol.getCurrentLocNo();
+
+ //灏忚溅褰撳墠灞傞珮
+ Integer currentLev = Utils.getLev(currentLocNo);
+ //褰撳墠妤煎眰鎻愬崌鏈鸿緭閫佺珯鐐瑰簱浣嶅彿
+ String liftSiteLocNo = Utils.levToOutInStaLocNo(currentLev);
+
+ ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
+ //鍥涘悜绌挎杞﹀彿
+ assignCommand.setShuttleNo(shuttleProtocol.getShuttleNo());
+ //浠诲姟鍙�
+ assignCommand.setTaskNo(wrkMast.getWrkNo().shortValue());
+ //鍏ュ嚭搴撴ā寮�
+ assignCommand.setTaskMode(ShuttleTaskModeType.PAK_OUT.id.shortValue());
+ assignCommand.setSourceLocNo(currentLocNo);
+
//鍒ゆ柇灏忚溅鍜屽簱浣嶆槸鍚﹀湪鍚屼竴灞�
if (Boolean.parseBoolean(searchIdleShuttle.get("sameLay").toString())) {
//鍚屼竴灞�(灏嗗皬杞︾Щ鍔ㄥ埌璐х墿浣嶇疆)
@@ -1057,16 +1068,35 @@
}
//鍒嗛厤鐩爣搴撲綅
shuttleProtocol.setLocNo(wrkMast.getSourceLocNo());
+ //鍒嗛厤浠诲姟鍙�
+ shuttleProtocol.setTaskNo(wrkMast.getWrkNo().shortValue());
+ //鍒嗛厤婧愬簱浣�
+ shuttleProtocol.setSourceLocNo(currentLocNo);
//鐩爣搴撲綅
assignCommand.setLocNo(wrkMast.getSourceLocNo());
assignCommand.setCommands(commands);
wrkMast.setWrkSts(26L);//灏忚溅鎼繍涓�
+
+ if (wrkMastMapper.updateById(wrkMast) > 0) {
+ //涓嬪彂浠诲姟
+ MessageQueue.offer(SlaveType.Shuttle, assignCommand.getShuttleNo().intValue(), new Task(3, assignCommand));
+ }
}else {
//涓嶅悓灞傦紝灏嗙洰鏍囧簱浣嶅垎閰嶆垚鎻愬崌鏈哄簱浣嶅彿(灏嗗皬杞︾Щ鍔ㄥ埌鎻愬崌鏈轰綅缃�)
//灏忚溅鍒版彁鍗囨満鍙ｆ寚浠�
List<ShuttleCommand> commands = this.shuttleAssignCommand(currentLocNo, liftSiteLocNo, ShuttleTaskModeType.PAK_IN.id, assignCommand, shuttleThread);
+ if (commands == null) {
+ if (!currentLocNo.equals(liftSiteLocNo)) {//褰撳墠浣嶇疆涔熶笉鍦ㄦ彁鍗囨満鍙�
+ continue;//鏈壘鍒拌矾寰�
+ }
+ commands = new ArrayList<>();
+ }
shuttleProtocol.setLocNo(liftSiteLocNo);
+ //鍒嗛厤浠诲姟鍙�
+ shuttleProtocol.setTaskNo(wrkMast.getWrkNo().shortValue());
+ //鍒嗛厤婧愬簱浣�
+ shuttleProtocol.setSourceLocNo(currentLocNo);
//鑾峰彇褰撳墠灏忚溅鎵�鍦ㄦゼ灞傜殑绔欑偣淇℃伅
BasDevp basDevp = basDevpService.queryByLocNo(liftSiteLocNo);
@@ -1080,29 +1110,56 @@
assignCommand.setLocNo(liftSiteLocNo);
assignCommand.setCommands(commands);
wrkMast.setWrkSts(22L);//灏忚溅杩佺Щ鐘舵��
+
+ if (wrkMastMapper.updateById(wrkMast) > 0) {
+ //涓嬪彂浠诲姟
+ MessageQueue.offer(SlaveType.Shuttle, assignCommand.getShuttleNo().intValue(), new Task(3, assignCommand));
+ }
}
} else if (wrkMast.getWrkSts() == 25) {
- List<ShuttleCommand> commands = this.shuttleAssignCommand(currentLocNo, wrkMast.getSourceLocNo(), liftSiteLocNo, assignCommand, shuttleThread);
+
+ wrkMast.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());//缁欏伐浣滄。鍒嗛厤鍥涘悜绌挎杞﹀彿
+
+ //褰撳墠妤煎眰鎻愬崌鏈鸿緭閫佺珯鐐瑰簱浣嶅彿
+ String liftSiteLocNo = Utils.levToOutInStaLocNo(liftProtocol.getLev().intValue());
+
+ ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
+ //鍥涘悜绌挎杞﹀彿
+ assignCommand.setShuttleNo(shuttleProtocol.getShuttleNo());
+ //浠诲姟鍙�
+ assignCommand.setTaskNo(wrkMast.getWrkNo().shortValue());
+ //鍏ュ嚭搴撴ā寮�
+ assignCommand.setTaskMode(ShuttleTaskModeType.PAK_OUT.id.shortValue());
+ assignCommand.setSourceLocNo(liftSiteLocNo);
+
+ List<ShuttleCommand> commands = this.shuttleAssignCommand(liftSiteLocNo, wrkMast.getSourceLocNo(), liftSiteLocNo, assignCommand, shuttleThread);
+ if (commands == null) {
+ continue;//鏈壘鍒拌矾寰�
+ }
//姝ゆ椂杞﹀湪鎻愬崌鏈哄唴閮紝闇�瑕佸涓嬭揪涓�姝ユ寚浠よ杞︾Щ鍔ㄥ埌鎻愬崌鏈哄彛
- BasDevp basDevp = basDevpService.selectById(109);//鑾峰彇鎻愬崌鏈轰俊鎭�
- short startCode = Short.parseShort(basDevp.getQrCodeValue());//鎻愬崌鏈轰簩缁寸爜
+ short startCode = liftProtocol.getBarcode();//鎻愬崌鏈哄唴閮ㄤ簩缁寸爜
Short distCode = commands.get(0).getStartCodeNum();//鐩爣浜岀淮鐮�
//鑾峰彇绉诲姩鍛戒护
- ShuttleCommand moveCommand = shuttleThread.getMoveCommand(startCode, distCode, 1300, commands.get(0).getRunDirection(), (short) 1, 0);
+ ShuttleCommand moveCommand = shuttleThread.getMoveCommand(startCode, distCode, 1400, commands.get(0).getRunDirection(), startCode, 1400, 500);
commands.add(0, moveCommand);//灏嗚鎸囦护娣诲姞鍒伴槦澶�
//鍒嗛厤鐩爣搴撲綅
shuttleProtocol.setLocNo(wrkMast.getSourceLocNo());
+ //鍒嗛厤浠诲姟鍙�
+ shuttleProtocol.setTaskNo(wrkMast.getWrkNo().shortValue());
+ //鍒嗛厤婧愬簱浣�
+ shuttleProtocol.setSourceLocNo(liftSiteLocNo);
//鐩爣搴撲綅
assignCommand.setLocNo(wrkMast.getSourceLocNo());
assignCommand.setCommands(commands);
wrkMast.setWrkSts(26L);//灏忚溅鎼繍涓�
+
+ if (wrkMastMapper.updateById(wrkMast) > 0) {
+ //涓嬪彂浠诲姟
+ MessageQueue.offer(SlaveType.Shuttle, assignCommand.getShuttleNo().intValue(), new Task(3, assignCommand));
+ }
}
- if (wrkMastMapper.updateById(wrkMast) > 0) {
- //涓嬪彂浠诲姟
- MessageQueue.offer(SlaveType.Shuttle, assignCommand.getShuttleNo().intValue(), new Task(3, assignCommand));
- }
}
}
}
@@ -1141,49 +1198,7 @@
//宸ヤ綔妗ｄ笉鍚屾ゼ灞傜殑绌挎杞�
diffLev.add(shuttleThread);
}
-//
-// //鏇存柊褰撳墠鏈�杩戠殑鍥涘悜绌挎杞�
-// if (recentShuttle == null) {
-// recentShuttle = shuttleThread;
-// }else {
-// ShuttleProtocol recentShuttleProtocol = recentShuttle.getShuttleProtocol();//鐩墠鏈�杩戠┛姊溅
-// String recentShuttleLocNo = recentShuttleProtocol.getCurrentLocNo();//浜岀淮鐮佸搴斿簱浣嶅彿
-// String recentShuttleLocNoLay = recentShuttleLocNo.substring(recentShuttleLocNo.length() - 2, recentShuttleLocNo.length());//搴撲綅鍙峰搴斿眰楂�
-//
-// int recentShuttleLocNoLayInt = Integer.parseInt(recentShuttleLocNoLay);
-// int i = Math.abs(lev - recentShuttleLocNoLayInt);//宸ヤ綔妗ｆゼ灞傚噺鏈�杩戠┛姊溅妤煎眰锛屽彇缁濆鍊�
-// int j = Math.abs(lev - shuttleLocNoLey);//宸ヤ綔妗ｆゼ灞傚噺褰撳墠绌挎杞︽ゼ灞傦紝鍙栫粷瀵瑰��
-// if (i < j) {
-// //鏇存柊鏈�杩戠┛姊溅
-// recentShuttle = shuttleThread;
-// } else if (i == j) {
-// //妤煎眰鐩稿悓鎯呭喌
-// //鎵捐窛绂诲嚭搴撶偣鏈�杩戠殑杞�
-//
-// if (!(recentShuttleProtocol.isIdle() && shuttleProtocol.isIdle())) {
-// //鍙鏈変竴杈嗚溅涓嶆槸绌洪棽鍒欎笉杩涜璋冨害
-// map.put("sameLay", false);//涓嶅悓灞�
-// map.put("result", null);
-// return map;
-// }
-//
-// //鑾峰彇鎻愬崌鏈�
-// LiftSlave liftSlave = slaveProperties.getLift().get(0);
-// //鎻愬崌鏈哄簱浣嶅彿
-// String recentLiftLocNo = liftSlave.getLiftLocNo(recentShuttleLocNoLayInt);
-// String shuttleLiftLocNo = liftSlave.getLiftLocNo(shuttleLocNoLey);
-//
-// //褰撳墠鏈�杩戝洓鍚戠┛姊溅鍒版彁鍗囨満璺緞
-// List<NavigateNode> recentShuttlePath = NavigateUtils.calc(recentShuttleLocNo, recentLiftLocNo, ShuttleTaskModeType.PAK_IN.id);
-// //褰撳墠妤煎眰鍥涘悜绌挎杞﹀埌鎻愬崌鏈鸿矾寰�
-// List<NavigateNode> shuttlePath = NavigateUtils.calc(shuttleLocNo, shuttleLiftLocNo, ShuttleTaskModeType.PAK_IN.id);
-// //鍒ゆ柇鍝竴涓矾寰勬渶鐭�
-// if (shuttlePath.size() < recentShuttlePath.size()) {
-// //濡傛灉褰撳墠妤煎眰鐨勮溅璺緞鏇村皬锛屽垯鏇存柊鏈�杩戠┛姊溅
-// recentShuttle = shuttleThread;
-// }
-// }
-// }
+
}
if (sameLev.size() > 0) {
@@ -1389,11 +1404,6 @@
continue;
}
- //缁欐彁鍗囨満鍒嗛厤浠诲姟
- liftProtocol.setLiftLock(true);//閿佸畾鎻愬崌鏈�
- liftProtocol.setTaskNo(wrkMast.getWrkNo().shortValue());//璁剧疆浠诲姟鍙�
- liftProtocol.setProtocolStatus(LiftProtocolStatusType.WORKING);//璁剧疆鎻愬崌鏈虹姸鎬佷负宸ヤ綔涓�
-
//鍛戒护list
ArrayList<LiftCommand> commands = new ArrayList<>();
@@ -1411,14 +1421,13 @@
//宸ヤ綔妗ｇ洰鏍囧簱浣嶆ゼ灞�
int wrkMastLocNoLey = Utils.getLev(wrkMastLocNo);
- //鎻愬崌鏈哄綋鍓嶆ゼ灞�
- int liftLev = liftProtocol.getLev().intValue();
- if (liftLev == 0) {//鎻愬崌鏈哄綋鍓嶆ゼ灞備负0锛屾彁鍗囨満澶卞幓浣嶇疆淇℃伅锛岃鎻愬崌鏈哄墠寰�涓�妤�
- LiftCommand command = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), LiftLevType.ONE.lev);
- commands.add(command);//灏嗗懡浠ゆ坊鍔犺繘list
+ Integer levTmp = wrkMastLocNoLey;
+ if (wrkMastLocNoLey >= 2) {
+ levTmp += 1;
}
+ Integer distStaNo = Utils.levToOutInStaNo(levTmp);
- if (liftLev != LiftLevType.TWO.realLev) {
+ if (liftProtocol.getPositionArrivalFeedback().intValue() != LiftLevType.TWO.realLev.intValue()) {
//鎻愬崌鏈轰笉鍦ㄨ緭閫佺嚎妤煎眰锛岃幏鍙栧埌杈撻�佺嚎灞傜殑鎻愬崌鏈哄懡浠�
LiftCommand command1 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), LiftLevType.TWO.lev);
commands.add(command1);//灏嗗懡浠ゆ坊鍔犺繘list
@@ -1429,12 +1438,8 @@
command2.setOperaStaNo((short) 102);//鎿嶄綔102绔�
command2.setRotationDire(1);//缁欒緭閫佺嚎涓嬪彂閾炬潯杞姩淇″彿锛屾杞�
command2.setDevpId(devpId);
+ command2.setStaNo(distStaNo.shortValue());//璁剧疆鐩爣绔�
commands.add(command2);//灏嗗懡浠ゆ坊鍔犺繘list
-
- Integer levTmp = wrkMastLocNoLey;
- if (wrkMastLocNoLey >= 2) {
- levTmp += 1;
- }
//鎻愬崌鏈哄墠寰�鐩爣妤煎眰(宸ヤ綔妗ｇ洰鏍囨ゼ灞�)
LiftCommand command3 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), levTmp);
@@ -1443,30 +1448,57 @@
//鎻愬崌鏈哄埌杈炬寚瀹氭ゼ灞傦紝杈撻�佺嚎灏嗚揣鐗╃Щ鍑哄幓(姝ｈ浆)
//杈撻�佺嚎灏嗚揣鐗╃Щ鍑哄幓
LiftCommand command4 = liftThread.getLiftTurnCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), 1);
- Integer distStaNo = Utils.levToOutInStaNo(levTmp);
command4.setOperaStaNo(distStaNo.shortValue());//鎿嶄綔鐩爣妤煎眰绔欑偣
command4.setRotationDire(1);//缁欒緭閫佺嚎涓嬪彂閾炬潯杞姩淇″彿锛屾杞�
command4.setDevpId(devpId);
+ command4.setStaNo(distStaNo.shortValue());//璁剧疆鐩爣绔�
commands.add(command4);//灏嗗懡浠ゆ坊鍔犺繘list
+
+ //缁欐彁鍗囨満鍒嗛厤浠诲姟
+ liftProtocol.setTaskNo(wrkMast.getWrkNo().shortValue());//璁剧疆浠诲姟鍙�
+ liftProtocol.setProtocolStatus(LiftProtocolStatusType.WORKING);//璁剧疆鎻愬崌鏈虹姸鎬佷负宸ヤ綔涓�
wrkMast.setWrkSts(3L);//3.鎻愬崌鏈烘惉杩愪腑
} else if (wrkMast.getWrkSts() == 6) {//6.杩佺Щ灏忚溅鑷虫彁鍗囨満鍙ｅ畬鎴� => 7.鎻愬崌鏈鸿縼绉诲皬杞︿腑
liftProtocol.setShuttleNo(wrkMast.getShuttleNo().shortValue());//璁剧疆鍥涘悜绌挎杞﹀彿
+ //鍒ゆ柇灏忚溅鏄惁鍦ㄦ彁鍗囨満鍐咃紝涓斿浜庣┖闂茬姸鎬�
+ ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, wrkMast.getShuttleNo());
+ if (shuttleThread == null) {
+ continue;
+ }
+ ShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
+ if (shuttleProtocol == null) {
+ continue;
+ }
+ if (!shuttleProtocol.isIdle()) {
+ continue;//灏忚溅鐘舵�佸繖
+ }
+ if (shuttleProtocol.getCurrentCode().intValue() != liftProtocol.getBarcode().intValue()) {
+ continue;//灏忚溅褰撳墠浜岀淮鐮佸拰鎻愬崌鏈哄唴閮ㄤ簩缁寸爜涓嶄竴鑷达紝涓嶅厑璁告墽琛�
+ }
+
//宸ヤ綔妗ｇ洰鏍囧簱浣嶅彿
- String wrkMastLocNo = wrkMast.getIoType() == 101 ? wrkMast.getSourceLocNo() : wrkMast.getLocNo();
+ String wrkMastLocNo = wrkMast.getLocNo();
//宸ヤ綔妗ｇ洰鏍囧簱浣嶆ゼ灞�
int wrkMastLocNoLey = Utils.getLev(wrkMastLocNo);
+ if (wrkMastLocNoLey >= 2) {
+ wrkMastLocNoLey++;
+ }
//鎻愬崌鏈哄墠寰�鐩爣妤煎眰(宸ヤ綔妗ｇ洰鏍囨ゼ灞�)
LiftCommand command1 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), wrkMastLocNoLey);
commands.add(command1);//灏嗗懡浠ゆ坊鍔犺繘list
+ //缁欐彁鍗囨満鍒嗛厤浠诲姟
+ liftProtocol.setTaskNo(wrkMast.getWrkNo().shortValue());//璁剧疆浠诲姟鍙�
+ liftProtocol.setProtocolStatus(LiftProtocolStatusType.WORKING);//璁剧疆鎻愬崌鏈虹姸鎬佷负宸ヤ綔涓�
+
wrkMast.setWrkSts(7L);//6.杩佺Щ灏忚溅鑷虫彁鍗囨満鍙ｅ畬鎴� => 7.鎻愬崌鏈鸿縼绉诲皬杞︿腑
} else if(wrkMast.getWrkSts() == 23) {//23.杩佺Щ灏忚溅鑷虫彁鍗囨満鍙ｅ畬鎴� => 24.鎻愬崌鏈鸿縼绉诲皬杞︿腑
liftProtocol.setShuttleNo(wrkMast.getShuttleNo().shortValue());//璁剧疆鍥涘悜绌挎杞﹀彿
- //鎵惧埌鍥涘悜绌挎杞︾殑绾跨▼
+ //鍒ゆ柇灏忚溅鏄惁鍦ㄦ彁鍗囨満鍐咃紝涓斿浜庣┖闂茬姸鎬�
ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, wrkMast.getShuttleNo());
if (shuttleThread == null) {
continue;
@@ -1476,44 +1508,28 @@
continue;
}
- //褰撳墠绌挎杞﹀簱浣嶅彿
- String currentLocNo = shuttleProtocol.getCurrentLocNo();
- //褰撳墠绌挎杞︽ゼ灞�
- int currentLocNoLey = Utils.getLev(currentLocNo);
+ if (!shuttleProtocol.isIdle()) {
+ continue;//灏忚溅鐘舵�佸繖
+ }
+ if (shuttleProtocol.getCurrentCode().intValue() != liftProtocol.getBarcode().intValue()) {
+ continue;//灏忚溅褰撳墠浜岀淮鐮佸拰鎻愬崌鏈哄唴閮ㄤ簩缁寸爜涓嶄竴鑷达紝涓嶅厑璁告墽琛�
+ }
//宸ヤ綔妗ｇ洰鏍囧簱浣嶅彿
- String wrkMastLocNo = wrkMast.getIoType() == 101 ? wrkMast.getSourceLocNo() : wrkMast.getLocNo();
+ String wrkMastLocNo = wrkMast.getSourceLocNo();
//宸ヤ綔妗ｇ洰鏍囧簱浣嶆ゼ灞�
int wrkMastLocNoLey = Utils.getLev(wrkMastLocNo);
-
- //鎻愬崌鏈哄綋鍓嶆ゼ灞�
- int liftLev = liftProtocol.getLev().intValue();
- if (liftLev == 0) {//鎻愬崌鏈哄綋鍓嶆ゼ灞備负0锛屾彁鍗囨満澶卞幓浣嶇疆淇℃伅锛岃鎻愬崌鏈哄墠寰�涓�妤�
- LiftCommand command = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), LiftLevType.ONE.lev);
- commands.add(command);//灏嗗懡浠ゆ坊鍔犺繘list
+ if (wrkMastLocNoLey >= 2) {
+ wrkMastLocNoLey++;
}
- if (liftLev != currentLocNoLey) {
- //涓嶅悓妤煎眰
- //鑾峰彇鐩爣妤煎眰(绌挎杞︽墍鍦ㄦゼ灞�)鍛戒护
- LiftCommand command1 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), currentLocNoLey);
- commands.add(command1);//灏嗗懡浠ゆ坊鍔犺繘list
- }
+ //鎻愬崌鏈哄墠寰�鐩爣妤煎眰(宸ヤ綔妗ｇ洰鏍囨ゼ灞�)
+ LiftCommand command1 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), wrkMastLocNoLey);
+ commands.add(command1);//灏嗗懡浠ゆ坊鍔犺繘list
- //杈撻�佺嚎灏嗗洓鍚戠┛姊溅绉诲姩杩涙潵(鍙嶈浆)
- LiftCommand command2 = liftThread.getLiftTurnCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), 4);
- commands.add(command2);//灏嗗懡浠ゆ坊鍔犺繘list
-
- if (liftLev != currentLocNoLey) {
- //鎻愬崌鏈哄墠寰�鐩爣妤煎眰(宸ヤ綔妗ｇ洰鏍囨ゼ灞�)
- LiftCommand command3 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), wrkMastLocNoLey);
- commands.add(command3);//灏嗗懡浠ゆ坊鍔犺繘list
- }
-
- //鎻愬崌鏈哄埌杈炬寚瀹氭ゼ灞傦紝杈撻�佺嚎灏嗗洓鍚戠┛姊溅绉诲嚭鍘�
- //杈撻�佺嚎灏嗗洓鍚戠┛姊溅绉诲姩鍑哄幓(姝ｈ浆)
- LiftCommand command4 = liftThread.getLiftTurnCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), 1);
- commands.add(command4);//灏嗗懡浠ゆ坊鍔犺繘list
+ //缁欐彁鍗囨満鍒嗛厤浠诲姟
+ liftProtocol.setTaskNo(wrkMast.getWrkNo().shortValue());//璁剧疆浠诲姟鍙�
+ liftProtocol.setProtocolStatus(LiftProtocolStatusType.WORKING);//璁剧疆鎻愬崌鏈虹姸鎬佷负宸ヤ綔涓�
wrkMast.setWrkSts(24L);//23.杩佺Щ灏忚溅鑷虫彁鍗囨満鍙ｅ畬鎴� => 24.鎻愬崌鏈鸿縼绉诲皬杞︿腑
} else if (wrkMast.getWrkSts() == 27) {//27.灏忚溅鍑哄簱鎼繍瀹屾垚
@@ -1524,14 +1540,10 @@
//鎻愬崌鏈哄綋鍓嶆ゼ灞�
int liftLev = liftProtocol.getLev().intValue();
- if (liftLev == 0) {//鎻愬崌鏈哄綋鍓嶆ゼ灞備负0锛屾彁鍗囨満澶卞幓浣嶇疆淇℃伅锛岃鎻愬崌鏈哄墠寰�涓�妤�
- LiftCommand command = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), LiftLevType.ONE.lev);
- commands.add(command);//灏嗗懡浠ゆ坊鍔犺繘list
- }
//鍒ゆ柇鎻愬崌鏈烘槸鍚﹀埌浣�
- StaProtocol staProtocol = devpThread.getStation().get(Utils.levToOutInStaNo(wrkMastLocNoLey));//璧峰绔欑偣
- if (liftLev != wrkMastLocNoLey && wrkMastLocNoLey != 1 || !staProtocol.isLiftArrival()) {
+ StaProtocol staProtocol = devpThread.getStation().get(Utils.levToOutInStaNo(wrkMastLocNoLey >= 2 ? wrkMastLocNoLey + 1 : wrkMastLocNoLey));//璧峰绔欑偣
+ if (liftLev != wrkMastLocNoLey && !staProtocol.isLiftArrival()) {
//鎻愬崌鏈轰笉鍦ㄥ伐浣滄。婧愬簱浣嶆ゼ灞傦紝璋冨害鎻愬崌鏈�
LiftCommand command1 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), wrkMastLocNoLey);
commands.add(command1);//灏嗗懡浠ゆ坊鍔犺繘list
@@ -1564,6 +1576,10 @@
command5.setStaNo((short) 104);//鍐欏叆鍑哄簱鐩爣绔�104
command5.setRotationDire(0);//閾炬潯杞姩鍋滄
commands.add(command5);
+
+ //缁欐彁鍗囨満鍒嗛厤浠诲姟
+ liftProtocol.setTaskNo(wrkMast.getWrkNo().shortValue());//璁剧疆浠诲姟鍙�
+ liftProtocol.setProtocolStatus(LiftProtocolStatusType.WORKING);//璁剧疆鎻愬崌鏈虹姸鎬佷负宸ヤ綔涓�
wrkMast.setWrkSts(28L);//28.鎻愬崌鏈烘惉杩愪腑
}
@@ -1649,6 +1665,31 @@
}
}
+ //鏌ヨ鏄惁鏈夊厖鐢典换鍔�
+ WrkCharge wrkCharge = wrkChargeMapper.selectByWorkNo(liftProtocol.getTaskNo().intValue());
+ if (wrkCharge != null) {
+ switch (wrkCharge.getWrkSts().intValue()) {
+ case 54://鎻愬崌鏈烘惉杩愪腑
+ wrkCharge.setWrkSts(55L);//鎻愬崌鏈烘惉杩愬畬鎴�
+ break;
+ default:
+ }
+
+ if (wrkChargeMapper.updateById(wrkCharge) > 0) {
+ //璁剧疆鎻愬崌鏈轰负绌洪棽鐘舵��
+ liftProtocol.setProtocolStatus(LiftProtocolStatusType.IDLE);
+ //浠诲姟鍙锋竻闆�
+ liftProtocol.setTaskNo((short) 0);
+ //鏍囪澶嶄綅
+ liftProtocol.setPakMk(true);
+ //浠诲姟鎸囦护娓呴浂
+ liftProtocol.setAssignCommand(null);
+ News.info("鎻愬崌鏈哄凡纭涓斾换鍔″畬鎴愮姸鎬�,澶嶄綅銆傛彁鍗囨満鍙�={}", liftProtocol.getLiftNo());
+ } else {
+ News.error("鎻愬崌鏈哄凡纭涓斾换鍔″畬鎴愮姸鎬�,澶嶄綅澶辫触锛屼絾鏈壘鍒板伐浣滄。銆傛彁鍗囨満鍙�={}锛屽伐浣滃彿={}", liftProtocol.getLiftNo(), liftProtocol.getTaskNo());
+ }
+ }
+
//涓嶆槸鍏ュ嚭搴撹皟搴︿换鍔°�佸伐浣滄。浠诲姟锛岃繘琛屾彁鍗囨満鐨勫浣�
if (liftProtocol.getAssignCommand() != null) {
//璁剧疆鎻愬崌鏈轰负绌洪棽鐘舵��
@@ -1660,11 +1701,6 @@
//浠诲姟鎸囦护娓呴浂
liftProtocol.setAssignCommand(null);
News.info("鎻愬崌鏈哄凡纭涓斾换鍔″畬鎴愮姸鎬�,澶嶄綅銆傛彁鍗囨満鍙�={}", liftProtocol.getLiftNo());
-// LiftAssignCommand assignCommand = liftProtocol.getAssignCommand();
-// if (!assignCommand.getAuto()) {
-// //鎵嬪姩鍛戒护
-//
-// }
}
}
@@ -2361,19 +2397,10 @@
}
ShuttleChargeType shuttleCharge = null;
- String locNo;
for (ShuttleChargeType chargeType : ShuttleChargeType.values()) {
- switch (chargeType.id) {
- case 1:
- if (devpThread.charge0 == false) {
- ShuttleChargeType first = ShuttleChargeType.FIRST;
- locNo = first.locNo;
- if (wrkChargeService.selectWorkingOfCharge(first.id) == null) {
- shuttleCharge = first;
- }
- }
- break;
- default:
+ if (wrkChargeService.selectWorkingOfCharge(chargeType.id) == null) {
+ shuttleCharge = chargeType;
+ break;
}
}
@@ -2413,7 +2440,6 @@
return;
}
-
ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, wrkCharge.getShuttleNo());
if (shuttleThread == null) {
return;
@@ -2426,17 +2452,22 @@
//褰撳墠绌挎杞﹀簱浣嶅彿
String currentLocNo = shuttleProtocol.getCurrentLocNo();
//灏忚溅褰撳墠灞傞珮
- Integer currentLev = currentLocNo == null ? 0 : Integer.parseInt(currentLocNo.substring(currentLocNo.length() - 2, currentLocNo.length()));
+ Integer currentLev = currentLocNo == null ? 0 : Utils.getLev(currentLocNo);
//鑾峰彇鎻愬崌鏈�
- LiftSlave liftSlave = slaveProperties.getLift().get(0);
- //鎻愬崌鏈哄簱浣嶅彿
- String liftLocNo = liftSlave.getLiftLocNo(currentLev);
+ LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, 1);
+ if (liftThread == null) {
+ return;
+ }
+ LiftProtocol liftProtocol = liftThread.getLiftProtocol();
+ if (liftProtocol == null) {
+ return;
+ }
//鍏呯數搴撲綅鍙�
String chargeLocNo = wrkCharge.getLocNo();
//鍏呯數搴撲綅灞傞珮
- Integer chargeLocNoLev = Integer.parseInt(chargeLocNo.substring(chargeLocNo.length() - 2, chargeLocNo.length()));
+ Integer chargeLocNoLev = Utils.getLev(chargeLocNo);
- if (wrkCharge.getWrkSts() == 51 || wrkCharge.getWrkSts() == 55) {
+ if (wrkCharge.getWrkSts() == 51) {
if (currentLev == chargeLocNoLev) {
//鍚屼竴灞傛棤闇�缁忚繃鎻愬崌鏈�
//鐩存帴璁＄畻杞﹀埌鍏呯數搴撲綅
@@ -2444,7 +2475,10 @@
ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
//鑾峰彇灏忚溅鍒板厖鐢靛簱浣嶈矾寰勬寚浠�
- List<ShuttleCommand> commands = this.shuttleAssignCommand(currentLocNo, chargeLocNo, ShuttleTaskModeType.PAK_IN.id, assignCommand, shuttleThread);
+ List<ShuttleCommand> commands = this.shuttleAssignCommand(currentLocNo, chargeLocNo, NavigationMapType.NONE.id, assignCommand, shuttleThread);
+ if (commands == null) {
+ return;//鏈壘鍒拌矾寰�
+ }
//杩涜鍏呯數涓�
shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.CHARGING);
@@ -2466,22 +2500,38 @@
MessageQueue.offer(SlaveType.Shuttle, assignCommand.getShuttleNo().intValue(), new Task(3, assignCommand));
}
}else {
- //涓嶅悓灞傦紝灏嗙洰鏍囧簱浣嶅垎閰嶆垚鎻愬崌鏈哄簱浣嶅彿
+ //涓嶅悓灞傦紝璋冨害灏忚溅鍒板厖鐢垫々鐩爣灞�
ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
- //灏忚溅绉诲姩鍒版彁鍗囨満鍙ｏ紝璁＄畻璺緞
- List<ShuttleCommand> commands = this.shuttleAssignCommand(currentLocNo, liftLocNo, ShuttleTaskModeType.PAK_IN.id, assignCommand, shuttleThread);
+ //鑾峰彇灏忚溅褰撳墠妤煎眰鐨勭珯鐐瑰彿
+ String liftSiteLocNo = Utils.levToOutInStaLocNo(currentLev);
+
+ //灏忚溅绉诲姩鍒版彁鍗囨満鍙ｇ珯鐐癸紝璁＄畻璺緞
+ List<ShuttleCommand> commands = this.shuttleAssignCommand(currentLocNo, liftSiteLocNo, NavigationMapType.NONE.id, assignCommand, shuttleThread);
+ if (commands == null) {
+ return;//鏈壘鍒拌矾寰�
+ }
+
+ //鑾峰彇褰撳墠灏忚溅鎵�鍦ㄦゼ灞傜殑绔欑偣淇℃伅
+ BasDevp basDevp = basDevpService.queryByLocNo(liftSiteLocNo);
+ if (basDevp == null) {
+ return;//鎵句笉鍒扮珯鐐逛俊鎭�
+ }
+ Short basDevpQrCode = Short.parseShort(basDevp.getQrCodeValue());//绔欑偣浜岀淮鐮�
+
+ //澧炲姞绉诲姩杩涙彁鍗囨満鍛戒护
+ ShuttleCommand moveCommand = shuttleThread.getMoveCommand(basDevpQrCode, liftProtocol.getBarcode(), 1400, ShuttleRunDirection.TOP.id, basDevpQrCode, 1400, 500);
+ commands.add(moveCommand);
+
//鍒嗛厤鐩爣搴撲綅
- shuttleProtocol.setLocNo(liftLocNo);
-
-
+ shuttleProtocol.setLocNo(chargeLocNo);
assignCommand.setShuttleNo(shuttleProtocol.getShuttleNo());
assignCommand.setTaskMode((short) 9);//鍏呯數
assignCommand.setTaskNo(wrkCharge.getWrkNo().shortValue());
assignCommand.setCharge(true);//鍏呯數浠诲姟
//鐩爣搴撲綅
- assignCommand.setLocNo(liftLocNo);
+ assignCommand.setLocNo(chargeLocNo);
//婧愬簱浣�
assignCommand.setSourceLocNo(currentLocNo);
assignCommand.setCommands(commands);
@@ -2493,23 +2543,20 @@
}
}else if(wrkCharge.getWrkSts() == 53){
- //灏忚溅宸茬粡杈惧埌鎻愬崌鏈哄彛
- LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, liftSlave.getId());
- if (liftThread == null) {
- return;
- }
- LiftProtocol liftProtocol = liftThread.getLiftProtocol();
- if (liftProtocol == null) {
- return;
- }
+ //灏忚溅宸茬粡杈惧埌鎻愬崌鏈哄唴
//鍒ゆ柇鎻愬崌鏈烘槸鍚﹀浜庣┖闂茬姸鎬�
if (!liftProtocol.isIdle()) {
return;
}
+ //鍒ゆ柇灏忚溅鏄惁鍦ㄦ彁鍗囨満鍐�
+ if (shuttleProtocol.getCurrentCode().intValue() != liftProtocol.getBarcode().intValue()) {
+ //灏忚溅涓嶅湪鎻愬崌鏈哄唴
+ return;
+ }
+
//缁欐彁鍗囨満鍒嗛厤浠诲姟
- liftProtocol.setLiftLock(true);//閿佸畾鎻愬崌鏈�
liftProtocol.setTaskNo(wrkCharge.getWrkNo().shortValue());//璁剧疆浠诲姟鍙�
liftProtocol.setShuttleNo(wrkCharge.getShuttleNo().shortValue());//璁剧疆鍥涘悜绌挎杞﹀彿
liftProtocol.setProtocolStatus(LiftProtocolStatusType.WORKING);//璁剧疆鎻愬崌鏈虹姸鎬佷负宸ヤ綔涓�
@@ -2517,28 +2564,10 @@
//鍛戒护list
ArrayList<LiftCommand> commands = new ArrayList<>();
- //鎻愬崌鏈哄綋鍓嶆ゼ灞�
- int liftLev = liftProtocol.getLev().intValue();
- if (liftLev != currentLev) {
- //绌挎杞﹀拰鎻愬崌鏈哄浜庝笉鍚屾ゼ灞�
- //鑾峰彇鐩爣妤煎眰(绌挎杞︽墍鍦ㄦゼ灞�)鍛戒护
- LiftCommand command1 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), currentLev);
- commands.add(command1);//灏嗗懡浠ゆ坊鍔犺繘list
- }
-
- //杈撻�佺嚎灏嗗洓鍚戠┛姊溅绉诲姩杩涙潵(姝ｈ浆)
- LiftCommand command2 = liftThread.getLiftTurnCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), 1);
- commands.add(command2);//灏嗗懡浠ゆ坊鍔犺繘list
-
//鎻愬崌鏈哄墠寰�鐩爣妤煎眰
//鑾峰彇鍏呯數搴撲綅鐩爣妤煎眰鍛戒护
- LiftCommand command3 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), chargeLocNoLev);
- commands.add(command3);//灏嗗懡浠ゆ坊鍔犺繘list
-
- //鎻愬崌鏈哄埌杈炬寚瀹氭ゼ灞傦紝杈撻�佺嚎灏嗗洓鍚戠┛姊溅绉诲嚭鍘�
- //杈撻�佺嚎灏嗗洓鍚戠┛姊溅绉诲姩鍑哄幓(鍙嶈浆)
- LiftCommand command4 = liftThread.getLiftTurnCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), 2);
- commands.add(command4);//灏嗗懡浠ゆ坊鍔犺繘list
+ LiftCommand command1 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), chargeLocNoLev >= 2 ? chargeLocNoLev + 1 : chargeLocNoLev);
+ commands.add(command1);//灏嗗懡浠ゆ坊鍔犺繘list
wrkCharge.setWrkSts(54L);//鎻愬崌鏈烘惉杩愪腑
//鎵�闇�鍛戒护缁勫悎瀹屾瘯锛屾洿鏂版暟鎹簱锛屾彁浜ゅ埌绾跨▼鍘诲伐浣�
@@ -2551,10 +2580,64 @@
MessageQueue.offer(SlaveType.Lift, liftProtocol.getLiftNo().intValue(), new Task(3, assignCommand));
}
- } else if (wrkCharge.getWrkSts() == 56) {
+ }else if(wrkCharge.getWrkSts() == 55){//55.鎻愬崌鏈鸿縼绉诲皬杞﹀畬鎴�
+ //鐩存帴璁＄畻杞﹀埌鍏呯數搴撲綅
+
+ ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
+
+ Short liftLev = liftProtocol.getLev();
+ if (liftLev == null) {
+ return;
+ }
+ //鍒ゆ柇鎻愬崌鏈烘ゼ灞傛槸鍚﹀埌杈剧洰鏍囨ゼ灞�
+ if (liftLev.intValue() != chargeLocNoLev) {
+ return;//娌℃湁鍒拌揪鐩爣妤煎眰
+ }
+
+ //姝ゆ椂杞﹀湪鎻愬崌鏈哄唴閮紝涓嬭揪涓�姝ユ寚浠よ杞︾Щ鍔ㄥ埌鎻愬崌鏈哄彛
+ Integer staNo = Utils.levToOutInStaNo(liftLev >= 2 ? liftLev + 1 : liftLev);//绔欑偣鍙�
+ BasDevp basDevp = basDevpService.selectById(staNo);
+ if (basDevp == null) {
+ return;//绔欑偣涓嶅瓨鍦�
+ }
+
+ //鑾峰彇灏忚溅鍒板厖鐢靛簱浣嶈矾寰勬寚浠�
+ List<ShuttleCommand> commands = this.shuttleAssignCommand(currentLocNo, chargeLocNo, NavigationMapType.NONE.id, assignCommand, shuttleThread);
+ if (commands == null) {
+ return;//鏈壘鍒拌矾寰�
+ }
+
+ short startCode = liftProtocol.getBarcode();//鎻愬崌鏈哄唴閮ㄤ簩缁寸爜
+ Short distCode = Short.parseShort(basDevp.getQrCodeValue());//鎻愬崌鏈哄彛绔欑偣浜岀淮鐮�
+ Short runDirection = ShuttleRunDirection.BOTTOM.id;//杩愯鏂瑰悜
+ //鑾峰彇鍛戒护
+ ShuttleCommand moveCommand = shuttleThread.getMoveCommand(startCode, distCode, 1400, runDirection, startCode, 1400, 500);
+ commands.add(0, moveCommand);//灏嗚鎸囦护娣诲姞鍒伴槦澶�
+
+ //杩涜鍏呯數涓�
+ shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.CHARGING);
+
+ assignCommand.setShuttleNo(shuttleProtocol.getShuttleNo());
+ assignCommand.setTaskMode((short) 9);//鍏呯數
+ assignCommand.setTaskNo(wrkCharge.getWrkNo().shortValue());
+ assignCommand.setCharge(true);//鍏呯數浠诲姟
+
+ //鍒涘缓鍏呯數鎸囦护
+ ShuttleCommand command = shuttleThread.getChargeSwitchCommand((short) 1);//寮�濮嬪厖鐢�
+ commands.add(command);
+
+ //鎸囦护闆嗗垎閰�
+ assignCommand.setCommands(commands);
+
+ wrkCharge.setWrkSts(56L);//鍏呯數涓姸鎬�
+ if (wrkChargeMapper.updateById(wrkCharge) > 0) {
+ //涓嬪彂浠诲姟
+ MessageQueue.offer(SlaveType.Shuttle, assignCommand.getShuttleNo().intValue(), new Task(3, assignCommand));
+ }
+ }else if (wrkCharge.getWrkSts() == 56) {
//鍏呯數涓�
//鍒ゆ柇灏忚溅鏄惁鍏呮弧鐢甸噺锛屾弧鐢�1000鎴栫數鍘�54V浠ヤ笂
- if (shuttleProtocol.getBatteryPower() >= 1000 || shuttleProtocol.getCurrentVoltage() >= 540) {
+ if (shuttleProtocol.getBatteryPower() >= 1000 || shuttleProtocol.getCurrentVoltage() >= 54000) {
//鍏呮弧锛屾柇寮�鍏呯數
List<ShuttleCommand> commands = new ArrayList<>();
ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
--
Gitblit v1.9.1