opt:增加返回点功能。
This commit is contained in:
@@ -691,7 +691,7 @@ public class HomeServiceImpl implements HomeService {
|
|||||||
//stopWatch.start();
|
//stopWatch.start();
|
||||||
JSONObject taskjo = WQLObject.getWQLObject("ST_TASK_INFO").query("is_delete='0'and task_status='01'").uniqueResult(0);
|
JSONObject taskjo = WQLObject.getWQLObject("ST_TASK_INFO").query("is_delete='0'and task_status='01'").uniqueResult(0);
|
||||||
//小车停止,且已到达目标点位
|
//小车停止,且已到达目标点位
|
||||||
if (ObjectUtil.isNotEmpty(taskjo)) {
|
if (ObjectUtil.isNotEmpty(taskjo) && StrUtil.equals("0", debugInfoJson.getString("PathFollow_Enable")) && debugInfoJson.getString("CurNodeID").equals(taskjo.getString("next_point_code"))) {
|
||||||
//普通任务
|
//普通任务
|
||||||
if (TaskTypeEnum.COMMON.getCode().equals(taskjo.getString("task_type"))) {
|
if (TaskTypeEnum.COMMON.getCode().equals(taskjo.getString("task_type"))) {
|
||||||
updateTaskStatus(taskjo, TaskStatusEnum.END);
|
updateTaskStatus(taskjo, TaskStatusEnum.END);
|
||||||
|
|||||||
Reference in New Issue
Block a user