From 1983e747ee2368186cef348fd31e9e5163f56634 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 24 七月 2023 13:53:29 +0800
Subject: [PATCH] liftUpdate
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 1832 ++++++++++++++++++++++++++--------------------------------
1 files changed, 812 insertions(+), 1,020 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 3e5142c..7ac4a23 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -53,6 +53,8 @@
@Autowired
private WrkMastMapper wrkMastMapper;
@Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
private WrkDetlService wrkDetlService;
@Autowired
private LocMastService locMastService;
@@ -259,9 +261,9 @@
News.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
} else if (code == 700) {
staProtocol.setWorkNo((short) 32002);
- staProtocol.setStaNo(inSta.getBackSta().shortValue());
+ staProtocol.setRollback102(1);//102绔欏洖閫�淇″彿
devpThread.setPakMk(staProtocol.getSiteId(), false);
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(5, staProtocol));
// led 寮傚父鏄剧ず
if (ledThread != null) {
@@ -571,7 +573,7 @@
//鏁版嵁搴撲腑涔熶笉瀛樺湪鍦板浘鏁版嵁锛屼粠鍦板浘鏂囦欢涓幏鍙�
//杞藉叆鍦板浘
NavigateMapData mapData = new NavigateMapData(i);
- List<List<MapNode>> lists = mapData.getJsonData(-1, null);//鑾峰彇瀹屾暣鍦板浘(鍖呮嫭鍏ュ簱鍑哄簱)
+ List<List<MapNode>> lists = mapData.getJsonData(-1, null, null);//鑾峰彇瀹屾暣鍦板浘(鍖呮嫭鍏ュ簱鍑哄簱)
//瀛樺叆鏁版嵁搴�
basMap = new BasMap();
@@ -671,15 +673,31 @@
if (wrkMast != null) {
if (wrkMast.getWrkSts() == 4 || wrkMast.getWrkSts() == 8) {
ShuttleThread shuttleThread = null;
+ ShuttleProtocol shuttleProtocol = null;
HashMap<String, Object> searchIdleShuttle = null;
LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, 1);
LiftProtocol liftProtocol = liftThread.getLiftProtocol();
if (wrkMast.getWrkSts() == 4) {
- //瀵绘壘鏈�杩戜笖绌洪棽鐨勫洓鍚戠┛姊溅
- searchIdleShuttle = this.searchIdleShuttle(wrkMast);
- shuttleThread = (ShuttleThread) searchIdleShuttle.get("result");
+ if (wrkMast.getShuttleNo() == null) {
+ //瀵绘壘鏈�杩戜笖绌洪棽鐨勫洓鍚戠┛姊溅
+ searchIdleShuttle = this.searchIdleShuttle(wrkMast);
+ shuttleThread = (ShuttleThread) searchIdleShuttle.get("result");
+ wrkMast.setShuttleNo(shuttleThread.getSlave().getId());//缁欏伐浣滄。鍒嗛厤鍥涘悜绌挎杞﹀彿
+ wrkMastMapper.updateById(wrkMast);
+ shuttleProtocol = shuttleThread.getShuttleProtocol();
+ if (!shuttleProtocol.isIdle()) {
+ continue;
+ }
+ }else {
+ //鐩存帴浣跨敤浠诲姟淇濆瓨涓殑灏忚溅
+ shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, wrkMast.getShuttleNo());
+ shuttleProtocol = shuttleThread.getShuttleProtocol();
+ if (!shuttleProtocol.isIdle(workNo)) {
+ continue;
+ }
+ }
}else if(wrkMast.getWrkSts() == 8){//鐘舵��8锛岄渶瑕佸悜灏忚溅涓嬪彂鍛戒护浠庢彁鍗囨満绉诲姩鍑哄幓锛岄渶瑕佸垽鏂彁鍗囨満鐘舵槸鍚︾┖闂层�佹彁鍗囨満鏄惁鍒拌揪鐩爣妤煎眰銆佺洰鏍囨ゼ灞傜珯鐐规槸鍚﹀瓨鍦ㄣ�佺洰鏍囨ゼ灞傜珯鐐规槸鍚︾粰鍑烘彁鍗囨満鍒颁綅淇″彿
//鐘舵��8锛岀瓑寰呭懡浠よ繘琛屽叆搴撴惉杩愬姩浣�
@@ -717,14 +735,17 @@
Integer shuttleNo = wrkMast.getShuttleNo();//鍥涘悜绌挎杞﹀彿
shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleNo);
+ shuttleProtocol = shuttleThread.getShuttleProtocol();
+ if (!shuttleProtocol.isIdle(workNo)) {
+ continue;
+ }
}
if (shuttleThread == null) {
continue;
}
- ShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
- if (!shuttleProtocol.isIdle()) {
+ if (shuttleProtocol == null) {
continue;
}
@@ -749,55 +770,118 @@
//鎻愬崌鏈哄彛绔欑偣搴撲綅鍙�
String liftSiteLocNo = Utils.levToOutInStaLocNo(currentLev);
- if (wrkMast.getWrkSts() == 8 || Boolean.parseBoolean(searchIdleShuttle.get("sameLay").toString())) {
- //鍚屼竴灞傜洿鎺ュ彇璐ф棤闇�缁忚繃鎻愬崌鏈�
+ if (wrkMast.getWrkSts() == 4) {
+ if (currentLev == Utils.getLev(locNo)) {
+ //灏忚溅鍜岀洰鏍囧湪鍚屼竴妤煎眰
+ //鐩存帴璁＄畻杞﹀埌鎻愬崌鏈哄彇璐у啀鍒板簱浣嶈矾寰勬寚浠�
+ List<ShuttleCommand> commands = this.shuttleAssignCommand(wrkMast.getWrkSts() == 4 ? currentLocNo : liftSiteLocNo, liftSiteLocNo, locNo, assignCommand, shuttleThread);
+ if (commands == null) {
+ continue;//鎵句笉鍒拌矾寰勭瓑寰呬笅涓�娆�
+ }
+ assignCommand.setCommands(commands);
+ //鍒嗛厤鐩爣搴撲綅
+ shuttleProtocol.setLocNo(wrkMast.getLocNo());
+ //鐩爣搴撲綅
+ assignCommand.setLocNo(wrkMast.getLocNo());
+ wrkMast.setWrkSts(9L);//灏忚溅鍏ュ簱涓�
+ }else {
+ //灏忚溅鍜岀洰鏍囦笉鍦ㄥ悓涓�妤煎眰
+ //灏忚溅绉诲姩鍒版彁鍗囨満鍙ｏ紝璁＄畻璺緞
+ List<ShuttleCommand> commands = this.shuttleAssignCommand(currentLocNo, liftSiteLocNo, NavigationMapType.NONE.id, assignCommand, shuttleThread);
+ if (commands == null) {
+ continue;//鏈壘鍒拌矾寰�
+ }
+
+ //鑾峰彇褰撳墠灏忚溅鎵�鍦ㄦゼ灞傜殑绔欑偣淇℃伅
+ BasDevp basDevp = basDevpService.queryByLocNo(liftSiteLocNo);
+ Short endStartCode = Short.parseShort(basDevp.getQrCodeValue());//绔欑偣浜岀淮鐮�
+
+ //澧炲姞绉诲姩杩涙彁鍗囨満鍛戒护
+ ShuttleCommand moveCommand = shuttleThread.getMoveCommand(endStartCode, liftProtocol.getBarcode(), 1600, ShuttleRunDirection.TOP.id, null, null, 500);
+ commands.add(moveCommand);
+
+ //鍒嗛厤鐩爣搴撲綅
+ shuttleProtocol.setLocNo(liftSiteLocNo);
+ //鐩爣搴撲綅
+ assignCommand.setLocNo(liftSiteLocNo);
+ assignCommand.setCommands(commands);
+ wrkMast.setWrkSts(5L);//灏忚溅杩佺Щ鐘舵��
+ }
+ } else if (wrkMast.getWrkSts() == 8) {
//鐩存帴璁＄畻杞﹀埌鎻愬崌鏈哄彇璐у啀鍒板簱浣嶈矾寰勬寚浠�
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 >= 2 ? currentLev + 1 : currentLev);//绔欑偣鍙�
- BasDevp basDevp = basDevpService.selectById(staNo);
- 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);//灏嗚鎸囦护娣诲姞鍒伴槦澶�
- }
+ //姝ゆ椂杞﹀湪鎻愬崌鏈哄唴閮紝涓嬭揪涓�姝ユ寚浠よ杞︾Щ鍔ㄥ埌鎻愬崌鏈哄彛
+ Integer staNo = Utils.levToOutInStaNo(currentLev >= 2 ? currentLev + 1 : currentLev);//绔欑偣鍙�
+ BasDevp basDevp = basDevpService.selectById(staNo);
+
+ short startCode = liftProtocol.getBarcode();//鎻愬崌鏈哄唴閮ㄤ簩缁寸爜
+ Short distCode = Short.parseShort(basDevp.getQrCodeValue());//鎻愬崌鏈哄彛绔欑偣浜岀淮鐮�
+ Short runDirection = ShuttleRunDirection.BOTTOM.id;//杩愯鏂瑰悜
+ //鑾峰彇鍛戒护
+ ShuttleCommand moveCommand = shuttleThread.getMoveCommand(startCode, distCode, 1600, runDirection, null, null, 500);
+ commands.add(0, moveCommand);//灏嗚鎸囦护娣诲姞鍒伴槦澶�
+
assignCommand.setCommands(commands);
//鍒嗛厤鐩爣搴撲綅
shuttleProtocol.setLocNo(wrkMast.getLocNo());
//鐩爣搴撲綅
assignCommand.setLocNo(wrkMast.getLocNo());
wrkMast.setWrkSts(9L);//灏忚溅鍏ュ簱涓�
- }else {
- //涓嶅悓灞傦紝灏嗙洰鏍囧簱浣嶅垎閰嶆垚鎻愬崌鏈哄簱浣嶅彿
-
- //灏忚溅绉诲姩鍒版彁鍗囨満鍙ｏ紝璁＄畻璺緞
- List<ShuttleCommand> commands = this.shuttleAssignCommand(currentLocNo, liftSiteLocNo, NavigationMapType.NONE.id, assignCommand, shuttleThread);
- if (commands == null) {
- continue;//鏈壘鍒拌矾寰�
- }
-
- //鑾峰彇褰撳墠灏忚溅鎵�鍦ㄦゼ灞傜殑绔欑偣淇℃伅
- BasDevp basDevp = basDevpService.queryByLocNo(liftSiteLocNo);
- Short endStartCode = Short.parseShort(basDevp.getQrCodeValue());//绔欑偣浜岀淮鐮�
-
- //澧炲姞绉诲姩杩涙彁鍗囨満鍛戒护
- ShuttleCommand moveCommand = shuttleThread.getMoveCommand(endStartCode, liftProtocol.getBarcode(), 1400, ShuttleRunDirection.TOP.id, endStartCode, 1400, 500);
- commands.add(moveCommand);
-
- //鍒嗛厤鐩爣搴撲綅
- shuttleProtocol.setLocNo(liftSiteLocNo);
- //鐩爣搴撲綅
- assignCommand.setLocNo(liftSiteLocNo);
- assignCommand.setCommands(commands);
- wrkMast.setWrkSts(5L);//灏忚溅杩佺Щ鐘舵��
}
+
+// if (wrkMast.getWrkSts() == 8 || Boolean.parseBoolean(searchIdleShuttle.get("sameLay").toString())) {
+// //鍚屼竴灞傜洿鎺ュ彇璐ф棤闇�缁忚繃鎻愬崌鏈�
+// //鐩存帴璁＄畻杞﹀埌鎻愬崌鏈哄彇璐у啀鍒板簱浣嶈矾寰勬寚浠�
+// 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 >= 2 ? currentLev + 1 : currentLev);//绔欑偣鍙�
+// BasDevp basDevp = basDevpService.selectById(staNo);
+//
+// short startCode = liftProtocol.getBarcode();//鎻愬崌鏈哄唴閮ㄤ簩缁寸爜
+// Short distCode = Short.parseShort(basDevp.getQrCodeValue());//鎻愬崌鏈哄彛绔欑偣浜岀淮鐮�
+// Short runDirection = ShuttleRunDirection.BOTTOM.id;//杩愯鏂瑰悜
+// //鑾峰彇鍛戒护
+// ShuttleCommand moveCommand = shuttleThread.getMoveCommand(startCode, distCode, 1600, runDirection, startCode, 1600, 500);
+// commands.add(0, moveCommand);//灏嗚鎸囦护娣诲姞鍒伴槦澶�
+// }
+// assignCommand.setCommands(commands);
+// //鍒嗛厤鐩爣搴撲綅
+// shuttleProtocol.setLocNo(wrkMast.getLocNo());
+// //鐩爣搴撲綅
+// assignCommand.setLocNo(wrkMast.getLocNo());
+// wrkMast.setWrkSts(9L);//灏忚溅鍏ュ簱涓�
+// }else {
+// //涓嶅悓灞傦紝灏嗙洰鏍囧簱浣嶅垎閰嶆垚鎻愬崌鏈哄簱浣嶅彿
+//
+// //灏忚溅绉诲姩鍒版彁鍗囨満鍙ｏ紝璁＄畻璺緞
+// List<ShuttleCommand> commands = this.shuttleAssignCommand(currentLocNo, liftSiteLocNo, NavigationMapType.NONE.id, assignCommand, shuttleThread);
+// if (commands == null) {
+// continue;//鏈壘鍒拌矾寰�
+// }
+//
+// //鑾峰彇褰撳墠灏忚溅鎵�鍦ㄦゼ灞傜殑绔欑偣淇℃伅
+// BasDevp basDevp = basDevpService.queryByLocNo(liftSiteLocNo);
+// Short endStartCode = Short.parseShort(basDevp.getQrCodeValue());//绔欑偣浜岀淮鐮�
+//
+// //澧炲姞绉诲姩杩涙彁鍗囨満鍛戒护
+// ShuttleCommand moveCommand = shuttleThread.getMoveCommand(endStartCode, liftProtocol.getBarcode(), 1600, ShuttleRunDirection.TOP.id, endStartCode, 1600, 500);
+// commands.add(moveCommand);
+//
+// //鍒嗛厤鐩爣搴撲綅
+// shuttleProtocol.setLocNo(liftSiteLocNo);
+// //鐩爣搴撲綅
+// assignCommand.setLocNo(liftSiteLocNo);
+// assignCommand.setCommands(commands);
+// wrkMast.setWrkSts(5L);//灏忚溅杩佺Щ鐘舵��
+// }
if (wrkMastMapper.updateById(wrkMast) > 0) {
//涓嬪彂浠诲姟
@@ -826,12 +910,14 @@
}
//璁＄畻灏忚溅璧风偣鍒颁腑鐐规墍闇�鍛戒护
- List<NavigateNode> calc = NavigateUtils.calc(startLocNo, locNo, mapType);
+ List<NavigateNode> calc = NavigateUtils.calc(startLocNo, locNo, mapType, Utils.getShuttlePoints(shuttleThread.getSlave().getId(), Utils.getLev(startLocNo)));
List<ShuttleCommand> commands = new ArrayList<>();
if (calc == null) {
return null;
}
-
+ if (!Utils.checkShuttlePath(calc, shuttleThread.getSlave().getId())) {//妫�娴嬬┛姊溅琛岃蛋璺緞锛屾槸鍚﹀瓨鍦ㄥ叾浠栧皬杞︼紝濡傛湁鍏朵粬灏忚溅鍒欒繘琛岃皟绂�
+ return null;
+ }
List<NavigateNode> allNode = new ArrayList<>();
allNode.addAll(calc);
@@ -841,16 +927,31 @@
for (ArrayList<NavigateNode> nodes : data) {
//寮�濮嬭矾寰�
NavigateNode startPath = nodes.get(0);
+
//涓棿璺緞
- NavigateNode middlePath = nodes.get(nodes.size() - 2);
+ NavigateNode middlePath = null;
+ //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
+ Short middleCodeNum = null;
+ Integer middleToDistDistance = null;//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
+ if (nodes.size() > 10) {//涓鐮佷紶鍊掓暟绗笁涓�
+ //涓棿璺緞
+ middlePath = nodes.get(nodes.size() - 3);
+ //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
+ middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
+ middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, middlePath);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
+ } else if (nodes.size() > 5) {//涓鐮佷紶鍊掓暟绗簩涓�
+ //涓棿璺緞
+ middlePath = nodes.get(nodes.size() - 2);
+ //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
+ middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
+ middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, middlePath);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
+ }
+
//鐩爣璺緞
NavigateNode endPath = nodes.get(nodes.size() - 1);
Integer allDistance = NavigateUtils.getCurrentPathAllDistance(nodes);//璁＄畻褰撳墠璺緞琛岃蛋鎬昏窛绂�
- Integer middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
//閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
Short startCodeNum = NavigatePositionConvert.xyToPosition(startPath.getX(), startPath.getY(), startPath.getZ());
- //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
- Short middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
//閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
Short distCodeNum = NavigatePositionConvert.xyToPosition(endPath.getX(), endPath.getY(), endPath.getZ());
//鑾峰彇绉诲姩鍛戒护
@@ -881,10 +982,14 @@
List<NavigateNode> allNode = new ArrayList<>();
//璁＄畻灏忚溅璧风偣鍒颁腑鐐规墍闇�鍛戒护
- List<NavigateNode> calc = NavigateUtils.calc(startLocNo, middleLocNo, NavigationMapType.NORMAL.id);//灏忚溅鏃犺揣锛岃蛋姝ｅ父搴撲綅閫氶亾
+ List<NavigateNode> calc = NavigateUtils.calc(startLocNo, middleLocNo, NavigationMapType.NORMAL.id, null);//灏忚溅鏃犺揣锛岃蛋姝ｅ父搴撲綅閫氶亾
List<ShuttleCommand> commands = new ArrayList<>();
if (calc != null) {
+ if (!Utils.checkShuttlePath(calc, shuttleThread.getSlave().getId())) {//妫�娴嬬┛姊溅琛岃蛋璺緞锛屾槸鍚﹀瓨鍦ㄥ叾浠栧皬杞︼紝濡傛湁鍏朵粬灏忚溅鍒欒繘琛岃皟绂�
+ return null;
+ }
+
allNode.addAll(calc);
//鑾峰彇鍒嗘璺緞
ArrayList<ArrayList<NavigateNode>> data = NavigateUtils.getSectionPath(calc);
@@ -892,17 +997,32 @@
for (ArrayList<NavigateNode> nodes : data) {
//寮�濮嬭矾寰�
NavigateNode startPath = nodes.get(0);
+
//涓棿璺緞
- NavigateNode middlePath = nodes.get(nodes.size() - 2);
+ NavigateNode middlePath = null;
+ //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
+ Short middleCodeNum = null;
+ Integer middleToDistDistance = null;//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
+ if (nodes.size() > 10) {//涓鐮佷紶鍊掓暟绗笁涓�
+ //涓棿璺緞
+ middlePath = nodes.get(nodes.size() - 3);
+ //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
+ middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
+ middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, middlePath);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
+ } else if (nodes.size() > 5) {//涓鐮佷紶鍊掓暟绗簩涓�
+ //涓棿璺緞
+ middlePath = nodes.get(nodes.size() - 2);
+ //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
+ middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
+ middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, middlePath);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
+ }
+
//鐩爣璺緞
NavigateNode endPath = nodes.get(nodes.size() - 1);
Integer allDistance = NavigateUtils.getCurrentPathAllDistance(nodes);//璁＄畻褰撳墠璺緞琛岃蛋鎬昏窛绂�
- Integer middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
//閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
Short startCodeNum = NavigatePositionConvert.xyToPosition(startPath.getX(), startPath.getY(), startPath.getZ());
- //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
- Short middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
//閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
Short distCodeNum = NavigatePositionConvert.xyToPosition(endPath.getX(), endPath.getY(), endPath.getZ());
//鑾峰彇绉诲姩鍛戒护
@@ -915,11 +1035,13 @@
commands.add(shuttleThread.getPalletCommand((short) 1));
//璁＄畻灏忚溅涓偣鍒扮粓鐐规墍闇�鍛戒护
- List<NavigateNode> calc2 = NavigateUtils.calc(middleLocNo, locNo, NavigationMapType.DFX.id);//灏忚溅鏈夎揣锛岃蛋绂佺敤杩嘍FX搴撲綅鐨勫湴鍥鹃�氶亾
+ List<NavigateNode> calc2 = NavigateUtils.calc(middleLocNo, locNo, NavigationMapType.DFX.id, null);//灏忚溅鏈夎揣锛岃蛋绂佺敤杩嘍FX搴撲綅鐨勫湴鍥鹃�氶亾
if (calc2 == null) {
return null;
}
-
+ if (!Utils.checkShuttlePath(calc2, shuttleThread.getSlave().getId())) {//妫�娴嬬┛姊溅琛岃蛋璺緞锛屾槸鍚﹀瓨鍦ㄥ叾浠栧皬杞︼紝濡傛湁鍏朵粬灏忚溅鍒欒繘琛岃皟绂�
+ return null;
+ }
allNode.addAll(calc2);
//鑾峰彇鍒嗘璺緞
@@ -927,17 +1049,32 @@
for (ArrayList<NavigateNode> nodes : data2) {
//寮�濮嬭矾寰�
NavigateNode startPath = nodes.get(0);
+
//涓棿璺緞
- NavigateNode middlePath = nodes.get(nodes.size() - 2);
+ NavigateNode middlePath = null;
+ //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
+ Short middleCodeNum = null;
+ Integer middleToDistDistance = null;//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
+ if (nodes.size() > 10) {//涓鐮佷紶鍊掓暟绗笁涓�
+ //涓棿璺緞
+ middlePath = nodes.get(nodes.size() - 3);
+ //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
+ middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
+ middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, middlePath);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
+ } else if (nodes.size() > 5) {//涓鐮佷紶鍊掓暟绗簩涓�
+ //涓棿璺緞
+ middlePath = nodes.get(nodes.size() - 2);
+ //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
+ middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
+ middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, middlePath);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
+ }
+
//鐩爣璺緞
NavigateNode endPath = nodes.get(nodes.size() - 1);
Integer allDistance = NavigateUtils.getCurrentPathAllDistance(nodes);//璁＄畻褰撳墠璺緞琛岃蛋鎬昏窛绂�
- Integer middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
//閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
Short startCodeNum = NavigatePositionConvert.xyToPosition(startPath.getX(), startPath.getY(), startPath.getZ());
- //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
- Short middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
//閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
Short distCodeNum = NavigatePositionConvert.xyToPosition(endPath.getX(), endPath.getY(), endPath.getZ());
ShuttleCommand moveCommand = shuttleThread.getMoveCommand(startCodeNum, distCodeNum, allDistance, ShuttleRunDirection.get(startPath.getDirection()).id, middleCodeNum, middleToDistDistance, runSpeed);
@@ -984,9 +1121,19 @@
LiftProtocol liftProtocol = liftThread.getLiftProtocol();
if (wrkMast.getWrkSts() == 21) {
- //瀵绘壘鏈�杩戜笖绌洪棽鐨勫洓鍚戠┛姊溅
- searchIdleShuttle = this.searchIdleShuttle(wrkMast);
- shuttleThread = (ShuttleThread) searchIdleShuttle.get("result");
+ if (wrkMast.getShuttleNo() == null) {
+ //瀵绘壘鏈�杩戜笖绌洪棽鐨勫洓鍚戠┛姊溅
+ searchIdleShuttle = this.searchIdleShuttle(wrkMast);
+ shuttleThread = (ShuttleThread) searchIdleShuttle.get("result");
+ if (shuttleThread == null) {
+ continue;
+ }
+ wrkMast.setShuttleNo(shuttleThread.getSlave().getId());//缁欏伐浣滄。鍒嗛厤鍥涘悜绌挎杞﹀彿
+ wrkMastMapper.updateById(wrkMast);
+ }else {
+ //鐩存帴浣跨敤浠诲姟淇濆瓨涓殑灏忚溅
+ shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, wrkMast.getShuttleNo());
+ }
}else if(wrkMast.getWrkSts() == 25) {//鐘舵��25锛岄渶瑕佸悜灏忚溅涓嬪彂鍛戒护浠庢彁鍗囨満绉诲姩鍑哄幓锛岄渶瑕佸垽鏂彁鍗囨満鐘舵槸鍚︾┖闂层�佹彁鍗囨満鏄惁鍒拌揪鐩爣妤煎眰銆佺洰鏍囨ゼ灞傜珯鐐规槸鍚﹀瓨鍦ㄣ�佺洰鏍囨ゼ灞傜珯鐐规槸鍚︾粰鍑烘彁鍗囨満鍒颁綅淇″彿
//鍒ゆ柇鎻愬崌鏈烘槸鍚︾┖闂�
@@ -1006,8 +1153,11 @@
//鍒ゆ柇鎻愬崌鏈烘ゼ灞傛槸鍚﹀埌浣嶏紝鍒ゆ柇绔欑偣鏄惁缁欏嚭鎻愬崌鏈哄埌浣嶄俊鍙�
String locNo = wrkMast.getSourceLocNo();
int lev = Utils.getLev(locNo);//鐩爣浜岀淮鐮佹墍鍦ㄦゼ灞�
- int liftLev = liftProtocol.getLev().intValue();//鎻愬崌鏈烘墍鍦ㄦゼ灞�
- if (liftLev != lev) {
+ Short liftLev = liftProtocol.getLev();//鎻愬崌鏈烘墍鍦ㄦゼ灞�
+ if (liftLev == null) {//鎻愬崌鏈哄彲鑳藉湪杈撻�佺嚎妤煎眰
+ continue;
+ }
+ if (liftLev.intValue() != lev) {
continue;//鎻愬崌鏈轰笉鍦ㄧ洰鏍囨ゼ灞傝烦杩�
}
@@ -1038,17 +1188,16 @@
continue;
}
- if (!shuttleProtocol.isIdle()) {
- continue;
- }
-
if (outStaLocNo == null) {
continue;
}
if (wrkMast.getWrkSts() == 21) {
- wrkMast.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());//缁欏伐浣滄。鍒嗛厤鍥涘悜绌挎杞﹀彿
+ if (!shuttleProtocol.isIdle()) {
+ continue;
+ }
+
//婧愬簱浣�(灏忚溅褰撳墠浣嶇疆)
String currentLocNo = shuttleProtocol.getCurrentLocNo();
@@ -1067,27 +1216,14 @@
assignCommand.setSourceLocNo(currentLocNo);
//鍒ゆ柇灏忚溅鍜屽簱浣嶆槸鍚﹀湪鍚屼竴灞�
- if (Boolean.parseBoolean(searchIdleShuttle.get("sameLay").toString())) {
+ if (currentLev == Utils.getLev(wrkMast.getSourceLocNo())) {
//鍚屼竴灞�(灏嗗皬杞︾Щ鍔ㄥ埌璐х墿浣嶇疆)
+
List<ShuttleCommand> commands = this.shuttleAssignCommand(currentLocNo, wrkMast.getSourceLocNo(), liftSiteLocNo, assignCommand, shuttleThread);
if (commands == null) {
//鏈壘鍒拌矾寰勶紝绛夊緟涓嬩竴娆�
continue;
}
-
- //鑾峰彇褰撳墠灏忚溅鎵�鍦ㄦゼ灞傜殑绔欑偣淇℃伅
- BasDevp basDevp = basDevpService.queryByLocNo(liftSiteLocNo);
- Short endStartCode = Short.parseShort(basDevp.getQrCodeValue());//绔欑偣浜岀淮鐮�
-
- String disLocNo = "2000202" + Utils.getLev(liftSiteLocNo);//閬胯浣嶇疆
- LocMast locMast1 = locMastService.queryByLoc(disLocNo);
- if (locMast1 == null) {
- continue;//鎵句笉鍒板簱浣�
- }
- short disCode = Short.parseShort(locMast1.getQrCodeValue());
- //浠诲姟鎵ц瀹屽悗锛屽皬杞﹁繘鍏ョЩ寮�鎻愬崌鏈哄彛绔欑偣浣嶇疆锛屼互鍏嶅潬钀�
- ShuttleCommand moveCommand = shuttleThread.getMoveCommand(endStartCode, disCode, 1400, ShuttleRunDirection.BOTTOM.id, endStartCode, 1400, 500);
- commands.add(moveCommand);
//鍒嗛厤鐩爣搴撲綅
shuttleProtocol.setLocNo(wrkMast.getSourceLocNo());
@@ -1126,7 +1262,7 @@
Short endStartCode = Short.parseShort(basDevp.getQrCodeValue());//绔欑偣浜岀淮鐮�
//澧炲姞绉诲姩杩涙彁鍗囨満鍛戒护
- ShuttleCommand moveCommand = shuttleThread.getMoveCommand(endStartCode, liftProtocol.getBarcode(), 1400, ShuttleRunDirection.TOP.id, endStartCode, 1400, 500);
+ ShuttleCommand moveCommand = shuttleThread.getMoveCommand(endStartCode, liftProtocol.getBarcode(), 1600, ShuttleRunDirection.TOP.id, null, null, 500);
commands.add(moveCommand);
//鐩爣搴撲綅
@@ -1140,6 +1276,9 @@
}
}
} else if (wrkMast.getWrkSts() == 25) {
+ if (!shuttleProtocol.isIdle(wrkMast.getWrkNo().shortValue())) {
+ continue;
+ }
wrkMast.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());//缁欏伐浣滄。鍒嗛厤鍥涘悜绌挎杞﹀彿
@@ -1159,27 +1298,13 @@
if (commands == null) {
continue;//鏈壘鍒拌矾寰�
}
+
//姝ゆ椂杞﹀湪鎻愬崌鏈哄唴閮紝闇�瑕佸涓嬭揪涓�姝ユ寚浠よ杞︾Щ鍔ㄥ埌鎻愬崌鏈哄彛
short startCode = liftProtocol.getBarcode();//鎻愬崌鏈哄唴閮ㄤ簩缁寸爜
Short distCode = commands.get(0).getStartCodeNum();//鐩爣浜岀淮鐮�
//鑾峰彇绉诲姩鍛戒护
- ShuttleCommand moveCommand = shuttleThread.getMoveCommand(startCode, distCode, 1400, commands.get(0).getRunDirection(), startCode, 1400, 500);
+ ShuttleCommand moveCommand = shuttleThread.getMoveCommand(startCode, distCode, 1600, commands.get(0).getRunDirection(), null, null, 500);
commands.add(0, moveCommand);//灏嗚鎸囦护娣诲姞鍒伴槦澶�
-
- //鑾峰彇褰撳墠灏忚溅鎵�鍦ㄦゼ灞傜殑绔欑偣淇℃伅
- BasDevp basDevp = basDevpService.queryByLocNo(liftSiteLocNo);
- Short endStartCode = Short.parseShort(basDevp.getQrCodeValue());//绔欑偣浜岀淮鐮�
-
- String disLocNo = "2000202" + Utils.getLev(liftSiteLocNo);//閬胯浣嶇疆
- LocMast locMast1 = locMastService.queryByLoc(disLocNo);
- if (locMast1 == null) {
- continue;//鎵句笉鍒板簱浣�
- }
- short disCode = Short.parseShort(locMast1.getQrCodeValue());
- //浠诲姟鎵ц瀹屽悗锛屽皬杞﹁繘鍏ョЩ寮�鎻愬崌鏈哄彛绔欑偣浣嶇疆锛屼互鍏嶅潬钀�
- ShuttleCommand moveCommand2 = shuttleThread.getMoveCommand(endStartCode, disCode, 1400, ShuttleRunDirection.BOTTOM.id, endStartCode, 1400, 500);
- commands.add(moveCommand2);
-
//鍒嗛厤鐩爣搴撲綅
shuttleProtocol.setLocNo(wrkMast.getSourceLocNo());
@@ -1216,6 +1341,31 @@
ArrayList<ShuttleThread> sameLev = new ArrayList<>();//鐩稿悓妤煎眰鐨勭┛姊溅
ArrayList<ShuttleThread> diffLev = new ArrayList<>();//涓嶅悓妤煎眰鐨勭┛姊溅
+ //鍒ゆ柇鍏朵粬绌洪棽绌挎杞︽槸鍚︾浠诲姟鏈�杩�
+ String distLocNo = null;//鐩爣鍦扮偣锛屽叆搴�=銆嬫彁鍗囨満鍙ｏ紝鍑哄簱=銆嬭揣鐗╁簱浣嶅彿
+ if (wrkMast.getIoType() == 1) {
+ //鍏ュ簱
+ distLocNo = Utils.levToOutInStaLocNo(lev);
+ }else if(wrkMast.getIoType() == 101){
+ //鍑哄簱
+ distLocNo = locNo;
+ } else if (wrkMast.getIoType() == 11) {
+ //搴撲綅绉昏浆
+ distLocNo = wrkMast.getSourceLocNo();
+ }
+
+ //鍒ゆ柇褰撳墠浠诲姟鎵�鍦ㄦゼ灞傛槸鍚︽湁鍏朵粬浠诲姟宸茬粡鍒嗛厤浜嗗皬杞︼紝濡傛湁鍒欑洿鎺ョ敤璇ュ皬杞�(涓�灞傛ゼ浠呭垎閰嶄竴鍙拌溅)
+ List<WrkMast> wrkMasts = wrkMastService.selectShuttleWrkByLev(lev);//鍒ゆ柇褰撳墠绌挎杞︽ゼ灞傛槸鍚﹀凡鏈夊垎閰嶈溅杈嗙殑浠诲姟锛屽鏋滄湁鍒欏垎閰嶈繖杈嗚溅
+ if (wrkMasts.size() > 0) {
+ //瀛樺湪鍏朵粬浠诲姟锛屽垎閰嶈繖杈嗚溅
+ WrkMast wrkMast1 = wrkMasts.get(0);
+ ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, wrkMast1.getShuttleNo());
+
+ map.put("sameLay", true);//鍚屽眰
+ map.put("result", shuttleThread);
+ return map;
+ }
+
for (ShuttleSlave shuttle : slaveProperties.getShuttle()) {
//鑾峰彇鍥涘悜绌挎杞︾嚎绋�
ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttle.getId());
@@ -1231,6 +1381,14 @@
if (shuttleLocNo == null) {
continue;
}
+
+ if (shuttleLocNo.equals(distLocNo)) {
+ //杞﹁締褰撳墠浣嶇疆宸茬粡鏄洰鏍囧簱浣嶏紝鏃犻渶璁＄畻
+ map.put("sameLay", true);//鍚屽眰
+ map.put("result", shuttleThread);
+ return map;
+ }
+
int shuttleLocNoLey = Utils.getLev(shuttleLocNo);//搴撲綅鍙峰搴斿眰楂�
if (lev == shuttleLocNoLey) {
//宸ヤ綔妗ｆゼ灞傜浉鍚岀殑绌挎杞�
@@ -1242,37 +1400,18 @@
}
+ Integer recentAllDistance = 9999999;
if (sameLev.size() > 0) {
//鍚屼竴妤煎眰鏈夌┖闂茬┛姊溅锛屽垯鍙湪宸ヤ綔妗ｆゼ灞傚鎵�
//瀵绘壘绂讳换鍔℃渶杩戠殑绌挎杞�
for (ShuttleThread shuttleThread : sameLev) {
- if (recentShuttle == null) {//鏈�杩戠┛姊溅涓虹┖锛屽垯榛樿璧嬩簣涓烘渶杩戠┛姊溅
- recentShuttle = shuttleThread;
- }
-
- //鍒ゆ柇鍏朵粬绌洪棽绌挎杞︽槸鍚︾浠诲姟鏈�杩�
- String distLocNo = null;//鐩爣鍦扮偣锛屽叆搴�=銆嬫彁鍗囨満鍙ｏ紝鍑哄簱=銆嬭揣鐗╁簱浣嶅彿
- if (wrkMast.getIoType() < 101) {
- //鍏ュ簱
- distLocNo = Utils.levToOutInStaLocNo(lev);
- }else {
- //鍑哄簱
- distLocNo = locNo;
- }
-
//褰撳墠绌挎杞﹀簱浣嶅彿
String currentLocNo = shuttleThread.getShuttleProtocol().getCurrentLocNo();
- //鐩墠鏈�杩戠┛姊溅搴撲綅鍙�
- String recentLocNo = recentShuttle.getShuttleProtocol().getCurrentLocNo();
-
- //褰撳墠鏈�杩戝洓鍚戠┛姊溅鍒扮洰鏍囧湴鐐硅窛绂�
- List<NavigateNode> recentShuttlePath = NavigateUtils.calc(recentLocNo, distLocNo, NavigationMapType.NORMAL.id);//鎼滅储绌洪棽绌挎杞︼紝浣跨敤姝ｅ父閫氶亾鍦板浘
//褰撳墠绌挎杞︾嚎绋嬪埌鐩爣鍦扮偣璺濈
- List<NavigateNode> currentShuttlePath = NavigateUtils.calc(currentLocNo, distLocNo, NavigationMapType.NORMAL.id);//鎼滅储绌洪棽绌挎杞︼紝浣跨敤姝ｅ父閫氶亾鍦板浘
- if (recentShuttlePath == null || currentShuttlePath == null) {
+ List<NavigateNode> currentShuttlePath = NavigateUtils.calc(currentLocNo, distLocNo, NavigationMapType.NORMAL.id, Utils.getShuttlePoints(shuttleThread.getSlave().getId(), Utils.getLev(currentLocNo)));//鎼滅储绌洪棽绌挎杞︼紝浣跨敤姝ｅ父閫氶亾鍦板浘
+ if (currentShuttlePath == null) {
continue;
}
- Integer recentAllDistance = NavigateUtils.getOriginPathAllDistance(recentShuttlePath);//璁＄畻褰撳墠璺緞琛岃蛋鎬昏窛绂�
Integer currentAllDistance = NavigateUtils.getOriginPathAllDistance(currentShuttlePath);//璁＄畻褰撳墠璺緞琛岃蛋鎬昏窛绂�
if (currentAllDistance < recentAllDistance) {
//濡傛灉褰撳墠妤煎眰鐨勮溅璺緞鏇村皬锛屽垯鏇存柊鏈�杩戠┛姊溅
@@ -1286,26 +1425,22 @@
//鍚屼竴妤煎眰锛屾病鏈夌┖闂茬┛姊溅锛屽彧鑳戒粠鍏朵粬妤煎眰璋冨害
//瀵绘壘绂讳换鍔℃渶杩戠殑绌挎杞�
for (ShuttleThread shuttleThread : diffLev) {
- if (recentShuttle == null) {//鏈�杩戠┛姊溅涓虹┖锛屽垯榛樿璧嬩簣涓烘渶杩戠┛姊溅
- recentShuttle = shuttleThread;
- }
//褰撳墠绌挎杞﹀簱浣嶅彿
String currentLocNo = shuttleThread.getShuttleProtocol().getCurrentLocNo();
int currentLev = Utils.getLev(currentLocNo);
- //鐩墠鏈�杩戠┛姊溅搴撲綅鍙�
- String recentLocNo = recentShuttle.getShuttleProtocol().getCurrentLocNo();
- int recentLev = Utils.getLev(recentLocNo);
-
- //褰撳墠鏈�杩戝洓鍚戠┛姊溅鍒板綋鍓嶈溅瀛愭墍鍦ㄦゼ灞傜殑鎻愬崌鏈哄彛璺濈
- List<NavigateNode> recentShuttlePath = NavigateUtils.calc(recentLocNo, Utils.levToOutInStaLocNo(recentLev), NavigationMapType.NORMAL.id);//鎼滅储绌洪棽绌挎杞︼紝浣跨敤姝ｅ父閫氶亾鍦板浘
- //褰撳墠绌挎杞︾嚎绋嬪埌褰撳墠杞﹀瓙鎵�鍦ㄦゼ灞傜殑鎻愬崌鏈哄彛璺濈
- List<NavigateNode> currentShuttlePath = NavigateUtils.calc(currentLocNo, Utils.levToOutInStaLocNo(currentLev), NavigationMapType.NORMAL.id);//鎼滅储绌洪棽绌挎杞︼紝浣跨敤姝ｅ父閫氶亾鍦板浘
- if (recentShuttlePath == null || currentShuttlePath == null) {
+ List<WrkMast> wrkMasts1 = wrkMastService.selectNoShuttleWrkByLev(currentLev);//鍒ゆ柇褰撳墠绌挎杞︽ゼ灞傛槸鍚︽湁寰呭垎閰嶈溅杈嗙殑浠诲姟锛屽鏋滄湁鍒欎笉鍒嗛厤杩欒締杞�
+ if (wrkMasts1.size() > 0) {
+ //瀛樺湪鍏朵粬浠诲姟锛岃烦杩囪繖杈嗚溅
continue;
}
- Integer recentAllDistance = NavigateUtils.getOriginPathAllDistance(recentShuttlePath);//璁＄畻褰撳墠璺緞琛岃蛋鎬昏窛绂�
+ //褰撳墠绌挎杞︾嚎绋嬪埌褰撳墠杞﹀瓙鎵�鍦ㄦゼ灞傜殑鎻愬崌鏈哄彛璺濈
+ List<NavigateNode> currentShuttlePath = NavigateUtils.calc(currentLocNo, Utils.levToOutInStaLocNo(currentLev), NavigationMapType.NORMAL.id, Utils.getShuttlePoints(shuttleThread.getSlave().getId(), currentLev));//鎼滅储绌洪棽绌挎杞︼紝浣跨敤姝ｅ父閫氶亾鍦板浘
+ if (currentShuttlePath == null) {
+ continue;
+ }
+
Integer currentAllDistance = NavigateUtils.getOriginPathAllDistance(currentShuttlePath);//璁＄畻褰撳墠璺緞琛岃蛋鎬昏窛绂�
if (currentAllDistance < recentAllDistance) {
//濡傛灉褰撳墠妤煎眰鐨勮溅璺緞鏇村皬锛屽垯鏇存柊鏈�杩戠┛姊溅
@@ -1336,12 +1471,20 @@
&& shuttleProtocol.getTaskNo() != 0
&& shuttleProtocol.getBusyStatus() == 0
) {
+ //鏍囪澶嶄綅
+ shuttleProtocol.setPakMk(true);
+
+ ShuttleAssignCommand assignCommand = shuttleProtocol.getAssignCommand();
+
//灏嗕换鍔℃。鏍囪涓哄畬鎴�
WrkMast wrkMast = wrkMastMapper.selectByWorkNo(shuttleProtocol.getTaskNo().intValue());
+ ShuttleAssignCommand moveAssignCommand = null;//閬胯鍛戒护
if (wrkMast != null) {
switch (wrkMast.getWrkSts().intValue()) {
case 9://9.灏忚溅鍏ュ簱鎼繍涓� ==> 14.鍏ュ簱瀹屾垚
wrkMast.setWrkSts(14L);
+ //浠诲姟鍙锋竻闆�
+ shuttleProtocol.setTaskNo((short) 0);
break;
case 5://5.杩佺Щ灏忚溅鑷虫彁鍗囨満鍙� ==> 6.杩佺Щ灏忚溅鑷虫彁鍗囨満鍙ｅ畬鎴�
wrkMast.setWrkSts(6L);
@@ -1350,12 +1493,54 @@
wrkMast.setWrkSts(23L);
break;
case 26://26.灏忚溅鍑哄簱鎼繍涓� ==> 27.灏忚溅鍑哄簱鎼繍瀹屾垚
+ //浠诲姟鎵ц瀹屽悗锛屽皬杞﹁繘鍏ョЩ寮�鎻愬崌鏈哄彛绔欑偣浣嶇疆锛屼互鍏嶅潬钀�
+ //鎼滅储涓�鏉℃病鏈夊皬杞︾殑绌哄贩閬擄紝骞惰皟搴﹀皬杞�
+ int distLev = Utils.getLev(wrkMast.getSourceLocNo());//閬胯妤煎眰
+ String startLocNo = "180020" + distLev;
+ moveAssignCommand = Utils.searchEmptyGroupToMoveShuttle(distLev, shuttleThread.getSlave().getId(), shuttleThread, startLocNo);
+ if (moveAssignCommand == null) {//璋冨害灏忚溅鍛戒护涓虹┖
+ continue;
+ }
+
wrkMast.setWrkSts(27L);
+ //浠诲姟鍙锋竻闆�
+ shuttleProtocol.setTaskNo((short) 0);
break;
default:
}
if (wrkMastMapper.updateById(wrkMast) > 0) {
+ //璁剧疆鍥涘悜绌挎杞︿负绌洪棽鐘舵��
+ shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE);
+ //婧愬簱浣嶆竻闆�
+ shuttleProtocol.setSourceLocNo(null);
+ //鐩爣搴撲綅娓呴浂
+ shuttleProtocol.setLocNo(null);
+ //浠诲姟鎸囦护娓呴浂
+ shuttleProtocol.setAssignCommand(null);
+ News.info("鍥涘悜绌挎杞﹀凡纭涓斾换鍔″畬鎴愮姸鎬�,澶嶄綅銆傚洓鍚戠┛姊溅鍙�={}", shuttleProtocol.getShuttleNo());
+
+ if (wrkMast.getWrkSts() == 27) {
+ if (moveAssignCommand != null) {
+ try {
+ Thread.sleep(4000);
+ //涓嬪彂浠诲姟
+ shuttleProtocol.setPakMk(true);
+ MessageQueue.offer(SlaveType.Shuttle, shuttleThread.getSlave().getId(), new Task(3, moveAssignCommand));
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+
+ } else {
+ News.error("鍥涘悜绌挎杞﹀凡纭涓斾换鍔″畬鎴愮姸鎬�,澶嶄綅澶辫触锛屼絾鏈壘鍒板伐浣滄。銆傚洓鍚戠┛姊溅鍙�={}锛屽伐浣滃彿={}", shuttleProtocol.getShuttleNo(), shuttleProtocol.getTaskNo());
+ }
+ }
+
+ if (assignCommand != null) {
+ if (assignCommand.getTaskMode().intValue() == ShuttleTaskModeType.AVOID.id) {
+ //閬胯浠诲姟
//璁剧疆鍥涘悜绌挎杞︿负绌洪棽鐘舵��
shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE);
//浠诲姟鍙锋竻闆�
@@ -1364,13 +1549,9 @@
shuttleProtocol.setSourceLocNo(null);
//鐩爣搴撲綅娓呴浂
shuttleProtocol.setLocNo(null);
- //鏍囪澶嶄綅
- shuttleProtocol.setPakMk(true);
//浠诲姟鎸囦护娓呴浂
shuttleProtocol.setAssignCommand(null);
- News.info("鍥涘悜绌挎杞﹀凡纭涓斾换鍔″畬鎴愮姸鎬�,澶嶄綅銆傚洓鍚戠┛姊溅鍙�={}", shuttleProtocol.getShuttleNo());
- } else {
- News.error("鍥涘悜绌挎杞﹀凡纭涓斾换鍔″畬鎴愮姸鎬�,澶嶄綅澶辫触锛屼絾鏈壘鍒板伐浣滄。銆傚洓鍚戠┛姊溅鍙�={}锛屽伐浣滃彿={}", shuttleProtocol.getShuttleNo(), shuttleProtocol.getTaskNo());
+ News.info("鍥涘悜绌挎杞﹂伩璁╀换鍔″凡纭涓斾换鍔″畬鎴愮姸鎬�,澶嶄綅銆傚洓鍚戠┛姊溅鍙�={}", shuttleProtocol.getShuttleNo());
}
}
@@ -1445,234 +1626,254 @@
}
//鎼滅储鏄惁鏈夊緟澶勭悊鐨勪换鍔�
- WrkMast wrkMast = wrkMastMapper.selectLiftStep262327();
- if (wrkMast == null) {
+ List<WrkMast> wrkMasts = wrkMastMapper.selectLiftStep262327();
+ if (wrkMasts.size() == 0) {
continue;
}
- //鍛戒护list
- ArrayList<LiftCommand> commands = new ArrayList<>();
-
- DevpThread devpThread = null;
- Integer devpId = null;
- for (DevpSlave devp : slaveProperties.getDevp()){
- // 鑾峰彇鍏ュ簱绔欎俊鎭�
- devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- devpId = devp.getId();
- }
-
- if (wrkMast.getWrkSts() == 2) {//2.璁惧涓婅蛋
- if (liftProtocol.getTaskNo().intValue() != 0) {
- //瀛樺湪鏈畬鎴愪换鍔″彿
- continue;
- }
- if (liftProtocol.getPlatShuttleCheck()) {
- //鎻愬崌鏈烘鏃舵湁鍥涘悜杞︼紝鍙兘鏈夋湭瀹屾垚鐨勪换鍔★紝绂佹鍒嗛厤鏂颁换鍔�
+ for (WrkMast wrkMast : wrkMasts) {
+ //鎼滅储鏄惁鏈夊叾浠栦换鍔″崰鐢ㄤ簡鎻愬崌鏈猴紝濡傛灉鍗犵敤鎻愬崌鏈虹殑浠诲姟鍜屽綋鍓嶄换鍔＄浉鍚岋紝鍒欒繍琛屾墽琛�
+ WrkMast wrkMast1 = wrkMastMapper.selectLiftWrkMast(liftProtocol.getLiftNo().intValue());
+ if (wrkMast1 != null && wrkMast1.getWrkNo().intValue() != wrkMast.getWrkNo().intValue()) {
continue;
}
- //宸ヤ綔妗ｇ洰鏍囧簱浣嶅彿
- String wrkMastLocNo = wrkMast.getLocNo();
- //宸ヤ綔妗ｇ洰鏍囧簱浣嶆ゼ灞�
- int wrkMastLocNoLey = Utils.getLev(wrkMastLocNo);
+ //鍛戒护list
+ ArrayList<LiftCommand> commands = new ArrayList<>();
- Integer levTmp = wrkMastLocNoLey;
- if (wrkMastLocNoLey >= 2) {
- levTmp += 1;
- }
- Integer distStaNo = Utils.levToOutInStaNo(levTmp);
-
- if (liftProtocol.getPositionArrivalFeedback().intValue() != LiftLevType.TWO.realLev.intValue()) {
- //鎻愬崌鏈轰笉鍦ㄨ緭閫佺嚎妤煎眰锛岃幏鍙栧埌杈撻�佺嚎灞傜殑鎻愬崌鏈哄懡浠�
- LiftCommand command1 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), LiftLevType.TWO.lev);
- commands.add(command1);//灏嗗懡浠ゆ坊鍔犺繘list
+ DevpThread devpThread = null;
+ Integer devpId = null;
+ for (DevpSlave devp : slaveProperties.getDevp()){
+ // 鑾峰彇鍏ュ簱绔欎俊鎭�
+ devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ devpId = devp.getId();
}
- //杈撻�佺嚎灏嗚揣鐗╄繍杩涙潵(鏃犺揣姝ｈ浆)
- LiftCommand command2 = liftThread.getLiftTurnCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), 3);
- command2.setOperaStaNo((short) 102);//鎿嶄綔102绔�
- command2.setRotationDire(1);//缁欒緭閫佺嚎涓嬪彂閾炬潯杞姩淇″彿锛屾杞�
- command2.setDevpId(devpId);
- command2.setStaNo(distStaNo.shortValue());//璁剧疆鐩爣绔�
- commands.add(command2);//灏嗗懡浠ゆ坊鍔犺繘list
+ if (wrkMast.getWrkSts() == 2) {//2.璁惧涓婅蛋
+ if (liftProtocol.getTaskNo().intValue() != 0) {
+ //瀛樺湪鏈畬鎴愪换鍔″彿
+ continue;
+ }
+ if (liftProtocol.getPlatShuttleCheck()) {
+ //鎻愬崌鏈烘鏃舵湁鍥涘悜杞︼紝鍙兘鏈夋湭瀹屾垚鐨勪换鍔★紝绂佹鍒嗛厤鏂颁换鍔�
+ continue;
+ }
- //鎻愬崌鏈哄墠寰�鐩爣妤煎眰(宸ヤ綔妗ｇ洰鏍囨ゼ灞�)
- LiftCommand command3 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), levTmp);
- commands.add(command3);//灏嗗懡浠ゆ坊鍔犺繘list
+ //鑾峰彇鐩爣绔�
+ StaProtocol staProtocol = devpThread.getStation().get(wrkMast.getStaNo());
+ if (staProtocol.isLoading() || !staProtocol.isInEnable()) {//鐩爣绔欐湁鐗╋紝涓嶅彲鍏ワ紝绂佹鍒嗛厤浠诲姟
+ continue;
+ }
- //鎻愬崌鏈哄埌杈炬寚瀹氭ゼ灞傦紝杈撻�佺嚎灏嗚揣鐗╃Щ鍑哄幓(姝ｈ浆)
- //杈撻�佺嚎灏嗚揣鐗╃Щ鍑哄幓
- LiftCommand command4 = liftThread.getLiftTurnCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), 1);
- command4.setOperaStaNo(distStaNo.shortValue());//鎿嶄綔鐩爣妤煎眰绔欑偣
- command4.setRotationDire(1);//缁欒緭閫佺嚎涓嬪彂閾炬潯杞姩淇″彿锛屾杞�
- command4.setDevpId(devpId);
- command4.setStaNo(distStaNo.shortValue());//璁剧疆鐩爣绔�
- commands.add(command4);//灏嗗懡浠ゆ坊鍔犺繘list
+ //宸ヤ綔妗ｇ洰鏍囧簱浣嶅彿
+ String wrkMastLocNo = wrkMast.getLocNo();
+ //宸ヤ綔妗ｇ洰鏍囧簱浣嶆ゼ灞�
+ int wrkMastLocNoLey = Utils.getLev(wrkMastLocNo);
- //缁欐彁鍗囨満鍒嗛厤浠诲姟
- liftProtocol.setTaskNo(wrkMast.getWrkNo().shortValue());//璁剧疆浠诲姟鍙�
- liftProtocol.setProtocolStatus(LiftProtocolStatusType.WORKING);//璁剧疆鎻愬崌鏈虹姸鎬佷负宸ヤ綔涓�
+ Integer levTmp = wrkMastLocNoLey;
+ if (wrkMastLocNoLey >= 2) {
+ levTmp += 1;
+ }
+ Integer distStaNo = Utils.levToOutInStaNo(levTmp);
- wrkMast.setWrkSts(3L);//3.鎻愬崌鏈烘惉杩愪腑
- } else if (wrkMast.getWrkSts() == 6) {//6.杩佺Щ灏忚溅鑷虫彁鍗囨満鍙ｅ畬鎴� => 7.鎻愬崌鏈鸿縼绉诲皬杞︿腑
- if (liftProtocol.getTaskNo().intValue() != 0 && liftProtocol.getTaskNo().intValue() != wrkMast.getWrkNo()) {
- //鎻愬崌鏈哄瓨鍦ㄦ湭瀹屾垚浠诲姟锛屼笖鎻愬崌鏈轰换鍔″彿鍜屽綋鍓嶅伐浣滄。浠诲姟鍙蜂笉涓�鑷�
- continue;
- }
- liftProtocol.setShuttleNo(wrkMast.getShuttleNo().shortValue());//璁剧疆鍥涘悜绌挎杞﹀彿
+ if (liftProtocol.getPositionArrivalFeedback().intValue() != LiftLevType.TWO.realLev.intValue()) {
+ //鎻愬崌鏈轰笉鍦ㄨ緭閫佺嚎妤煎眰锛岃幏鍙栧埌杈撻�佺嚎灞傜殑鎻愬崌鏈哄懡浠�
+ LiftCommand command1 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), LiftLevType.TWO.lev);
+ commands.add(command1);//灏嗗懡浠ゆ坊鍔犺繘list
+ }
- //鍒ゆ柇灏忚溅鏄惁鍦ㄦ彁鍗囨満鍐咃紝涓斿浜庣┖闂茬姸鎬�
- 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;//灏忚溅褰撳墠浜岀淮鐮佸拰鎻愬崌鏈哄唴閮ㄤ簩缁寸爜涓嶄竴鑷达紝涓嶅厑璁告墽琛�
- }
- if (!liftProtocol.getPlatShuttleCheck()) {
- //鎻愬崌鏈烘湭妫�娴嬪埌灏忚溅锛岀姝㈡墽琛�
- continue;
- }
+ //杈撻�佺嚎灏嗚揣鐗╄繍杩涙潵(鏃犺揣姝ｈ浆)
+ LiftCommand command2 = liftThread.getLiftTurnCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), 3);
+ command2.setOperaStaNo((short) 102);//鎿嶄綔102绔�
+ command2.setRotationDire(1);//缁欒緭閫佺嚎涓嬪彂閾炬潯杞姩淇″彿锛屾杞�
+ command2.setDevpId(devpId);
+ command2.setStaNo(distStaNo.shortValue());//璁剧疆鐩爣绔�
+ commands.add(command2);//灏嗗懡浠ゆ坊鍔犺繘list
- //宸ヤ綔妗ｇ洰鏍囧簱浣嶅彿
- String wrkMastLocNo = wrkMast.getLocNo();
- //宸ヤ綔妗ｇ洰鏍囧簱浣嶆ゼ灞�
- int wrkMastLocNoLey = Utils.getLev(wrkMastLocNo);
- if (wrkMastLocNoLey >= 2) {
- wrkMastLocNoLey++;
- }
+ //鎻愬崌鏈哄墠寰�鐩爣妤煎眰(宸ヤ綔妗ｇ洰鏍囨ゼ灞�)
+ LiftCommand command3 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), levTmp);
+ commands.add(command3);//灏嗗懡浠ゆ坊鍔犺繘list
- //鎻愬崌鏈哄墠寰�鐩爣妤煎眰(宸ヤ綔妗ｇ洰鏍囨ゼ灞�)
- LiftCommand command1 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), wrkMastLocNoLey);
- commands.add(command1);//灏嗗懡浠ゆ坊鍔犺繘list
+ //鎻愬崌鏈哄埌杈炬寚瀹氭ゼ灞傦紝杈撻�佺嚎灏嗚揣鐗╃Щ鍑哄幓(姝ｈ浆)
+ //杈撻�佺嚎灏嗚揣鐗╃Щ鍑哄幓
+ LiftCommand command4 = liftThread.getLiftTurnCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), 1);
+ 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);//璁剧疆鎻愬崌鏈虹姸鎬佷负宸ヤ綔涓�
+ //缁欐彁鍗囨満鍒嗛厤浠诲姟
+ liftProtocol.setTaskNo(wrkMast.getWrkNo().shortValue());//璁剧疆浠诲姟鍙�
+ liftProtocol.setProtocolStatus(LiftProtocolStatusType.WORKING);//璁剧疆鎻愬崌鏈虹姸鎬佷负宸ヤ綔涓�
- wrkMast.setWrkSts(7L);//6.杩佺Щ灏忚溅鑷虫彁鍗囨満鍙ｅ畬鎴� => 7.鎻愬崌鏈鸿縼绉诲皬杞︿腑
- } else if(wrkMast.getWrkSts() == 23) {//23.杩佺Щ灏忚溅鑷虫彁鍗囨満鍙ｅ畬鎴� => 24.鎻愬崌鏈鸿縼绉诲皬杞︿腑
- if (liftProtocol.getTaskNo().intValue() != 0 && liftProtocol.getTaskNo().intValue() != wrkMast.getWrkNo()) {
- //鎻愬崌鏈哄瓨鍦ㄦ湭瀹屾垚浠诲姟锛屼笖鎻愬崌鏈轰换鍔″彿鍜屽綋鍓嶅伐浣滄。浠诲姟鍙蜂笉涓�鑷�
- continue;
- }
- liftProtocol.setShuttleNo(wrkMast.getShuttleNo().shortValue());//璁剧疆鍥涘悜绌挎杞﹀彿
+ wrkMast.setLiftNo(liftProtocol.getLiftNo().intValue());//璁剧疆鎻愬崌鏈哄彿鐢ㄤ簬閿佸畾鎻愬崌鏈洪槻姝㈣鍏朵粬浠诲姟鍗犵敤
+ wrkMast.setWrkSts(3L);//3.鎻愬崌鏈烘惉杩愪腑
+ } else if (wrkMast.getWrkSts() == 6) {//6.杩佺Щ灏忚溅鑷虫彁鍗囨満鍙ｅ畬鎴� => 7.鎻愬崌鏈鸿縼绉诲皬杞︿腑
+ if (liftProtocol.getTaskNo().intValue() != 0 && liftProtocol.getTaskNo().intValue() != wrkMast.getWrkNo()) {
+ //鎻愬崌鏈哄瓨鍦ㄦ湭瀹屾垚浠诲姟锛屼笖鎻愬崌鏈轰换鍔″彿鍜屽綋鍓嶅伐浣滄。浠诲姟鍙蜂笉涓�鑷�
+ continue;
+ }
+ 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;
- }
+ //鍒ゆ柇灏忚溅鏄惁鍦ㄦ彁鍗囨満鍐咃紝涓斿浜庣┖闂茬姸鎬�
+ ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, wrkMast.getShuttleNo());
+ if (shuttleThread == null) {
+ continue;
+ }
+ ShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
+ if (shuttleProtocol == null) {
+ continue;
+ }
+ if (!shuttleProtocol.isIdle(wrkMast.getWrkNo().shortValue())) {
+ continue;//灏忚溅鐘舵�佸繖
+ }
+ if (shuttleProtocol.getCurrentCode().intValue() != liftProtocol.getBarcode().intValue()) {
+ continue;//灏忚溅褰撳墠浜岀淮鐮佸拰鎻愬崌鏈哄唴閮ㄤ簩缁寸爜涓嶄竴鑷达紝涓嶅厑璁告墽琛�
+ }
+ if (!liftProtocol.getPlatShuttleCheck()) {
+ //鎻愬崌鏈烘湭妫�娴嬪埌灏忚溅锛岀姝㈡墽琛�
+ continue;
+ }
- if (!shuttleProtocol.isIdle()) {
- continue;//灏忚溅鐘舵�佸繖
- }
- if (shuttleProtocol.getCurrentCode().intValue() != liftProtocol.getBarcode().intValue()) {
- continue;//灏忚溅褰撳墠浜岀淮鐮佸拰鎻愬崌鏈哄唴閮ㄤ簩缁寸爜涓嶄竴鑷达紝涓嶅厑璁告墽琛�
- }
- if (!liftProtocol.getPlatShuttleCheck()) {
- //鎻愬崌鏈烘湭妫�娴嬪埌灏忚溅锛岀姝㈡墽琛�
- continue;
- }
+ //宸ヤ綔妗ｇ洰鏍囧簱浣嶅彿
+ String wrkMastLocNo = wrkMast.getLocNo();
+ //宸ヤ綔妗ｇ洰鏍囧簱浣嶆ゼ灞�
+ int wrkMastLocNoLey = Utils.getLev(wrkMastLocNo);
+ if (wrkMastLocNoLey >= 2) {
+ wrkMastLocNoLey++;
+ }
- //宸ヤ綔妗ｇ洰鏍囧簱浣嶅彿
- String wrkMastLocNo = wrkMast.getSourceLocNo();
- //宸ヤ綔妗ｇ洰鏍囧簱浣嶆ゼ灞�
- 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(24L);//23.杩佺Щ灏忚溅鑷虫彁鍗囨満鍙ｅ畬鎴� => 24.鎻愬崌鏈鸿縼绉诲皬杞︿腑
- } else if (wrkMast.getWrkSts() == 27) {//27.灏忚溅鍑哄簱鎼繍瀹屾垚
- if (liftProtocol.getTaskNo().intValue() != 0 && liftProtocol.getTaskNo().intValue() != wrkMast.getWrkNo()) {
- //鎻愬崌鏈哄瓨鍦ㄦ湭瀹屾垚浠诲姟锛屼笖鎻愬崌鏈轰换鍔″彿鍜屽綋鍓嶅伐浣滄。浠诲姟鍙蜂笉涓�鑷�
- continue;
- }
- if (liftProtocol.getPlatShuttleCheck()) {
- //鎻愬崌鏈烘鏃舵湁鍥涘悜杞︼紝鍙兘鏈夋湭瀹屾垚鐨勪换鍔★紝绂佹鍒嗛厤鏂颁换鍔�
- continue;
- }
-
- //宸ヤ綔妗ｆ簮搴撲綅鍙�
- String wrkMastLocNo = wrkMast.getSourceLocNo();
- //宸ヤ綔妗ｆ簮搴撲綅妤煎眰
- int wrkMastLocNoLey = Utils.getLev(wrkMastLocNo);
-
- //鎻愬崌鏈哄綋鍓嶆ゼ灞�
- int liftLev = liftProtocol.getLev().intValue();
-
- //鍒ゆ柇鎻愬崌鏈烘槸鍚﹀埌浣�
- 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
+
+ //缁欐彁鍗囨満鍒嗛厤浠诲姟
+ liftProtocol.setTaskNo(wrkMast.getWrkNo().shortValue());//璁剧疆浠诲姟鍙�
+ liftProtocol.setProtocolStatus(LiftProtocolStatusType.WORKING);//璁剧疆鎻愬崌鏈虹姸鎬佷负宸ヤ綔涓�
+
+ wrkMast.setLiftNo(liftProtocol.getLiftNo().intValue());//璁剧疆鎻愬崌鏈哄彿鐢ㄤ簬閿佸畾鎻愬崌鏈洪槻姝㈣鍏朵粬浠诲姟鍗犵敤
+ wrkMast.setWrkSts(7L);//6.杩佺Щ灏忚溅鑷虫彁鍗囨満鍙ｅ畬鎴� => 7.鎻愬崌鏈鸿縼绉诲皬杞︿腑
+ } else if(wrkMast.getWrkSts() == 23) {//23.杩佺Щ灏忚溅鑷虫彁鍗囨満鍙ｅ畬鎴� => 24.鎻愬崌鏈鸿縼绉诲皬杞︿腑
+ if (liftProtocol.getTaskNo().intValue() != 0 && liftProtocol.getTaskNo().intValue() != wrkMast.getWrkNo()) {
+ //鎻愬崌鏈哄瓨鍦ㄦ湭瀹屾垚浠诲姟锛屼笖鎻愬崌鏈轰换鍔″彿鍜屽綋鍓嶅伐浣滄。浠诲姟鍙蜂笉涓�鑷�
+ continue;
+ }
+ 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(wrkMast.getWrkNo().shortValue())) {
+ continue;//灏忚溅鐘舵�佸繖
+ }
+ if (shuttleProtocol.getCurrentCode().intValue() != liftProtocol.getBarcode().intValue()) {
+ continue;//灏忚溅褰撳墠浜岀淮鐮佸拰鎻愬崌鏈哄唴閮ㄤ簩缁寸爜涓嶄竴鑷达紝涓嶅厑璁告墽琛�
+ }
+ if (!liftProtocol.getPlatShuttleCheck()) {
+ //鎻愬崌鏈烘湭妫�娴嬪埌灏忚溅锛岀姝㈡墽琛�
+ continue;
+ }
+
+ //宸ヤ綔妗ｇ洰鏍囧簱浣嶅彿
+ String wrkMastLocNo = wrkMast.getSourceLocNo();
+ //宸ヤ綔妗ｇ洰鏍囧簱浣嶆ゼ灞�
+ 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.setLiftNo(liftProtocol.getLiftNo().intValue());//璁剧疆鎻愬崌鏈哄彿鐢ㄤ簬閿佸畾鎻愬崌鏈洪槻姝㈣鍏朵粬浠诲姟鍗犵敤
+ wrkMast.setWrkSts(24L);//23.杩佺Щ灏忚溅鑷虫彁鍗囨満鍙ｅ畬鎴� => 24.鎻愬崌鏈鸿縼绉诲皬杞︿腑
+ } else if (wrkMast.getWrkSts() == 27) {//27.灏忚溅鍑哄簱鎼繍瀹屾垚
+ if (liftProtocol.getTaskNo().intValue() != 0 && liftProtocol.getTaskNo().intValue() != wrkMast.getWrkNo()) {
+ //鎻愬崌鏈哄瓨鍦ㄦ湭瀹屾垚浠诲姟锛屼笖鎻愬崌鏈轰换鍔″彿鍜屽綋鍓嶅伐浣滄。浠诲姟鍙蜂笉涓�鑷�
+ continue;
+ }
+ if (liftProtocol.getPlatShuttleCheck()) {
+ //鎻愬崌鏈烘鏃舵湁鍥涘悜杞︼紝鍙兘鏈夋湭瀹屾垚鐨勪换鍔★紝绂佹鍒嗛厤鏂颁换鍔�
+ continue;
+ }
+
+ //宸ヤ綔妗ｆ簮搴撲綅鍙�
+ String wrkMastLocNo = wrkMast.getSourceLocNo();
+ //宸ヤ綔妗ｆ簮搴撲綅妤煎眰
+ int wrkMastLocNoLey = Utils.getLev(wrkMastLocNo);
+
+ //鎻愬崌鏈哄綋鍓嶆ゼ灞�
+ int liftLev = liftProtocol.getLev().intValue();
+
+ //鍒ゆ柇鎻愬崌鏈烘槸鍚﹀埌浣�
+ 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
+ }
+
+ //杈撻�佺嚎灏嗚揣鐗╄繍杩涙潵(鏃犺揣鍙嶈浆)
+ LiftCommand command2 = liftThread.getLiftTurnCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), 4);
+ command2.setOperaStaNo(staProtocol.getSiteId().shortValue());//杈撻�佺嚎鎿嶄綔绔欑偣鍙�
+ command2.setRotationDire(2);//缁欒緭閫佺嚎涓嬪彂閾炬潯杞姩淇″彿锛屽弽杞�
+ command2.setDevpId(devpId);//杈撻�佺嚎ID
+ command2.setStaNo((short) 104);//鍐欏叆鍑哄簱鐩爣绔�104
+ commands.add(command2);//灏嗗懡浠ゆ坊鍔犺繘list
+
+ //鎻愬崌鏈哄墠寰�鍑哄簱鍙ｏ紝杈撻�佺嚎妤煎眰
+ LiftCommand command3 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), LiftLevType.TWO.lev);
+ command3.setDevpId(devpId);//杈撻�佺嚎ID
+ commands.add(command3);//灏嗗懡浠ゆ坊鍔犺繘list
+
+ //鎻愬崌鏈哄埌杈炬寚瀹氭ゼ灞傦紝杈撻�佺嚎灏嗚揣鐗╃Щ鍑哄幓(鍙嶈浆)
+ //杈撻�佺嚎灏嗚揣鐗╃Щ鍑哄幓
+ LiftCommand command4 = liftThread.getLiftTurnCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), 2);
+ command4.setOperaStaNo((short) 102);//鎿嶄綔102绔�
+ command4.setRotationDire(2);//缁欒緭閫佺嚎涓嬪彂閾炬潯杞姩淇″彿锛屽弽杞�
+ command4.setDevpId(devpId);//杈撻�佺嚎ID
+ commands.add(command4);//灏嗗懡浠ゆ坊鍔犺繘list
+
+ //鎻愬崌鏈洪摼鏉℃墽琛屽畬姣曞悗锛岀粰102绔欏啓鍏ヨ祫鏂�
+ LiftCommand command5 = liftThread.getResetCommand();
+ command5.setDevpId(devpId);//杈撻�佺嚎ID
+ command5.setOperaStaNo((short) 102);//鎿嶄綔102绔�
+ command5.setStaNo((short) 104);//鍐欏叆鍑哄簱鐩爣绔�104
+ command5.setRotationDire(0);//閾炬潯杞姩鍋滄
+ commands.add(command5);
+
+ //缁欐彁鍗囨満鍒嗛厤浠诲姟
+ liftProtocol.setTaskNo(wrkMast.getWrkNo().shortValue());//璁剧疆浠诲姟鍙�
+ liftProtocol.setProtocolStatus(LiftProtocolStatusType.WORKING);//璁剧疆鎻愬崌鏈虹姸鎬佷负宸ヤ綔涓�
+
+ wrkMast.setLiftNo(liftProtocol.getLiftNo().intValue());//璁剧疆鎻愬崌鏈哄彿鐢ㄤ簬閿佸畾鎻愬崌鏈洪槻姝㈣鍏朵粬浠诲姟鍗犵敤
+ wrkMast.setWrkSts(28L);//28.鎻愬崌鏈烘惉杩愪腑
}
- //杈撻�佺嚎灏嗚揣鐗╄繍杩涙潵(鏃犺揣鍙嶈浆)
- LiftCommand command2 = liftThread.getLiftTurnCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), 4);
- command2.setOperaStaNo(staProtocol.getSiteId().shortValue());//杈撻�佺嚎鎿嶄綔绔欑偣鍙�
- command2.setRotationDire(2);//缁欒緭閫佺嚎涓嬪彂閾炬潯杞姩淇″彿锛屽弽杞�
- command2.setDevpId(devpId);//杈撻�佺嚎iD
- command2.setStaNo((short) 104);//鍐欏叆鍑哄簱鐩爣绔�104
- commands.add(command2);//灏嗗懡浠ゆ坊鍔犺繘list
-
- //鎻愬崌鏈哄墠寰�鍑哄簱鍙ｏ紝杈撻�佺嚎妤煎眰
- LiftCommand command3 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), LiftLevType.TWO.lev);
- commands.add(command3);//灏嗗懡浠ゆ坊鍔犺繘list
-
- //鎻愬崌鏈哄埌杈炬寚瀹氭ゼ灞傦紝杈撻�佺嚎灏嗚揣鐗╃Щ鍑哄幓(鍙嶈浆)
- //杈撻�佺嚎灏嗚揣鐗╃Щ鍑哄幓
- LiftCommand command4 = liftThread.getLiftTurnCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), 2);
- command4.setOperaStaNo((short) 102);//鎿嶄綔102绔�
- command4.setRotationDire(2);//缁欒緭閫佺嚎涓嬪彂閾炬潯杞姩淇″彿锛屽弽杞�
- command4.setDevpId(devpId);
- commands.add(command4);//灏嗗懡浠ゆ坊鍔犺繘list
-
- //鎻愬崌鏈洪摼鏉℃墽琛屽畬姣曞悗锛岀粰102绔欏啓鍏ヨ祫鏂�
- LiftCommand command5 = liftThread.getResetCommand();
- command5.setDevpId(devpId);//杈撻�佺嚎iD
- command5.setOperaStaNo((short) 102);//鎿嶄綔102绔�
- command5.setStaNo((short) 104);//鍐欏叆鍑哄簱鐩爣绔�104
- command5.setRotationDire(0);//閾炬潯杞姩鍋滄
- commands.add(command5);
-
- //缁欐彁鍗囨満鍒嗛厤浠诲姟
- liftProtocol.setTaskNo(wrkMast.getWrkNo().shortValue());//璁剧疆浠诲姟鍙�
- liftProtocol.setProtocolStatus(LiftProtocolStatusType.WORKING);//璁剧疆鎻愬崌鏈虹姸鎬佷负宸ヤ綔涓�
-
- wrkMast.setWrkSts(28L);//28.鎻愬崌鏈烘惉杩愪腑
+ //鎵�闇�鍛戒护缁勫悎瀹屾瘯锛屾洿鏂版暟鎹簱锛屾彁浜ゅ埌绾跨▼鍘诲伐浣�
+ LiftAssignCommand assignCommand = new LiftAssignCommand();
+ assignCommand.setCommands(commands);
+ assignCommand.setLiftNo(liftProtocol.getLiftNo());
+ assignCommand.setTaskNo(liftProtocol.getTaskNo());
+ if (wrkMastMapper.updateById(wrkMast) > 0) {
+ //涓嬪彂浠诲姟
+ MessageQueue.offer(SlaveType.Lift, liftProtocol.getLiftNo().intValue(), new Task(3, assignCommand));
+ }
}
- //鎵�闇�鍛戒护缁勫悎瀹屾瘯锛屾洿鏂版暟鎹簱锛屾彁浜ゅ埌绾跨▼鍘诲伐浣�
- LiftAssignCommand assignCommand = new LiftAssignCommand();
- assignCommand.setCommands(commands);
- assignCommand.setLiftNo(liftProtocol.getLiftNo());
- assignCommand.setTaskNo(liftProtocol.getTaskNo());
- if (wrkMastMapper.updateById(wrkMast) > 0) {
- //涓嬪彂浠诲姟
- MessageQueue.offer(SlaveType.Lift, liftProtocol.getLiftNo().intValue(), new Task(3, assignCommand));
- }
}
}
@@ -1694,9 +1895,6 @@
&& !liftProtocol.getRunning()
) {
- //鏍囪澶嶄綅
- liftProtocol.setPakMk(true);
-
DevpThread devpThread = null;
Integer devpId = null;
for (DevpSlave devp : slaveProperties.getDevp()){
@@ -1708,8 +1906,18 @@
//灏嗕换鍔℃。鏍囪涓哄畬鎴�
WrkMast wrkMast = wrkMastMapper.selectByWorkNo372428(liftProtocol.getTaskNo().intValue());
if (wrkMast != null) {
+ //鍒ゆ柇鎻愬崌鏈烘槸鍚﹀埌杈句换鍔℃ゼ灞�
+ String locNo = wrkMast.getIoType() < 101 ? wrkMast.getLocNo() : wrkMast.getSourceLocNo();
+ int lev = Utils.getLev(locNo);//浠诲姟鐩爣妤煎眰
+
+ //鏍囪澶嶄綅
+ liftProtocol.setPakMk(true);
+
switch (wrkMast.getWrkSts().intValue()) {
case 3://3.鎻愬崌鏈烘惉杩愪腑 ==> 4.鎻愬崌鏈烘惉杩愬畬鎴�
+ if (liftProtocol.getLev().intValue() != lev) {
+ continue;//鎻愬崌鏈烘病鏈夊埌杈剧洰鏍�
+ }
//缁欑洰鏍囩珯璁剧疆宸ヤ綔鍙�
StaProtocol staProtocol = devpThread.getStation().get(wrkMast.getStaNo());//鐩爣绔�
staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
@@ -1719,18 +1927,31 @@
throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
}
wrkMast.setWrkSts(4L);
+ //浠诲姟鍙锋竻闆�
+ liftProtocol.setTaskNo((short) 0);
+ wrkMast.setLiftNo(null);//鎻愬崌鏈鸿В閿�
break;
case 7://7.鎻愬崌鏈鸿縼绉诲皬杞︿腑 ==> 8.鎻愬崌鏈鸿縼绉诲皬杞﹀畬鎴�
+ if (liftProtocol.getLev().intValue() != lev) {
+ continue;//鎻愬崌鏈烘病鏈夊埌杈剧洰鏍�
+ }
wrkMast.setWrkSts(8L);
break;
case 24://24.鎻愬崌鏈鸿縼绉诲皬杞︿腑 ==> 25.鎻愬崌鏈鸿縼绉诲皬杞﹀畬鎴�
+ if (liftProtocol.getLev().intValue() != lev) {
+ continue;//鎻愬崌鏈烘病鏈夊埌杈剧洰鏍�
+ }
wrkMast.setWrkSts(25L);
break;
case 28://28.鎻愬崌鏈烘惉杩愪腑 ==> 29.鎻愬崌鏈烘惉杩愬畬鎴�
+ if (liftProtocol.getPositionArrivalFeedback().intValue() != 2) {
+ continue;//鎻愬崌鏈烘槸鍚﹁揪鍒拌緭閫佺嚎妤煎眰
+ }
wrkMast.setWrkSts(29L);
wrkMast.setWrkSts(34L);//34.鍑哄簱瀹屾垚锛屾殏鏃跺厛鐩存帴瀹屾垚鍑哄簱宸ヤ綔妗ｏ紝鍚庣画闇�瑕佹牴鎹緭閫佺嚎缁欏嚭鐨勭姸鎬佹潵纭畾34.鍑哄簱瀹屾垚鐘舵��
//浠诲姟鍙锋竻闆�
liftProtocol.setTaskNo((short) 0);
+ wrkMast.setLiftNo(null);//鎻愬崌鏈鸿В閿�
break;
default:
}
@@ -1749,6 +1970,9 @@
//鏌ヨ鏄惁鏈夊厖鐢典换鍔�
WrkCharge wrkCharge = wrkChargeMapper.selectByWorkNo(liftProtocol.getTaskNo().intValue());
if (wrkCharge != null) {
+ //鏍囪澶嶄綅
+ liftProtocol.setPakMk(true);
+
switch (wrkCharge.getWrkSts().intValue()) {
case 54://鎻愬崌鏈烘惉杩愪腑
wrkCharge.setWrkSts(55L);//鎻愬崌鏈烘惉杩愬畬鎴�
@@ -1775,8 +1999,11 @@
if (liftProtocol.getAssignCommand() != null) {
//璁剧疆鎻愬崌鏈轰负绌洪棽鐘舵��
liftProtocol.setProtocolStatus(LiftProtocolStatusType.IDLE);
- //浠诲姟鍙锋竻闆�
- liftProtocol.setTaskNo((short) 0);
+ //鍒ゆ柇鏄惁涓哄洓鍚戠┛姊溅璋冨害鎻愬崌鏈猴紝濡傛槸鍒欐棤闇�娓呯悊浠诲姟鍙�
+ if (!liftProtocol.getSecurityMk()) {
+ //浠诲姟鍙锋竻闆�
+ liftProtocol.setTaskNo((short) 0);
+ }
//鏍囪澶嶄綅
liftProtocol.setPakMk(true);
//浠诲姟鎸囦护娓呴浂
@@ -1789,285 +2016,229 @@
}
/**
- * 褰撳墠搴撲綅缁勬槸鍚﹀瓨鍦ㄧ┖闂插皬杞�
+ * 搴撲綅绉昏浆
*/
- public Integer hasCar(String locNo) {
- for (SteSlave ste : slaveProperties.getSte()) {
- // 鑾峰彇鍫嗗灈鏈轰俊鎭�
- SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, ste.getId());
- SteProtocol steProtocol = steThread.getSteProtocol();
- BasSte basSte = basSteService.selectById(ste.getId());
- if (Cools.isEmpty(steProtocol, basSte)) { continue; }
- if (Utils.getGroupRow(locNo, true).equals(Utils.getGroupRow(basSte.getRow(), true))
- && basSte.getBay() == Utils.getBay(locNo)
- && basSte.getLev() == Utils.getLev(locNo)) {
- return ste.getId();
- }
- }
- return null;
- }
-
- /**
- * 褰撳墠搴撲綅缁勬槸鍚﹀瓨鍦ㄥ叾浠栧皬杞�
- */
- public Integer existOtherSte(String locNo, Integer steNo) {
- Integer otherSteNo = null;
- for (SteSlave ste : slaveProperties.getSte()) {
- if (ste.getId().equals(steNo)) { continue; }
- // 鑾峰彇鍫嗗灈鏈轰俊鎭�
- SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, ste.getId());
- SteProtocol steProtocol = steThread.getSteProtocol();
- if (steProtocol == null) { continue; }
- if (steProtocol.isEnable()) {
- BasSte basSte = basSteService.selectById(ste.getId());
- if (basSte != null) {
- if ((Utils.getGroupRow(locNo, true).equals(Utils.getGroupRow(basSte.getRow(), true))
- && basSte.getBay() == Utils.getBay(locNo)
- && basSte.getLev() == Utils.getLev(locNo))
- ||
- (Utils.getGroupRow(locNo, true).equals(Utils.getGroupRow(steProtocol.getRow().intValue(), true))
- && steProtocol.getBay() == Utils.getBay(locNo)
- && steProtocol.getLev() == Utils.getLev(locNo))
- ) {
- otherSteNo = ste.getId();
- break;
- }
- }
- }
- }
- return otherSteNo;
- }
-
- /**
- * 褰撳墠搴撲綅缁勬槸鍚﹀瓨鍦ㄧ┖闂插皬杞�
- */
- public Integer hasCarOfIdle(String locNo) {
- for (SteSlave ste : slaveProperties.getSte()) {
- // 鑾峰彇鍫嗗灈鏈轰俊鎭�
- SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, ste.getId());
- SteProtocol steProtocol = steThread.getSteProtocol();
- if (steProtocol == null) { continue; }
- if (steProtocol.isIdle()) {
- if (Utils.getGroupRow(locNo, true).equals(Utils.getGroupRow(steProtocol.getRow().intValue(), true))
- && steProtocol.getBay() == Utils.getBay(locNo)
- && steProtocol.getLev() == Utils.getLev(locNo)) {
- return steProtocol.getSteNo().intValue();
- }
- }
- }
- return null;
- }
-
- /**
- * 鏌ユ壘褰撳墠搴撲綅鏈�閫傚悎鐨勭┛姊溅鏉ヤ綔涓�
- */
- public SteThread queryIdleCar(WrkMast wrkMast) {
- List<BasSte> basStes = basSteService.selectList(new EntityWrapper<>());
- int val = 0;
- SteThread result = null;
- for (BasSte basSte : basStes) {
- // 鑾峰彇绌挎杞︿俊鎭�
- SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, basSte.getSteNo());
- SteProtocol steProtocol = steThread.getSteProtocol();
- if (steProtocol == null) { continue; }
- if (!steProtocol.isIdle()) { continue; }
-// if (steProtocol.getRow() == 1) { continue; }
- String locNo = wrkMast.getWrkSts() < 10 ? wrkMast.getLocNo() : wrkMast.getSourceLocNo();
- // 濡傛灉鍦ㄥ悓涓�涓簱浣嶇粍
- if (Utils.getGroupRow(locNo, true).equals(Utils.getGroupRow(steProtocol.getRow().intValue(), true))
- && steProtocol.getBay().intValue() == Utils.getBay(locNo)
- && steProtocol.getLev().intValue() == Utils.getLev(locNo)) {
- return steThread;
- }
- LocMast locMast = locMastService.selectById(locNo);
- int lev = locMast.getLev1();
- int bay = locMast.getBay1();
- int levAbs = Math.abs(lev - steProtocol.getLev());
- int bayAbs = Math.abs(bay - steProtocol.getBay());
- if (val == 0) {
- val = levAbs + bayAbs;
- result = steThread;
- } else {
- if ((levAbs + bayAbs) < val) {
- val = levAbs + bayAbs;
- result = steThread;
- }
- }
- }
- return result;
- }
-
- public SteThread queryIdleCar(CrnProtocol crnProtocol) {
- List<BasSte> basStes = basSteService.selectList(new EntityWrapper<>());
- int val = 0;
- SteThread result = null;
- for (BasSte basSte : basStes) {
- // 鑾峰彇绌挎杞︿俊鎭�
- SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, basSte.getSteNo());
- SteProtocol steProtocol = steThread.getSteProtocol();
- if (steProtocol == null) { continue; }
- if (!steProtocol.isIdle()) { continue; }
- if (steProtocol.getRow() == 1) { continue;}
- int lev = crnProtocol.getLevel();
- int bay = crnProtocol.getBay();
- int levAbs = Math.abs(lev - steProtocol.getLev());
- int bayAbs = Math.abs(bay - steProtocol.getBay());
- if (val == 0) {
- val = levAbs + bayAbs;
- result = steThread;
- } else {
- if ((levAbs + bayAbs) < val) {
- val = levAbs + bayAbs;
- result = steThread;
- }
- }
- }
- return result;
- }
-
- /**
- * 璁╁皬杞﹁璧拌嚦寰呮満浣�
- */
- public void letCarBeWaiting(WrkMast wrkMast, Integer steNo, String locNo) {
- // 鑾峰彇绌挎杞︿俊鎭�
- SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
- SteProtocol steProtocol = steThread.getSteProtocol();
- if (steProtocol == null) { return; }
- if (steProtocol.isIdle()) {
-
- // 濡傛灉澶勪簬寰呮満浣�
- if (steProtocol.locaType.equals(SteLocaType.A_WAITING) || steProtocol.locaType.equals(SteLocaType.B_WAITING)) {
- // 淇敼宸ヤ綔妗ｇ姸鎬� 缁戝畾绌挎杞�
- wrkMast.setWrkSts(3L);
- wrkMast.setSteNo(steNo);
- wrkMast.setModiTime(new Date());
- if (wrkMastMapper.updateById(wrkMast) == 0) {
- News.error("淇敼宸ヤ綔妗ｇ姸鎬� 缁戝畾绌挎杞� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
- }
- } else {
- // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- SteCommand steCommand = new SteCommand();
- steCommand.setSteNo(steNo); // 绌挎杞︾紪鍙�
- steCommand.setTaskNo(wrkMast.getWrkNo()); // 宸ヤ綔鍙�
- steCommand.setTaskMode(SteTaskModeType.findWaiting(steProtocol.getRow().intValue())); // 浠诲姟妯″紡: 琛岃蛋鑷冲緟鏈轰綅
-
- steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue(), true).shortValue());
- steCommand.setBay(steProtocol.getBay());
- steCommand.setLev(steProtocol.getLev());
-
- if (!MessageQueue.offer(SlaveType.Ste, steNo, new Task(2, steCommand))) {
- News.error("绌挎杞﹀懡浠や笅鍙戝け璐ワ紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", steNo, JSON.toJSON(steCommand));
- } else {
- // 淇敼宸ヤ綔妗ｇ姸鎬� 缁戝畾绌挎杞�
- wrkMast.setSteNo(steNo);
- wrkMast.setModiTime(new Date());
- if (wrkMastMapper.updateById(wrkMast) == 0) {
- News.error("淇敼宸ヤ綔妗ｇ姸鎬� 缁戝畾绌挎杞� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
- }
- }
- }
- }
- }
-
- public void letCarBeWaiting(WrkCharge wrkCharge, Integer steNo) {
- // 鑾峰彇绌挎杞︿俊鎭�
- SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
- SteProtocol steProtocol = steThread.getSteProtocol();
- if (steProtocol == null) { return; }
-
- if (!basSteService.updatePakMk(steNo, "Y")) {
- News.error("淇敼绌挎杞︿綔涓氱姸鎬� 澶辫触锛侊紒锛岀┛姊溅={}", steNo);
+ public synchronized void locToLocExecute() {
+ //鑾峰彇鍑哄叆搴撳伐浣滄。
+ List<WrkMast> wrkMasts = wrkMastMapper.selectInOutWrkMast();
+ if (wrkMasts.size() > 0) {
+ //鏈夊嚭鍏ュ簱浠诲姟锛屽繀椤荤瓑寰呬换鍔℃墽琛屽畬姣曞啀鎵ц搴撲綅绉昏浆
return;
}
- // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- SteCommand steCommand = new SteCommand();
- steCommand.setSteNo(steNo); // 绌挎杞︾紪鍙�
- steCommand.setTaskNo(wrkCharge.getWrkNo()); // 宸ヤ綔鍙�
- steCommand.setTaskMode(SteTaskModeType.findOriginByLoc(steProtocol.getRow().intValue())); // 浠诲姟妯″紡: 鍘昏繎鐐� 绛夊緟鍫嗗灈鏈哄弶鍙�
+ //鏌ヨ搴撲綅绉昏浆宸ヤ綔妗�
+ List<WrkMast> wrkMasts1 = wrkMastMapper.selectLocToLocWrkMast();
+ for (WrkMast wrkMast : wrkMasts1) {
- steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue(), true).shortValue());
- steCommand.setBay(steProtocol.getBay());
- steCommand.setLev(steProtocol.getLev());
-
- if (!MessageQueue.offer(SlaveType.Ste, steNo, new Task(2, steCommand))) {
- News.error("绌挎杞﹀懡浠や笅鍙戝け璐ワ紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", steNo, JSON.toJSON(steCommand));
- } else {
- // 淇敼宸ヤ綔妗ｇ姸鎬� 缁戝畾绌挎杞�
- wrkCharge.setSteNo(steNo);
- wrkCharge.setModiTime(new Date());
- if (!wrkChargeService.updateById(wrkCharge)) {
- News.error("淇敼宸ヤ綔妗ｇ姸鎬� 缁戝畾绌挎杞� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
+ boolean step1 = this.locToLocExecuteStep1(wrkMast);//缁戝畾灏忚溅
+ if (!step1) {
+ continue;
}
+
+ boolean step2 = this.locToLocExecuteStep2(wrkMast);//璋冨害灏忚溅鍒扮洰鏍囨ゼ灞�
+ if (!step2) {
+ continue;
+ }
+
+ boolean step3 = this.locToLocExecuteStep3(wrkMast);//鍚屾ゼ灞傚簱浣嶇Щ杞�
+ if (!step3) {
+ continue;
+ }
+
}
}
/**
- * 璁╁皬杞︿粠 杩滅偣 ====>> 绉诲姩鍒拌繎鐐�
- * 绛夊緟鍫嗗灈鏈烘惉杩�
+ * 缁戝畾灏忚溅骞惰皟搴﹁溅
+ * 濡傞渶涓绘柟娉曟墽琛宑ontinue锛岃杩斿洖false
+ * ps:杩斿洖鍊紅rue骞朵笉浠ｈ〃璇ユ柟娉曟墽琛屾垚鍔燂紝杩斿洖鍊间粎鍋氭爣璁扮敤浜庝富鏂规硶鏄惁鎵цcontinue
*/
- public void letCarBeReady(WrkMast wrkMast, Integer steNo, String locNo) {
- // 鑾峰彇绌挎杞︿俊鎭�
- SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
- SteProtocol steProtocol = steThread.getSteProtocol();
- if (steProtocol == null) { return; }
- if (steProtocol.isIdle()) {
-
- // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- SteCommand steCommand = new SteCommand();
- steCommand.setSteNo(steNo); // 绌挎杞︾紪鍙�
- steCommand.setTaskNo(wrkMast.getWrkNo()); // 宸ヤ綔鍙�
- steCommand.setTaskMode(SteTaskModeType.findOriginByLoc(steProtocol)); // 浠诲姟妯″紡: 鍘昏繎鐐� 绛夊緟鍫嗗灈鏈哄弶鍙�
-
- steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue(), true).shortValue());
- steCommand.setBay(steProtocol.getBay());
- steCommand.setLev(steProtocol.getLev());
-
- if (!MessageQueue.offer(SlaveType.Ste, steNo, new Task(2, steCommand))) {
- News.error("绌挎杞﹀懡浠や笅鍙戝け璐ワ紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", steNo, JSON.toJSON(steCommand));
- } else {
- // 淇敼宸ヤ綔妗ｇ姸鎬� 缁戝畾绌挎杞�
- wrkMast.setSteNo(steNo);
- wrkMast.setModiTime(new Date());
- if (wrkMastMapper.updateById(wrkMast) == 0) {
- News.error("淇敼宸ヤ綔妗ｇ姸鎬� 缁戝畾绌挎杞� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
- }
+ private boolean locToLocExecuteStep1(WrkMast wrkMast) {
+ if (wrkMast.getShuttleNo() == null) {//缁欏簱浣嶇Щ杞粦瀹氱┛姊溅鍙�
+ //瀵绘壘鏈�杩戜笖绌洪棽鐨勫洓鍚戠┛姊溅
+ HashMap<String,Object> searchIdleShuttle = this.searchIdleShuttle(wrkMast);
+ ShuttleThread shuttleThread = (ShuttleThread) searchIdleShuttle.get("result");
+ if (shuttleThread == null) {
+ //娌℃湁鎵惧埌绌洪棽绌挎杞�
+ return false;
}
+ wrkMast.setShuttleNo(shuttleThread.getSlave().getId());//缁欏伐浣滄。鍒嗛厤鍥涘悜绌挎杞﹀彿
+ wrkMastMapper.updateById(wrkMast);
}
+ return true;
}
/**
- * 璁╁皬杞︿粠 杩滅偣 ====>> 绉诲姩鍒拌繎鐐�
- * 绛夊緟鍫嗗灈鏈烘惉杩�
+ * 璋冨害灏忚溅鍒扮洰鏍囨ゼ灞�
+ * 濡傞渶涓绘柟娉曟墽琛宑ontinue锛岃杩斿洖false
+ * ps:杩斿洖鍊紅rue骞朵笉浠ｈ〃璇ユ柟娉曟墽琛屾垚鍔燂紝杩斿洖鍊间粎鍋氭爣璁扮敤浜庝富鏂规硶鏄惁鎵цcontinue
*/
- public void letCarBeReady(WrkCharge wrkCharge, Integer steNo) {
- // 鑾峰彇绌挎杞︿俊鎭�
- SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
- SteProtocol steProtocol = steThread.getSteProtocol();
- if (steProtocol == null) { return; }
- if (steProtocol.isIdle()) {
+ private boolean locToLocExecuteStep2(WrkMast wrkMast) {
+ if (wrkMast.getWrkSts() == 1 && wrkMast.getShuttleNo() != null) {
+ ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, wrkMast.getShuttleNo());
+ ShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
+ if (!shuttleProtocol.isIdle(wrkMast.getWrkNo().shortValue())) {
+ return false;//灏忚溅澶勪簬涓嶇┖闂茬姸鎬�
+ }
- // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- SteCommand steCommand = new SteCommand();
- steCommand.setSteNo(steNo); // 绌挎杞︾紪鍙�
- steCommand.setTaskNo(wrkCharge.getWrkNo()); // 宸ヤ綔鍙�
- steCommand.setTaskMode(SteTaskModeType.findOriginByLoc(steProtocol)); // 浠诲姟妯″紡: 鍘昏繎鐐� 绛夊緟鍫嗗灈鏈哄弶鍙�
+ String currentLocNo = shuttleProtocol.getCurrentLocNo();//灏忚溅褰撳墠搴撲綅鍙�
+ int shuttleLev = Utils.getLev(currentLocNo);//灏忚溅鎵�鍦ㄦゼ灞�
- steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue(), true).shortValue());
- steCommand.setBay(steProtocol.getBay());
- steCommand.setLev(steProtocol.getLev());
+ LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, 1);
+ LiftProtocol liftProtocol = liftThread.getLiftProtocol();
- if (!MessageQueue.offer(SlaveType.Ste, steNo, new Task(2, steCommand))) {
- News.error("绌挎杞﹀懡浠や笅鍙戝け璐ワ紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", steNo, JSON.toJSON(steCommand));
- } else {
- // 淇敼宸ヤ綔妗ｇ姸鎬� 缁戝畾绌挎杞�
- wrkCharge.setSteNo(steNo);
- wrkCharge.setModiTime(new Date());
- if (!wrkChargeService.updateById(wrkCharge)) {
- News.error("淇敼宸ヤ綔妗ｇ姸鎬� 缁戝畾绌挎杞� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
+ //鍒ゆ柇灏忚溅鏄惁鍐嶇洰鏍囨ゼ灞�
+ if (shuttleLev != Utils.getLev(wrkMast.getLocNo())) {
+ //灏忚溅鍜岀洰鏍囦笉鍦ㄥ悓涓�妤煎眰
+
+ //鎻愬崌鏈哄彛绔欑偣搴撲綅鍙�
+ String liftSiteLocNo = Utils.levToOutInStaLocNo(shuttleLev);
+
+ //鍒涘缓鍒嗛厤鍛戒护
+ ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
+ assignCommand.setShuttleNo(shuttleProtocol.getShuttleNo());//鍥涘悜绌挎杞﹀彿
+ assignCommand.setTaskNo(wrkMast.getWrkNo().shortValue());//浠诲姟鍙�
+ assignCommand.setTaskMode(ShuttleTaskModeType.PAK_IN.id.shortValue());//鍏ュ嚭搴撴ā寮�
+ assignCommand.setSourceLocNo(currentLocNo);//婧愬簱浣�(灏忚溅褰撳墠浣嶇疆)
+
+ //灏忚溅绉诲姩鍒版彁鍗囨満鍙ｏ紝璁＄畻璺緞
+ List<ShuttleCommand> commands = this.shuttleAssignCommand(shuttleProtocol.getLocNo(), liftSiteLocNo, NavigationMapType.NONE.id, assignCommand, shuttleThread);
+ if (commands == null) {
+ return false;//鏈壘鍒拌矾寰�
+ }
+
+ //鑾峰彇褰撳墠灏忚溅鎵�鍦ㄦゼ灞傜殑绔欑偣淇℃伅
+ BasDevp basDevp = basDevpService.queryByLocNo(liftSiteLocNo);
+ Short endStartCode = Short.parseShort(basDevp.getQrCodeValue());//绔欑偣浜岀淮鐮�
+
+ //澧炲姞绉诲姩杩涙彁鍗囨満鍛戒护
+ ShuttleCommand moveCommand = shuttleThread.getMoveCommand(endStartCode, liftProtocol.getBarcode(), 1600, ShuttleRunDirection.TOP.id, null, null, 500);
+ commands.add(moveCommand);
+
+ //鍒嗛厤鐩爣搴撲綅
+ shuttleProtocol.setLocNo(liftSiteLocNo);
+ //鐩爣搴撲綅
+ assignCommand.setLocNo(liftSiteLocNo);
+ assignCommand.setCommands(commands);
+ wrkMast.setWrkSts(5L);//灏忚溅杩佺Щ鐘舵��
+
+ if (wrkMastMapper.updateById(wrkMast) > 0) {
+ //涓嬪彂浠诲姟
+ MessageQueue.offer(SlaveType.Shuttle, assignCommand.getShuttleNo().intValue(), new Task(3, assignCommand));
}
}
}
+ return true;
+ }
+
+ /**
+ * 鍚屾ゼ灞傚簱浣嶇Щ杞�
+ * 濡傞渶涓绘柟娉曟墽琛宑ontinue锛岃杩斿洖false
+ * ps:杩斿洖鍊紅rue骞朵笉浠ｈ〃璇ユ柟娉曟墽琛屾垚鍔燂紝杩斿洖鍊间粎鍋氭爣璁扮敤浜庝富鏂规硶鏄惁鎵цcontinue
+ */
+ private boolean locToLocExecuteStep3(WrkMast wrkMast) {
+ if (wrkMast.getShuttleNo() == null) {
+ return false;
+ }
+
+ ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, wrkMast.getShuttleNo());
+ ShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
+ if (!shuttleProtocol.isIdle(wrkMast.getWrkNo().shortValue())) {
+ return false;//灏忚溅澶勪簬涓嶇┖闂茬姸鎬�
+ }
+
+ LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, 1);
+ LiftProtocol liftProtocol = liftThread.getLiftProtocol();
+
+ DevpThread devpThread = null;
+ for (DevpSlave devp : slaveProperties.getDevp()){
+ // 鑾峰彇鍏ュ簱绔欎俊鎭�
+ devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ }
+
+ //鍒ゆ柇灏忚溅鏄惁鍦ㄥ伐浣滄。浠诲姟鐩爣妤煎眰
+ String currentLocNo = shuttleProtocol.getCurrentLocNo();//灏忚溅褰撳墠搴撲綅鍙�
+ int shuttleLev = Utils.getLev(currentLocNo);//灏忚溅鎵�鍦ㄦゼ灞�
+ if (shuttleLev != Utils.getLev(wrkMast.getLocNo())) {
+ return false;//涓嶅湪鍚屼竴妤煎眰
+ }
+
+ if (wrkMast.getWrkSts() == 1 || wrkMast.getWrkSts() == 8) {
+ //璋冨害灏忚溅鎵ц鍚屾ゼ灞傜Щ搴撲换鍔�
+
+ //鍒涘缓鍒嗛厤鍛戒护
+ ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
+ assignCommand.setShuttleNo(shuttleProtocol.getShuttleNo());//鍥涘悜绌挎杞﹀彿
+ assignCommand.setTaskNo(wrkMast.getWrkNo().shortValue());//浠诲姟鍙�
+ assignCommand.setTaskMode(ShuttleTaskModeType.PAK_IN.id.shortValue());//鍏ュ嚭搴撴ā寮�
+ assignCommand.setSourceLocNo(currentLocNo);//婧愬簱浣�(灏忚溅褰撳墠浣嶇疆)
+
+ List<ShuttleCommand> commands = new ArrayList<>();
+
+ if (wrkMast.getWrkSts() == 8) {//8.鎻愬崌鏈鸿縼绉诲皬杞﹀畬鎴愶紝闇�瑕佸皢灏忚溅绉诲嚭鎻愬崌鏈�
+ //鍒ゆ柇鎻愬崌鏈烘槸鍚︾┖闂�
+ if (!liftProtocol.isIdleNoTask()) {
+ return false;//鎻愬崌鏈哄繖
+ }
+ //鍒ゆ柇鎻愬崌鏈轰换鍔″彿鍜屽綋鍓嶅伐浣滄。浠诲姟鍙锋槸鍚︿竴鑷�
+ if (liftProtocol.getTaskNo().intValue() != 0 && liftProtocol.getTaskNo().intValue() != wrkMast.getWrkNo()) {
+ return false;
+ }
+
+ //鍒ゆ柇鎻愬崌鏈烘ゼ灞傛槸鍚﹀埌浣嶏紝鍒ゆ柇绔欑偣鏄惁缁欏嚭鎻愬崌鏈哄埌浣嶄俊鍙�
+ String locNo = wrkMast.getLocNo();
+ int lev = Utils.getLev(locNo);//鐩爣浜岀淮鐮佹墍鍦ㄦゼ灞�
+ int liftLev = liftProtocol.getLev().intValue();//鎻愬崌鏈烘墍鍦ㄦゼ灞�
+ if (liftLev != lev) {
+ return false;//鎻愬崌鏈轰笉鍦ㄧ洰鏍囨ゼ灞傝烦杩�
+ }
+
+ Integer staNo = Utils.levToOutInStaNo(lev >= 2 ? lev + 1 : lev);
+ //鑾峰彇鐩爣绔欎俊鎭�
+ StaProtocol staProtocol1 = devpThread.getStation().get(staNo);
+ if (staProtocol1 == null) {
+ return false;//绔欑偣淇℃伅涓嶅瓨鍦�
+ }
+ if (!staProtocol1.isLiftArrival()) {
+ return false;//绔欑偣鎻愬崌鏈哄埌浣嶄俊鍙穎alse
+ }
+
+ BasDevp basDevp = basDevpService.selectById(staNo);
+ short startCode = liftProtocol.getBarcode();//鎻愬崌鏈哄唴閮ㄤ簩缁寸爜
+ Short distCode = Short.parseShort(basDevp.getQrCodeValue());//鎻愬崌鏈哄彛绔欑偣浜岀淮鐮�
+ Short runDirection = ShuttleRunDirection.BOTTOM.id;//杩愯鏂瑰悜
+ //鑾峰彇鍛戒护
+ ShuttleCommand moveCommand = shuttleThread.getMoveCommand(startCode, distCode, 1600, runDirection, null, null, 500);
+ commands.add(0, moveCommand);//灏嗚鎸囦护娣诲姞鍒伴槦澶�
+
+ currentLocNo = basDevp.getLocNo();//浣跨敤杈撻�佺珯鐐瑰彛浣滀负璧风偣鍧愭爣
+ }
+
+ //鐩存帴璁＄畻杞﹀埌婧愬簱浣嶅埌鐩爣搴撲綅璺緞
+ List<ShuttleCommand> commands1 = this.shuttleAssignCommand(currentLocNo, wrkMast.getSourceLocNo(), wrkMast.getLocNo(), assignCommand, shuttleThread);
+ if (commands1 == null) {
+ return false;//鎵句笉鍒拌矾寰勭瓑寰呬笅涓�娆�
+ }
+ commands.addAll(commands1);
+
+ //鍒嗛厤浠诲姟鍙�
+ shuttleProtocol.setTaskNo(wrkMast.getWrkNo().shortValue());
+ //鍒嗛厤婧愬簱浣�
+ shuttleProtocol.setSourceLocNo(wrkMast.getSourceLocNo());
+
+ assignCommand.setCommands(commands);
+ //鍒嗛厤鐩爣搴撲綅
+ shuttleProtocol.setLocNo(wrkMast.getLocNo());
+ //鐩爣搴撲綅
+ assignCommand.setLocNo(wrkMast.getLocNo());
+ wrkMast.setWrkSts(9L);//灏忚溅鍏ュ簱涓�
+ if (wrkMastMapper.updateById(wrkMast) > 0) {
+ //涓嬪彂浠诲姟
+ MessageQueue.offer(SlaveType.Shuttle, assignCommand.getShuttleNo().intValue(), new Task(3, assignCommand));
+ }
+ }
+
+ return true;
}
/**
@@ -2470,7 +2641,7 @@
continue;
}
- WrkCharge wrkCharge = wrkChargeService.selectWorking(shuttleProtocol.getShuttleNo().intValue(), WrkChargeType.charge);
+ WrkCharge wrkCharge = wrkChargeService.selectWorking(shuttleProtocol.getShuttleNo().intValue());
if (wrkCharge != null) {//宸叉湁鍏呯數浠诲姟
continue;
}
@@ -2512,7 +2683,7 @@
*/
public synchronized void executeShuttleCharge() {
for (ShuttleSlave shuttle : slaveProperties.getShuttle()) {
- WrkCharge wrkCharge = wrkChargeService.selectWorking(null, WrkChargeType.charge);
+ WrkCharge wrkCharge = wrkChargeService.selectWorking(shuttle.getId());
if (wrkCharge == null) {
continue;
}
@@ -2564,7 +2735,7 @@
shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.CHARGING);
assignCommand.setShuttleNo(shuttleProtocol.getShuttleNo());
- assignCommand.setTaskMode((short) 9);//鍏呯數
+ assignCommand.setTaskMode(ShuttleTaskModeType.CHARGE.id.shortValue());//鍏呯數
assignCommand.setTaskNo(wrkCharge.getWrkNo().shortValue());
assignCommand.setCharge(true);//鍏呯數浠诲姟
@@ -2602,13 +2773,13 @@
Short basDevpQrCode = Short.parseShort(basDevp.getQrCodeValue());//绔欑偣浜岀淮鐮�
//澧炲姞绉诲姩杩涙彁鍗囨満鍛戒护
- ShuttleCommand moveCommand = shuttleThread.getMoveCommand(basDevpQrCode, liftProtocol.getBarcode(), 1400, ShuttleRunDirection.TOP.id, basDevpQrCode, 1400, 500);
+ ShuttleCommand moveCommand = shuttleThread.getMoveCommand(basDevpQrCode, liftProtocol.getBarcode(), 1600, ShuttleRunDirection.TOP.id, basDevpQrCode, 1600, 500);
commands.add(moveCommand);
//鍒嗛厤鐩爣搴撲綅
shuttleProtocol.setLocNo(chargeLocNo);
assignCommand.setShuttleNo(shuttleProtocol.getShuttleNo());
- assignCommand.setTaskMode((short) 9);//鍏呯數
+ assignCommand.setTaskMode(ShuttleTaskModeType.CHARGE.id.shortValue());//鍏呯數
assignCommand.setTaskNo(wrkCharge.getWrkNo().shortValue());
assignCommand.setCharge(true);//鍏呯數浠诲姟
//鐩爣搴撲綅
@@ -2627,7 +2798,7 @@
//灏忚溅宸茬粡杈惧埌鎻愬崌鏈哄唴
//鍒ゆ柇鎻愬崌鏈烘槸鍚﹀浜庣┖闂茬姸鎬�
- if (!liftProtocol.isIdle()) {
+ if (!liftProtocol.isIdle(wrkCharge.getWrkNo().shortValue())) {
continue;
}
@@ -2692,14 +2863,14 @@
Short distCode = Short.parseShort(basDevp.getQrCodeValue());//鎻愬崌鏈哄彛绔欑偣浜岀淮鐮�
Short runDirection = ShuttleRunDirection.BOTTOM.id;//杩愯鏂瑰悜
//鑾峰彇鍛戒护
- ShuttleCommand moveCommand = shuttleThread.getMoveCommand(startCode, distCode, 1400, runDirection, startCode, 1400, 500);
+ ShuttleCommand moveCommand = shuttleThread.getMoveCommand(startCode, distCode, 1600, runDirection, startCode, 1600, 500);
commands.add(0, moveCommand);//灏嗚鎸囦护娣诲姞鍒伴槦澶�
//杩涜鍏呯數涓�
shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.CHARGING);
assignCommand.setShuttleNo(shuttleProtocol.getShuttleNo());
- assignCommand.setTaskMode((short) 9);//鍏呯數
+ assignCommand.setTaskMode(ShuttleTaskModeType.CHARGE.id.shortValue());//鍏呯數
assignCommand.setTaskNo(wrkCharge.getWrkNo().shortValue());
assignCommand.setCharge(true);//鍏呯數浠诲姟
@@ -2718,25 +2889,38 @@
}else if (wrkCharge.getWrkSts() == 57) {//57.灏忚溅鍒拌揪鍏呯數妗�
//鍏呯數涓�
//鍒ゆ柇灏忚溅鏄惁鍏呮弧鐢甸噺锛屾弧鐢�1000鎴栫數鍘�54V浠ヤ笂
+ if (shuttleProtocol.getBatteryPower() == null || shuttleProtocol.getCurrentVoltage() == null) {
+ continue;
+ }
if (shuttleProtocol.getBatteryPower() >= 1000 && shuttleProtocol.getCurrentVoltage() >= 54000) {
//鍏呮弧锛屾柇寮�鍏呯數
- List<ShuttleCommand> commands = new ArrayList<>();
- ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
- assignCommand.setShuttleNo(shuttleProtocol.getShuttleNo());
- assignCommand.setTaskMode((short) 0);
- assignCommand.setTaskNo(wrkCharge.getWrkNo().shortValue());
- assignCommand.setCharge(true);
+// List<ShuttleCommand> commands = new ArrayList<>();
+// ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
+// assignCommand.setShuttleNo(shuttleProtocol.getShuttleNo());
+// assignCommand.setTaskMode((short) 0);
+// assignCommand.setTaskNo(wrkCharge.getWrkNo().shortValue());
+// assignCommand.setCharge(true);
+//
+// //鍒涘缓鍏呯數鎸囦护
+// ShuttleCommand command = shuttleThread.getChargeSwitchCommand((short) 2);//鏂紑鍏呯數
+// commands.add(command);
+//
+// //鎸囦护闆嗗垎閰�
+// assignCommand.setCommands(commands);
+//
+// shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.CHARGING_WAITING);
- //鍒涘缓鍏呯數鎸囦护
- ShuttleCommand command = shuttleThread.getChargeSwitchCommand((short) 2);//鏂紑鍏呯數
- commands.add(command);
+ //灏嗗皬杞︾Щ鍔ㄥ埌绌洪棽鐨勫贩閬�
+ ShuttleAssignCommand assignCommand = Utils.searchEmptyGroupToMoveShuttle(Utils.getLev(shuttleProtocol.getLocNo()), shuttleProtocol.getShuttleNo().intValue(), shuttleThread, null);
+ if (assignCommand == null) {
+ continue;
+ }
- //鎸囦护闆嗗垎閰�
- assignCommand.setCommands(commands);
-
- shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.CHARGING_WAITING);
- //涓嬪彂浠诲姟
- MessageQueue.offer(SlaveType.Shuttle, assignCommand.getShuttleNo().intValue(), new Task(3, assignCommand));
+ wrkCharge.setWrkSts(60L);//60.鍏呯數浠诲姟瀹屾垚
+ if (wrkChargeMapper.updateById(wrkCharge) > 0) {
+ //涓嬪彂浠诲姟
+ MessageQueue.offer(SlaveType.Shuttle, assignCommand.getShuttleNo().intValue(), new Task(3, assignCommand));
+ }
}
if (shuttleProtocol.getProtocolStatus() == ShuttleProtocolStatusType.CHARGING_WAITING.id) {
@@ -2747,399 +2931,7 @@
}
- /**
- * 杞鍏呯數妗╂槸鍚︽湁绌洪棽灏忚溅
- */
- @Deprecated
- public synchronized void queryChargeLocOfComplete() {
- // 涓庡厖鐢典换鍔′笉鍚屾杩涜
- if (null != wrkChargeService.selectWorking(null, WrkChargeType.charge)) { return; }
- if (null != wrkChargeService.selectWorking(null, WrkChargeType.reset)) { return; }
- SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
- // 妫�绱㈠厖鐢垫々
- for (SteChargeType value : SteChargeType.values()) {
- Integer steNo = basSteService.hasCarOfLocNo(value.locNo);
- if (steNo != null) {
- SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
- SteProtocol steProtocol = steThread.getSteProtocol();
- BasSte basSte = basSteService.selectById(steNo);
- if (Cools.isEmpty(steProtocol, basSte)) {
- continue;
- }
- if (steProtocol.getCharge() < 99) {
- continue;
- }
- if (steProtocol.getMode() == 0) {
- continue;
- }
- if (!steProtocol.getStatusType().equals(SteStatusType.IDLE)) {
- continue;
- }
-// // 1鍙峰厖鐢垫々
-// if (value.equals(SteChargeType.FIRST) && devpThread.charge0) {
-// continue;
-// }
-// // 2鍙峰厖鐢垫々
-// if (value.equals(SteChargeType.SECOND) && devpThread.charge1) {
-// continue;
-// }
-// // 3鍙峰厖鐢垫々
-// if (value.equals(SteChargeType.THIRD) && devpThread.charge2) {
-// continue;
-// }
-// // 灏忚溅鏄惁澶勪簬鍏呯數鐘舵��
-// if (steProtocol.getChargeStatus() == 1) {
-// continue;
-// }
- // case 1 : 鑷姩鍏呯數寮� 棣堢數 脳
- // case 2 : 鑷姩鍏呯數寮� 婊＄數 鉁�
- // case 3 : 鑷姩鍏呯數鍏� 棣堢數 鉁�
- // case 4 : 鑷姩鍏呯數鍏� 婊＄數 鉁�
- if (basSte.getAutoCharge().equals("Y")
- && steProtocol.getCharge() < Float.parseFloat(basSte.getChargeLine())) {
- continue;
- }
- WrkCharge wrkCharge = wrkChargeService.selectWorking(steNo, WrkChargeType.reset);
-
- if (wrkCharge == null) {
- // 寮�濮嬬┛姊溅澶嶄綅浠诲姟
- wrkCharge = new WrkCharge();
- wrkCharge.setSteNo(steNo);
- wrkCharge.setWrkNo(commonService.getChargeWorkNo(6));
- wrkCharge.setWrkSts(41L); // 41.灏忚溅鍑嗗澶嶄綅
- wrkCharge.setCrnNo(2); // 鍥哄畾2鍙峰爢鍨涙満
- wrkCharge.setIoPri((double) 10);
- wrkCharge.setSourceLocNo(value.locNo);
- wrkCharge.setLocNo(basSte.getIdleLoc());
- wrkCharge.setMemo("reset");
- wrkCharge.setAppeTime(new Date());
- if (!wrkChargeService.insert(wrkCharge)) {
- News.error("淇濆瓨{}鍙风┛姊溅澶嶄綅浠诲姟澶辫触!!!", steNo);
- } else {
- break;
- }
- }
- }
- }
- }
-
- /**
- * 灏忚溅浠庡厖鐢垫々 鑷� 寰呮満搴撲綅
- */
- @Deprecated
- public synchronized void steFromChargeToIdleLoc() {
- WrkCharge wrkCharge = wrkChargeService.selectWorking(null, WrkChargeType.reset);
- if (wrkCharge == null) { return; }
- SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, wrkCharge.getSteNo());
- SteProtocol steProtocol = steThread.getSteProtocol();
- BasSte basSte = basSteService.selectById(wrkCharge.getSteNo());
- if (Cools.isEmpty(steProtocol, basSte)) {
- return;
- }
- // 鎼繍鑷冲浐瀹氶�氶亾
- if (wrkCharge.getWrkSts() == 41L) {
- // 鎼皬杞﹁嚦灏忚溅璧板悜閫氶亾
- List<String> channel = slaveProperties.getChannel();
- for (String channelLocNo : channel) {
- Integer otherSte = existOtherSte(channelLocNo, wrkCharge.getSteNo());
- if (null != otherSte) {
- News.warn("{}鍙峰皬杞︾Щ鍏}搴撲綅缁勫け璐ワ紝鍘熷洜锛氬瓨鍦▄}鍙风┛姊溅锛�", wrkCharge.getSteNo(), channelLocNo, otherSte);
- } else {
- // 鍥哄畾鍫嗗灈鏈�
- int crnNo = 1;
- if (null != wrkMastMapper.selectWorkingByCrn(crnNo)) {
- return;
- }
-
- LocMast channelLoc = locMastService.selectById(channelLocNo);
-
- CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crnNo);
- CrnProtocol crnProtocol = crnThread.getCrnProtocol();
- if (crnProtocol == null) { continue; }
- // 鍙湁褰撳爢鍨涙満绌洪棽 骞朵笖 鏃犱换鍔℃椂鎵嶇户缁墽琛�
- if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO) {
- // 鍫嗗灈鏈哄懡浠や笅鍙戝尯 --------------------------------------------------------------------------
- CrnCommand crnCommand = new CrnCommand();
- crnCommand.setCrnNo(crnNo); // 鍫嗗灈鏈虹紪鍙�
- crnCommand.setTaskNo(wrkCharge.getWrkNo().shortValue()); // 宸ヤ綔鍙�
- crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
- crnCommand.setTaskMode(CrnTaskModeType.STE_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
- crnCommand.setSourcePosX(steProtocol.getRow()); // 婧愬簱浣嶆帓
- crnCommand.setSourcePosY(steProtocol.getBay()); // 婧愬簱浣嶅垪
- crnCommand.setSourcePosZ(steProtocol.getLev()); // 婧愬簱浣嶅眰
- crnCommand.setDestinationPosX(Utils.getGroupRow(channelLoc.getLocNo(), false).shortValue()); // 鐩爣搴撲綅鎺�
- crnCommand.setDestinationPosY(channelLoc.getBay1().shortValue()); // 鐩爣搴撲綅鍒�
- crnCommand.setDestinationPosZ(channelLoc.getLev1().shortValue()); // 鐩爣搴撲綅灞�
- if (!MessageQueue.offer(SlaveType.Crn, crnNo, new Task(2, crnCommand))) {
- News.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkCharge.getCrnNo(), JSON.toJSON(crnCommand));
- } else {
- // 淇敼绌挎杞﹁繍琛屼腑鎺掑垪灞�
- steThread.modifyPos(Utils.getGroupRow(channelLoc.getLocNo(), false), channelLoc.getBay1(), channelLoc.getLev1());
- // 淇敼宸ヤ綔妗ｇ姸鎬� 41.灏忚溅鍑嗗澶嶄綅 => 42.鍚婅溅鎼繍
- Date now = new Date();
- wrkCharge.setWrkSts(42L);
- wrkCharge.setCrnStrTime(now);
- wrkCharge.setModiTime(now);
- if (!wrkChargeService.updateById(wrkCharge)) {
- News.error("淇敼澶嶄綅浠诲姟鐘舵�� 41.灏忚溅鍑嗗澶嶄綅 => 42.鍚婅溅鎼繍 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
- }
- }
- break;
- }
-
- }
- }
- } else if (wrkCharge.getWrkSts() == 43L) {
- // 灏忚溅琛岄┒閫氶亾
- if (steProtocol.statusType.equals(SteStatusType.IDLE) && steProtocol.getPakMk().equals("N")) {
- // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- SteCommand steCommand = new SteCommand();
- steCommand.setSteNo(wrkCharge.getSteNo()); // 绌挎杞︾紪鍙�
- steCommand.setTaskNo(wrkCharge.getWrkNo()); // 宸ヤ綔鍙�
- steCommand.setTaskMode(SteTaskModeType.BACK_ORIGIN); // 鍘诲乏绔�
-
- steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue(), true).shortValue());
- steCommand.setBay(steProtocol.getBay());
- steCommand.setLev(steProtocol.getLev());
- if (!MessageQueue.offer(SlaveType.Ste, wrkCharge.getSteNo(), new Task(2, steCommand))) {
- News.error("绌挎杞﹀懡浠や笅鍙戝け璐ワ紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", wrkCharge.getSteNo(), JSON.toJSON(steCommand));
- } else {
- // 淇敼宸ヤ綔妗ｇ姸鎬� 43.灏忚溅鍒拌揪 ===> 44.灏忚溅璧拌
- wrkCharge.setWrkSts(44L);
- Date now = new Date();
- wrkCharge.setCrnEndTime(now);
- wrkCharge.setModiTime(now);
- if (!wrkChargeService.updateById(wrkCharge)) {
- News.error("淇敼澶嶄綅浠诲姟鐘舵�� 43.灏忚溅鍒拌揪 ===> 44.灏忚溅璧拌 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
- }
- }
- }
- } else if (wrkCharge.getWrkSts() == 45L) {
- if (null != wrkMastMapper.selectWorkingByCrn(wrkCharge.getCrnNo())) {
- return;
- }
-
- LocMast idleLoc = locMastService.selectById(basSte.getIdleLoc());
-
- Integer otherSte = existOtherSte(idleLoc.getLocNo(), wrkCharge.getSteNo());
- if (null != otherSte) {
- News.warn("{}鍙峰皬杞︾Щ鍏}搴撲綅缁勫け璐ワ紝鍘熷洜锛氬瓨鍦▄}鍙风┛姊溅锛�", wrkCharge.getSteNo(), idleLoc.getLocNo(), otherSte);
- } else {
- CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, wrkCharge.getCrnNo());
- CrnProtocol crnProtocol = crnThread.getCrnProtocol();
- if (crnProtocol == null) { return; }
- // 鍙湁褰撳爢鍨涙満绌洪棽 骞朵笖 鏃犱换鍔℃椂鎵嶇户缁墽琛�
- if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO) {
- // 鍫嗗灈鏈哄懡浠や笅鍙戝尯 --------------------------------------------------------------------------
- CrnCommand crnCommand = new CrnCommand();
- crnCommand.setCrnNo(wrkCharge.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
- crnCommand.setTaskNo(wrkCharge.getWrkNo().shortValue()); // 宸ヤ綔鍙�
- crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
- crnCommand.setTaskMode(CrnTaskModeType.STE_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
- crnCommand.setSourcePosX(Utils.getGroupRow(steProtocol.getRow().intValue(), true).shortValue()); // 婧愬簱浣嶆帓
- crnCommand.setSourcePosY(steProtocol.getBay()); // 婧愬簱浣嶅垪
- crnCommand.setSourcePosZ(steProtocol.getLev()); // 婧愬簱浣嶅眰
- crnCommand.setDestinationPosX(Utils.getGroupRow(idleLoc.getLocNo(), true).shortValue()); // 鐩爣搴撲綅鎺�
- crnCommand.setDestinationPosY(idleLoc.getBay1().shortValue()); // 鐩爣搴撲綅鍒�
- crnCommand.setDestinationPosZ(idleLoc.getLev1().shortValue()); // 鐩爣搴撲綅灞�
- if (!MessageQueue.offer(SlaveType.Crn, wrkCharge.getCrnNo(), new Task(2, crnCommand))) {
- News.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkCharge.getCrnNo(), JSON.toJSON(crnCommand));
- } else {
- // 淇敼绌挎杞﹁繍琛屼腑鎺掑垪灞�
- steThread.modifyPos(Utils.getGroupRow(idleLoc.getLocNo(), true), idleLoc.getBay1(), idleLoc.getLev1());
- // 淇敼宸ヤ綔妗ｇ姸鎬� 45.灏忚溅寰呮惉 => 46.鏀捐嚦寰呮満浣�
- Date now = new Date();
- wrkCharge.setWrkSts(46L);
- wrkCharge.setCrnStrTime(now);
- wrkCharge.setModiTime(now);
- if (!wrkChargeService.updateById(wrkCharge)) {
- News.error("淇敼宸ヤ綔妗ｇ姸鎬� 45.灏忚溅寰呮惉 => 46.鏀捐嚦寰呮満浣� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkCharge.getWrkNo());
- }
- }
- }
-
- }
- }
- }
-
- public List<String> crn2DemoLocs = new ArrayList<String>(); public String crn2LastLoc = "";
- public synchronized void demo() {
- if (Cools.isEmpty(crn2DemoLocs)) {
- crn2DemoLocs = locMastService.getDemoNextLoc(2);
- }
- for (CrnSlave crn : slaveProperties.getCrn()) {
- if (!crn.getDemo()) {
- continue;
- }
- // 蹇呴』涓烘紨绀虹姸鎬�
- CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
- CrnProtocol crnProtocol = crnThread.getCrnProtocol();
- if (crnProtocol == null) {
- continue;
- }
-
- // 鍙湁褰撳爢鍨涙満绌洪棽 骞朵笖 鏃犱换鍔℃椂鎵嶇户缁墽琛�
- if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO) {
-
- // filter
- if (wrkChargeService.selectCount(new EntityWrapper<WrkCharge>()
- .eq("crn_no", crn.getId()).between("wrk_sts", 31, 36)) > 0) {
- continue;
- }
-
- SteThread steThread = queryIdleCar(crnProtocol);
- if (Cools.isEmpty(steThread)) {
- News.warn("娌℃湁绌洪棽鐨勫皬杞﹁繘琛屾紨绀哄姛鑳�");
- continue;
- }
- int steNo = steThread.getSlave().getId();
- SteProtocol steProtocol = steThread.getSteProtocol();
- BasSte basSte = basSteService.selectById(steNo);
- if (Cools.isEmpty(steProtocol, basSte)) { continue; }
-
- // 鍙湁褰撶┛姊溅绌洪棽 骞朵笖 鏃犱换鍔℃椂鎵嶇户缁墽琛�
- if (steProtocol.isIdle()) {
-
- String locNo = null;
- Iterator<String> iterator = crn2DemoLocs.iterator();
- while (iterator.hasNext()) {
- String next = iterator.next();
- if (!Cools.isEmpty(this.hasCar(next))) { continue; }
- String lastLoc = crn2LastLoc;
- if (!Cools.isEmpty(lastLoc)) {
- if (!lastLoc.substring(2, 7).equals(next.substring(2, 7))
- || !Utils.getGroupRow(lastLoc, true).equals(Utils.getGroupRow(next, true))) {
- locNo = next;
- iterator.remove();
- break;
- } else {
- iterator.remove();
- }
- } else {
- locNo = next;
- iterator.remove();
- break;
- }
-
- }
- if (!Cools.isEmpty(locNo)) {
- crn2LastLoc = locNo;
- }
-
- News.info("{}鍙峰爢鍨涙満瀵箋}搴撲綅杩涜婕旂ず", crn.getId(), locNo);
-
- String sourceLocNo = Utils.getLocNo(steProtocol.getRow(), steProtocol.getBay(), steProtocol.getLev());
-
- WrkCharge wrkCharge = new WrkCharge();
- wrkCharge.setCrnNo(crn.getId());
- wrkCharge.setSteNo(steNo);
- wrkCharge.setWrkNo(commonService.getChargeWorkNo(5));
- wrkCharge.setWrkSts(31L); // 31.鐢熸垚婕旂ずID
- wrkCharge.setIoPri((double) 10);
- wrkCharge.setSourceLocNo(sourceLocNo);
- wrkCharge.setLocNo(locNo);
- wrkCharge.setMemo("demo");
- if (!wrkChargeService.insert(wrkCharge)) {
- News.error("鐢熸垚婕旂ず浠诲姟澶辫触锛屽爢鍨涙満鍙凤細{}锛屽皬杞︼細{}锛屾簮搴撲綅锛歿}锛岀洰鏍囧簱浣嶏細{}", crn.getId(), steNo, sourceLocNo, locNo);
- }
- }
- }
- }
- }
-
- /**
- * 婕旂ず鍙栬揣
- */
- private void steMoveDemo(CrnSlave slave, CrnProtocol crnProtocol) {
- // 鑾峰彇宸ヤ綔妗ｄ俊鎭�
- WrkCharge wrkCharge = wrkChargeService.selectOne(new EntityWrapper<WrkCharge>().eq("crn_no", slave.getId())
- .in("wrk_sts", 31, 33, 35));
- if (null == wrkCharge) {
- return;
- }
- SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, wrkCharge.getSteNo());
- SteProtocol steProtocol = steThread.getSteProtocol();
- if (null == steProtocol) { return; }
- if (steProtocol.isIdle()) {
- // 31.鐢熸垚婕旂ずID
- if (wrkCharge.getWrkSts() == 31L) {
- this.letCarBeReady(wrkCharge, steProtocol.getSteNo().intValue());
- wrkCharge.setWrkSts(32L);
- wrkCharge.setModiTime(new Date());
- if (!wrkChargeService.updateById(wrkCharge)) {
- News.error("淇敼婕旂ず浠诲姟{}宸ヤ綔妗� 31.鐢熸垚婕旂ずID ==>> 32.灏忚溅璧拌 澶辫触!", wrkCharge.getWrkNo());
- }
- // 33.灏忚溅寰呮惉
- } else if (wrkCharge.getWrkSts() == 33L) {
- LocMast locMast = locMastService.selectById(wrkCharge.getLocNo());
- // 鍫嗗灈鏈哄懡浠や笅鍙戝尯 --------------------------------------------------------------------------
- CrnCommand crnCommand = new CrnCommand();
- crnCommand.setCrnNo(crnProtocol.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
- crnCommand.setTaskNo(wrkCharge.getWrkNo().shortValue()); // 宸ヤ綔鍙�
- crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
- crnCommand.setTaskMode(CrnTaskModeType.STE_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
- crnCommand.setSourcePosX(Utils.getGroupRow(steProtocol.getRow().intValue(), true).shortValue()); // 婧愬簱浣嶆帓
- crnCommand.setSourcePosY(steProtocol.getBay()); // 婧愬簱浣嶅垪
- crnCommand.setSourcePosZ(steProtocol.getLev()); // 婧愬簱浣嶅眰
- crnCommand.setDestinationPosX(Utils.getGroupRow(locMast.getLocNo(), true).shortValue()); // 鐩爣搴撲綅鎺�
- crnCommand.setDestinationPosY(locMast.getBay1().shortValue()); // 鐩爣搴撲綅鍒�
- crnCommand.setDestinationPosZ(locMast.getLev1().shortValue()); // 鐩爣搴撲綅灞�
- if (!MessageQueue.offer(SlaveType.Crn, wrkCharge.getCrnNo(), new Task(2, crnCommand))) {
- News.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkCharge.getCrnNo(), JSON.toJSON(crnCommand));
- } else {
- // 淇敼绌挎杞﹁繍琛屼腑鎺掑垪灞�
- steThread.modifyPos(Utils.getGroupRow(locMast.getLocNo(), true), locMast.getBay1(), locMast.getLev1());
- // 淇敼宸ヤ綔妗ｇ姸鎬� 33.灏忚溅寰呮惉 => 34.鍚婅溅鎼繍
- Date now = new Date();
- wrkCharge.setWrkSts(34L);
- wrkCharge.setCrnStrTime(now);
- wrkCharge.setModiTime(now);
- if (!wrkChargeService.updateById(wrkCharge)) {
- News.error("淇敼婕旂ず浠诲姟{}宸ヤ綔妗� 33.灏忚溅寰呮惉 => 34.鍚婅溅鎼繍 澶辫触!", wrkCharge.getWrkNo());
- }
- }
- // 35.灏忚溅灏辩华
- } else if (wrkCharge.getWrkSts() == 35L) {
-
- int steNo = steProtocol.getSteNo().intValue();
- if (!basSteService.updatePakMk(steNo, "Y")) {
- News.error("淇敼绌挎杞︿綔涓氱姸鎬� 澶辫触锛侊紒锛岀┛姊溅={}", steNo);
- return;
- }
-
- // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- SteCommand steCommand = new SteCommand();
- steCommand.setSteNo(steNo); // 绌挎杞︾紪鍙�
- steCommand.setTaskNo(wrkCharge.getWrkNo()); // 宸ヤ綔鍙�
- SteTaskModeType originByLoc = SteTaskModeType.findOriginByLoc(steProtocol.getRow().intValue());
- if (originByLoc.equals(SteTaskModeType.GO_ORIGIN)) {
- originByLoc = SteTaskModeType.BACK_ORIGIN;
- } else if (originByLoc.equals(SteTaskModeType.BACK_ORIGIN)) {
- originByLoc = SteTaskModeType.GO_ORIGIN;
- } else {
- return;
- }
- steCommand.setTaskMode(originByLoc);
-
- steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue(), false).shortValue());
- steCommand.setBay(steProtocol.getBay());
- steCommand.setLev(steProtocol.getLev());
-
- if (!MessageQueue.offer(SlaveType.Ste, steNo, new Task(2, steCommand))) {
- News.error("绌挎杞﹀懡浠や笅鍙戝け璐ワ紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", steNo, JSON.toJSON(steCommand));
- } else {
- // 淇敼宸ヤ綔妗ｇ姸鎬� 35.灏忚溅灏辩华 => 36.灏忚溅璧拌
- wrkCharge.setWrkSts(36L);
- wrkCharge.setModiTime(new Date());
- if (!wrkChargeService.updateById(wrkCharge)) {
- News.error("淇敼婕旂ず浠诲姟{}宸ヤ綔妗� 35.灏忚溅灏辩华 => 36.灏忚溅璧拌 澶辫触!", wrkCharge.getWrkNo());
- }
- }
- }
- }
-
- }
/**
* 鍑哄叆搴撴ā寮忓垏鎹�
*/
--
Gitblit v1.9.1