Skip to content

W
wcs-server-v8-nansha
Commit 70dc6418 authored by liqingjian's avatar liqingjian
Browse files
Options

2020-04-11 判断空

Robot lockedRobot = this.getRobotManager().getRobotById(address.getLockedBy());
parent b6ba5258
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
src/main/java/com/mushiny/beans/order/midea/PodRunOrder.java
View file @ 70dc6418
...@@ -100,9 +100,10 @@ public class PodRunOrder extends Order { ...@@ -100,9 +100,10 @@ public class PodRunOrder extends Order {
&& address.robotLock(this.getRobot().getRobotId(),true); && address.robotLock(this.getRobot().getRobotId(),true);
//如果该节点被某小车锁定，而小车锁定的目的地不是该节点，表示数据有问题 2020-01-20 //如果该节点被某小车锁定，而小车锁定的目的地不是该节点，表示数据有问题 2020-01-20
Robot lockedRobot = this.getRobotManager().getRobotById(address.getLockedBy()); Robot lockedRobot = this.getRobotManager().getRobotById(address.getLockedBy());
if(lockedRobot.getLockedAddr() != Long.parseLong(address.getId())){ //@2020-04-11 判断空
if(lockedRobot == null || lockedRobot.getLockedAddr() != Long.parseLong(address.getId())){
logger.error("该位置锁定的小车目的地不是这个点 lockedRobot.getLockedAddr():" logger.error("该位置锁定的小车目的地不是这个点 lockedRobot.getLockedAddr():"
+lockedRobot.getLockedAddr()+" address.getId():"+address.getId()); +lockedRobot+" address.getId():"+address.getId());
success = true; success = true;
} }
if (success) { if (success) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment