From 073ba7c8afcbeedcc7dad4f0f7c1d1b6eaa82daf Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 13 七月 2023 15:04:12 +0800
Subject: [PATCH] #提升机移动数据更新
---
src/main/java/com/zy/core/thread/ShuttleThread.java | 299 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 152 insertions(+), 147 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/ShuttleThread.java b/src/main/java/com/zy/core/thread/ShuttleThread.java
index 88b5ab8..fd0e4b3 100644
--- a/src/main/java/com/zy/core/thread/ShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/ShuttleThread.java
@@ -279,7 +279,6 @@
News.error("鍥涘悜绌挎杞﹀啓鍏ュ懡浠や负绌�");
return false;
}
-
BasShuttleService shuttleService = SpringUtils.getBean(BasShuttleService.class);
if (shuttleService == null) {
News.error("绯荤粺閿欒");
@@ -291,8 +290,27 @@
News.error("鍥涘悜绌挎杞︿笉瀛樺湪");
return false;
}
-
command.setShuttleNo(slave.getId().shortValue());
+ short[] array = getCommandArr(command);//鑾峰彇鍛戒护鎶ユ枃
+ OperateResult result = modbusTcpNet.Write("0", array);;
+ if (result != null && result.IsSuccess) {
+ try {
+ Thread.sleep(3000);//鍛戒护涓嬪彂鍚庝紤鐪�1s
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ News.info("鍥涘悜绌挎杞﹀懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
+ OutputQueue.SHUTTLE.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
+ return true;
+ } else {
+ OutputQueue.SHUTTLE.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ洓鍚戠┛姊溅plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
+ News.error("鍐欏叆鍥涘悜绌挎杞lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ return false;
+ }
+ }
+
+ //鑾峰彇鍛戒护鎶ユ枃
+ private short[] getCommandArr(ShuttleCommand command) {
// 寮�濮嬩换鍔�
short[] array = new short[17];
//鎺у埗鎸囦护瀛�
@@ -326,7 +344,6 @@
array[7] = middleToDistDistances[1];
}
- array[8] = basShuttle.getRunSpeed().shortValue();//鍥涘悜绌挎杞﹁繍琛岄�熷害锛屼粠绯荤粺鏁版嵁搴撹鍑�
if (command.getRunDirection() != null) {
//灏忚溅杩愯鏂瑰悜
array[8] = command.getRunDirection();
@@ -363,31 +380,16 @@
//灏忚溅闆疯揪澶囩敤
array[15] = command.getRadarTmp();
}
-
//鎸囦护缁撴潫浣�
array[16] = command.getCommandEnd();
-
- OperateResult result = modbusTcpNet.Write("0", array);;
- if (result != null && result.IsSuccess) {
- try {
- Thread.sleep(3000);//鍛戒护涓嬪彂鍚庝紤鐪�1s
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
- }
- News.info("鍥涘悜绌挎杞﹀懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
- OutputQueue.SHUTTLE.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
- return true;
- } else {
- OutputQueue.SHUTTLE.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ洓鍚戠┛姊溅plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
- News.error("鍐欏叆鍥涘悜绌挎杞lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- return false;
- }
+ return array;
}
/**
* 鍒濆鍖栧洓鍚戠┛姊溅
*/
private void initShuttle() {
+ this.connect();
if (null == shuttleProtocol) {
shuttleProtocol = new ShuttleProtocol();
}
@@ -536,7 +538,7 @@
Short liftArrival = liftProtocol.getPositionArrivalFeedback();//鎻愬崌鏈轰綅缃弽棣�
String liftSiteLocNo = Utils.liftArrivalToOutInStaLocNo(liftArrival);
LocMast locMast1 = locMastService.selectById(liftSiteLocNo);
- ShuttleCommand moveCommand = getMoveCommand(liftProtocol.getBarcode(), Short.parseShort(locMast1.getQrCodeValue()), 1400, ShuttleRunDirection.BOTTOM.id, liftProtocol.getBarcode(), 1400, runSpeed);
+ ShuttleCommand moveCommand = getMoveCommand(liftProtocol.getBarcode(), Short.parseShort(locMast1.getQrCodeValue()), 1600, ShuttleRunDirection.BOTTOM.id, null, null, runSpeed);
commands.add(moveCommand);
//璧峰浣嶇疆淇敼涓烘彁鍗囨満鍙ｇ珯鐐逛綅缃�
@@ -616,7 +618,7 @@
}
//澧炲姞绉诲姩杩涙彁鍗囨満鍛戒护
- ShuttleCommand moveCommand = getMoveCommand(endStartCode, liftProtocol.getBarcode(), 1400, ShuttleRunDirection.TOP.id, endStartCode, 1400, runSpeed);
+ ShuttleCommand moveCommand = getMoveCommand(endStartCode, liftProtocol.getBarcode(), 1600, ShuttleRunDirection.TOP.id, null, null, runSpeed);
commands.add(moveCommand);
break;
default:
@@ -646,88 +648,21 @@
return false;
}
+ WrkMastService wrkMastService = SpringUtils.getBean(WrkMastService.class);
+
Object o = redisUtil.get("shuttle_wrk_no_" + wrkNo);
if (o == null) {
return false;
}
ShuttleRedisCommand redisCommand = JSON.parseObject(o.toString(), ShuttleRedisCommand.class);
+ if (shuttleProtocol.getBusyStatus().intValue() == ShuttleStatusType.BUSY.id) {
+ return false;//灏忚溅鐘舵�佸繖
+ }
+
if (!checkLiftStation(wrkNo)) {//妫�娴嬫槸鍚︽湁鎻愬崌鏈虹珯鐐癸紝鏈夊垯璋冨害鎻愬崌鏈�
return false;
}
-
-// List<ShuttleCommand> errorCommands = redisCommand.getErrorCommands();
-// if (errorCommands.size() > 0) {
-// //浼樺厛鎵ц璇ユ寚浠�
-// ShuttleCommand errorCommand = errorCommands.get(0);//鍙栧嚭鎸囦护
-//
-// if(errorCommand.getCommandWord() == 1){//姝ｅ父琛岃蛋鍛戒护锛岄渶瑕佸厛鎵ц瀹屾壘搴撲綅鍛戒护鍚庯紝鍐嶆墽琛�
-// LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
-// LocMast locMast = locMastService.queryByQrCode(shuttleProtocol.getCurrentCode().toString());
-// LocMast distLocMast = locMastService.queryByQrCode(errorCommand.getStartCodeNum().toString());
-// if (shuttleProtocol.getCurrentCode().equals(errorCommand.getStartCodeNum())) {
-// //璧风偣鍜岀粓鐐瑰睘浜庡悓涓�搴撲綅锛屾棤闇�鍐嶆墽琛岀Щ鍔ㄦ搷浣�
-// errorCommands.remove(0);//绉婚櫎璇ュ懡浠�
-// redisCommand.setErrorCommands(new ArrayList<ShuttleCommand>());
-// shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.WORKING);
-// //褰撳墠姝ュ簭
-// int commandStep = redisCommand.getCommandStep();
-// //姝ュ簭鍥為��
-// commandStep--;
-// redisCommand.setCommandStep(commandStep);
-// //浠诲姟鏁版嵁淇濆瓨鍒皉edis
-// redisUtil.set("shuttle_wrk_no_" + wrkNo, JSON.toJSONString(redisCommand));
-// shuttleProtocol.setPakMk(true);
-// return true;
-// }else {
-// List<NavigateNode> result = NavigateUtils.calc(locMast.getLocNo(), distLocMast.getLocNo(), NavigationMapType.DFX.id, Utils.getShuttlePoints(errorCommand.getShuttleNo().intValue()));//閿欒鎭㈠锛屼娇鐢―FX鍦板浘
-// if (result != null) {
-// //鑾峰彇鍒嗘璺緞
-// ArrayList<ArrayList<NavigateNode>> data = NavigateUtils.getSectionPath(result);
-// //灏嗘瘡涓�娈佃矾寰勫垎鎴恈ommand鎸囦护
-// for (ArrayList<NavigateNode> nodes : data) {
-// //寮�濮嬭矾寰�
-// NavigateNode startPath = nodes.get(0);
-// //鐩爣璺緞
-// NavigateNode endPath = nodes.get(nodes.size() - 1);
-// Integer allDistance = NavigateUtils.getCurrentPathAllDistance(nodes);//璁＄畻褰撳墠璺緞琛岃蛋鎬昏窛绂�
-//
-// String qrCodeValue = distLocMast.getQrCodeValue();
-// errorCommand.setCommandWord((short) 1);
-// errorCommand.setStartCodeNum(shuttleProtocol.getCurrentCode());
-// errorCommand.setMiddleCodeNum((short) 1);
-// errorCommand.setDistCodeNum((short) Integer.parseInt(qrCodeValue));
-// errorCommand.setStartToDistDistance(allDistance);
-// errorCommand.setRunSpeed((short) 1000);
-// errorCommand.setRunDirection(ShuttleRunDirection.get(startPath.getDirection()).id);
-// errorCommand.setForceMoveDistance(0);
-// errorCommand.setIOControl((short) 0);
-// errorCommand.setCommandEnd((short) 1);
-// break;
-// }
-// }
-// }
-//
-// shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.WORKING);
-// //褰撳墠姝ュ簭
-// int commandStep = redisCommand.getCommandStep();
-// //姝ュ簭鍥為��
-// commandStep--;
-// redisCommand.setCommandStep(commandStep);
-// }
-//
-// if (!write(errorCommand)) {
-// News.error("鍥涘悜绌挎杞﹀懡浠や笅鍙戝け璐ワ紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", shuttleProtocol.getShuttleNo(), JSON.toJSON(errorCommand));
-// return false;
-// } else {
-// News.info("鍥涘悜绌挎杞﹀懡浠や笅鍙戞垚鍔燂紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", shuttleProtocol.getShuttleNo(), JSON.toJSON(errorCommand));
-// errorCommands.remove(0);
-// redisCommand.setErrorCommands(errorCommands);
-// //浠诲姟鏁版嵁淇濆瓨鍒皉edis
-// redisUtil.set("shuttle_wrk_no_" + wrkNo, JSON.toJSONString(redisCommand));
-// return true;
-// }
-// }
LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, 1);
LiftProtocol liftProtocol = liftThread.getLiftProtocol();
@@ -751,10 +686,36 @@
//涓婁竴鏉℃寚浠よ捣鐐规槸鎻愬崌鏈轰簩缁寸爜锛屽垯娓呴浂鎻愬崌鏈轰换鍔″彿
if (command.getStartCodeNum().intValue() == liftProtocol.getBarcode().intValue()) {
//鍒ゆ柇鎻愬崌鏈烘槸鍚﹀浜庣┖闂�
- if (liftProtocol.isIdleNoTask()) {
+ if (liftProtocol.isIdleNoTask() && liftProtocol.getTaskNo().intValue() == redisCommand.getWrkNo().intValue()) {
liftProtocol.setTaskNo((short) 0);//娓呯┖浠诲姟鍙�
+ WrkMast wrkMast = wrkMastService.selectById(wrkNo);
+ if (wrkMast != null) {
+ wrkMast.setLiftNo(null);//瑙ｉ攣鎻愬崌鏈�
+ wrkMastService.updateById(wrkMast);
+ }
}
}
+
+ //鍏ュ簱鍛戒护锛屽綋灏忚溅鍙栧畬璐у悗锛岄渶瑕佸皢鎻愬崌鏈洪噴鏀�
+ if (assignCommand.getTaskMode().intValue() == ShuttleTaskModeType.PAK_IN.id) {
+ //鍒ゆ柇涓婁竴鏉℃寚浠ょ殑璧风偣鏄惁涓鸿緭閫佺珯鐐逛笖鐩爣鐐逛笉鏄彁鍗囨満鍐呴儴浜岀淮鐮�
+ Short startCodeNum = command.getStartCodeNum();
+ BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
+ BasDevp basDevp = basDevpService.queryByQrCode(startCodeNum.intValue());//鐩爣绔欑偣
+ if (basDevp != null && command.getDistCodeNum().intValue() != liftProtocol.getBarcode().intValue()) {
+ //涓婁竴鏉℃寚浠ょ殑璧风偣涓鸿緭閫佺珯鐐逛笖鐩爣鐐逛笉鏄彁鍗囨満鍐呴儴浜岀淮鐮�
+ //姝ゆ椂灏忚溅搴旇宸茬粡绂诲紑杈撻�佺珯鐐癸紝鍒ゆ柇鎻愬崌鏈烘槸鍚︾┖闂蹭笖鏈夊伐浣滃彿
+ if (liftProtocol.isIdleNoTask() && liftProtocol.getTaskNo().intValue() == redisCommand.getWrkNo().intValue()) {
+ liftProtocol.setTaskNo((short) 0);//娓呯┖浠诲姟鍙�
+ WrkMast wrkMast = wrkMastService.selectById(wrkNo);
+ if (wrkMast != null) {
+ wrkMast.setLiftNo(null);//瑙ｉ攣鎻愬崌鏈�
+ wrkMastService.updateById(wrkMast);
+ }
+ }
+ }
+ }
+
}
} else if (command.getCommandWord().intValue() == 2) {
//鎵樼洏椤跺崌鍛戒护
@@ -802,6 +763,10 @@
//涓婁竴鏉′换鍔℃湭瀹屾垚锛岀姝笅鍙戝懡浠�
return false;
}
+ }
+
+ if (commands.size() == 0) {
+ return false;
}
//鍙栧嚭鍛戒护
@@ -871,6 +836,7 @@
//淇濆瓨鏁版嵁鍒版暟鎹簱鍋氭祦姘�
BasShuttleOptService shuttleOptService = SpringUtils.getBean(BasShuttleOptService.class);
if (shuttleOptService != null) {
+ short[] commandArr = getCommandArr(command);//鑾峰彇鍛戒护鎶ユ枃
BasShuttleOpt opt = new BasShuttleOpt(
assignCommand.getTaskNo().intValue(),
assignCommand.getShuttleNo().intValue(),
@@ -881,7 +847,8 @@
null,
null,
null,
- JSON.toJSONString(command)
+ JSON.toJSONString(command),
+ JSON.toJSONString(commandArr)
);
shuttleOptService.insert(opt);
}
@@ -977,11 +944,10 @@
if (commands.get(0).getStartCodeNum() == null) {
return false;
}
- //鍛戒护璧峰浣嶇疆灏辨槸鎻愬崌鏈轰簩缁寸爜锛屽垯涓嶈繘琛屾牎楠�
- if (commands.get(0).getStartCodeNum().intValue() == liftProtocol.getBarcode().intValue()) {
- return true;
- }
}
+
+ //褰撳墠绛夊緟鎵ц鐨勬寚浠�
+ ShuttleCommand command = commands.get(commandStep);
BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
ArrayList<Short> qrCodeValues = new ArrayList<>();
@@ -990,32 +956,53 @@
qrCodeValues.add(Short.parseShort(basDevp.getQrCodeValue()));
}
- //閬嶅巻鎵�鏈夋寚浠わ紝鍒ゆ柇鏄惁鏈夊埌鎻愬崌鏈哄彛鐨勬寚浠ゆ垨浠庢彁鍗囨満鍙ｅ墠寰�鎻愬崌鏈哄唴鐨勬寚浠わ紝骞惰幏鍙栧埌杈捐鎻愬崌鏈哄彛鎵�闇�姝ュ簭
- int step = 0;
Integer siteNo = null;//绔欑偣鍙�
- ShuttleCommand command = null;
- for (int i = 0; i < commands.size(); i++) {
- command = commands.get(i);
- for (Short qrCodeValue : qrCodeValues) {
- //鐩爣浣嶇疆鏄彁鍗囨満鍙ｏ紝鎴栬捣鐐逛綅缃槸鎻愬崌鏈哄彛涓旂洰鏍囨槸鍘绘彁鍗囨満鍐�
- if (command.getDistCodeNum() == null || command.getStartCodeNum() == null) {
- continue;
- }
+ for (Short qrCodeValue : qrCodeValues) {
+ //鐩爣浣嶇疆鏄彁鍗囨満鍙ｏ紝鎴栬捣鐐逛綅缃槸鎻愬崌鏈哄彛涓旂洰鏍囨槸鍘绘彁鍗囨満鍐�
+ if (command.getDistCodeNum() == null || command.getStartCodeNum() == null) {
+ continue;
+ }
- if (qrCodeValue.intValue() == command.getDistCodeNum().intValue() || (qrCodeValue.intValue() == command.getStartCodeNum().intValue() && command.getDistCodeNum().intValue() == liftProtocol.getBarcode().intValue())) {
- //瀛樺湪
- step = i + 1;
- BasDevp basDevp = basDevpService.queryByQrCode(qrCodeValue.intValue());
- siteNo = basDevp.getDevNo();
- break;
- }
+ if (qrCodeValue.intValue() == command.getDistCodeNum().intValue() || (qrCodeValue.intValue() == command.getStartCodeNum().intValue() && command.getDistCodeNum().intValue() == liftProtocol.getBarcode().intValue())) {
+ //瀛樺湪
+ BasDevp basDevp = basDevpService.queryByQrCode(qrCodeValue.intValue());
+ siteNo = basDevp.getDevNo();
+ break;
}
}
- if (step == 0) {
- //鏃犻渶鍚庣画妫�娴嬶紝鐩存帴鏀捐
+ if (siteNo == null) {
+ //鎵句笉鍒扮珯鐐癸紝璇存槑杩樻湭鍒版彁鍗囨満
return true;
}
+
+
+// //閬嶅巻鎵�鏈夋寚浠わ紝鍒ゆ柇鏄惁鏈夊埌鎻愬崌鏈哄彛鐨勬寚浠ゆ垨浠庢彁鍗囨満鍙ｅ墠寰�鎻愬崌鏈哄唴鐨勬寚浠わ紝骞惰幏鍙栧埌杈捐鎻愬崌鏈哄彛鎵�闇�姝ュ簭
+// int step = 0;
+// Integer siteNo = null;//绔欑偣鍙�
+// ShuttleCommand command = null;
+// for (int i = 0; i < commands.size(); i++) {
+// command = commands.get(i);
+// for (Short qrCodeValue : qrCodeValues) {
+// //鐩爣浣嶇疆鏄彁鍗囨満鍙ｏ紝鎴栬捣鐐逛綅缃槸鎻愬崌鏈哄彛涓旂洰鏍囨槸鍘绘彁鍗囨満鍐�
+// if (command.getDistCodeNum() == null || command.getStartCodeNum() == null) {
+// continue;
+// }
+//
+// if (qrCodeValue.intValue() == command.getDistCodeNum().intValue() || (qrCodeValue.intValue() == command.getStartCodeNum().intValue() && command.getDistCodeNum().intValue() == liftProtocol.getBarcode().intValue())) {
+// //瀛樺湪
+// step = i + 1;
+// BasDevp basDevp = basDevpService.queryByQrCode(qrCodeValue.intValue());
+// siteNo = basDevp.getDevNo();
+// break;
+// }
+// }
+// }
+//
+// if (step == 0) {
+// //鏃犻渶鍚庣画妫�娴嬶紝鐩存帴鏀捐
+// return true;
+// }
//鍒ゆ柇涓嬩竴姝ユ槸鍚︿负鎻愬崌鏈哄彛鎴栨彁鍗囨満鍐�
if (commandStep < commands.size()) {
@@ -1028,10 +1015,6 @@
}
}
}
-// if (commandStep + 1 != step) {
-// //涓嬩竴姝ヤ笉鏄彁鍗囨満鍙ｏ紝璺宠繃鍚庣画娴佺▼
-// return true;
-// }
//鑾峰彇鍥涘悜绌挎杞﹀綋鍓嶆ゼ灞�
String shuttleLocNo = shuttleProtocol.getCurrentLocNo();//浜岀淮鐮佸搴斿簱浣嶅彿
@@ -1043,34 +1026,49 @@
}
//鍒ゆ柇杈撻�佺嚎绔欑偣鏄惁缁欏嚭鎻愬崌鏈哄埌浣嶄俊鍙�
- if (siteNo != null) {
- SiemensDevpThread siemensDevpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
- StaProtocol staProtocol = siemensDevpThread.getStation().get(siteNo);
- if (!staProtocol.isLiftArrival()) {
- //杈撻�佺嚎鍙嶉鎻愬崌鏈烘病鏈夊埌浣�
- executeLift(liftThread, liftProtocol, redisCommand, shuttleLocNoLev);//璋冨害鎻愬崌鏈�
- return false;
- }
-
- if (shuttleProtocol.getCurrentCode().intValue() == liftProtocol.getBarcode().intValue()) {
- //灏忚溅澶勪簬鎻愬崌鏈哄唴
- return true;
- }else {
- if (liftProtocol.getPositionArrivalFeedback$() == shuttleLocNoLev) {
- liftProtocol.setTaskNo(wrkNo);//缁欐彁鍗囨満鍐欏伐浣滃彿锛岄槻姝㈣鍗犵敤
- return true;//鎻愬崌鏈哄埌浣�
- }
- executeLift(liftThread, liftProtocol, redisCommand, shuttleLocNoLev);//璋冨害鎻愬崌鏈�
- return false;//鎻愬崌鏈烘病鏈夊埌浣�
- }
+ SiemensDevpThread siemensDevpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ StaProtocol staProtocol = siemensDevpThread.getStation().get(siteNo);
+ if (!staProtocol.isLiftArrival()) {
+ //杈撻�佺嚎鍙嶉鎻愬崌鏈烘病鏈夊埌浣�
+ executeLift(liftThread, liftProtocol, redisCommand, shuttleLocNoLev);//璋冨害鎻愬崌鏈�
+ return false;
}
- return false;
+ if (shuttleProtocol.getCurrentCode().intValue() == liftProtocol.getBarcode().intValue()) {
+ //灏忚溅澶勪簬鎻愬崌鏈哄唴
+ return true;
+ }else {
+ if (liftProtocol.getPositionArrivalFeedback$() == shuttleLocNoLev) {
+ //鍒ゆ柇鎻愬崌鏈烘槸鍚︽湁浠诲姟鍙�
+ if (liftProtocol.getTaskNo().intValue() != 0) {
+ //鍒ゆ柇浠诲姟鍙锋槸鍚﹀拰褰撳墠灏忚溅浠诲姟涓�鑷�
+ if (liftProtocol.getTaskNo().intValue() != wrkNo.intValue()) {
+ return false;//浠诲姟鍙蜂笉涓�鑷达紝涓旀彁鍗囨満浠诲姟鍙蜂笉涓�0
+ }
+ }
+ liftProtocol.setTaskNo(wrkNo);//缁欐彁鍗囨満鍐欏伐浣滃彿锛岄槻姝㈣鍗犵敤
+ WrkMastService wrkMastService = SpringUtils.getBean(WrkMastService.class);
+ WrkMast wrkMast = wrkMastService.selectById(shuttleProtocol.getTaskNo());
+ if (wrkMast != null) {
+ wrkMast.setLiftNo(liftProtocol.getLiftNo().intValue());//閿佸畾鎻愬崌鏈猴紝闃叉琚姠鍗�
+ wrkMastService.updateById(wrkMast);
+ }
+ return true;//鎻愬崌鏈哄埌浣�
+ }
+ executeLift(liftThread, liftProtocol, redisCommand, shuttleLocNoLev);//璋冨害鎻愬崌鏈�
+ return false;//鎻愬崌鏈烘病鏈夊埌浣�
+ }
+
}
private boolean executeLift(LiftThread liftThread, LiftProtocol liftProtocol, ShuttleRedisCommand redisCommand, Integer shuttleLocNoLev) {//璋冨害鎻愬崌鏈�
- if (liftProtocol.getRunning()) {
- //鎻愬崌鏈鸿繍琛屼腑锛岀姝笅鍙�
+ if (!liftProtocol.isIdle()) {
+ //鎻愬崌鏈轰笉绌洪棽绂佹涓嬪彂
+ return false;
+ }
+
+ if (liftProtocol.getPlatShuttleCheck()) {
+ //鎻愬崌鏈哄唴鏈夎溅绂佹涓嬪彂
return false;
}
@@ -1079,6 +1077,13 @@
return false;
}
+ WrkMastService wrkMastService = SpringUtils.getBean(WrkMastService.class);
+ WrkMast wrkMast = wrkMastService.selectById(shuttleProtocol.getTaskNo());
+ if (wrkMast != null) {
+ wrkMast.setLiftNo(liftProtocol.getLiftNo().intValue());//閿佸畾鎻愬崌鏈猴紝闃叉琚姠鍗�
+ wrkMastService.updateById(wrkMast);
+ }
+
//缁欐彁鍗囨満鍒嗛厤浠诲姟
liftProtocol.setTaskNo(shuttleProtocol.getTaskNo());//璁剧疆浠诲姟鍙�
liftProtocol.setShuttleNo(shuttleProtocol.getShuttleNo());//璁剧疆鍥涘悜绌挎杞﹀彿
--
Gitblit v1.9.1