| | |
| | | */ |
| | | private String queryAgvOrderStatus(Task agvTask, String displayTaskId) { |
| | | try { |
| | | // 构建订单ID,格式为 "T" + wrkNo |
| | | String orderId = null; |
| | | if (agvTask.getWrkNo() != null) { |
| | | orderId = "T" + agvTask.getWrkNo(); |
| | | } else { |
| | | String errorMsg = String.format("查询AGV订单状态失败:任务ID:%s,wrkNo为空", displayTaskId); |
| | | log.warn("查询AGV订单状态失败 - 任务ID:{},{}", displayTaskId, errorMsg); |
| | | agvTask.setErrorMemo(errorMsg); |
| | | agvTask.setErrorTime(new Date()); |
| | | taskService.updateById(agvTask); |
| | | return null; |
| | | // 构建订单ID,优先使用agvWrkNo,如果为空则使用T+wrkNo(向后兼容) |
| | | String orderId = agvTask.getAgvWrkNo(); |
| | | if (orderId == null || orderId.isEmpty()) { |
| | | if (agvTask.getWrkNo() != null) { |
| | | orderId = "T" + agvTask.getWrkNo(); |
| | | } else { |
| | | String errorMsg = String.format("查询AGV订单状态失败:任务ID:%s,agvWrkNo和wrkNo都为空", displayTaskId); |
| | | log.warn("查询AGV订单状态失败 - 任务ID:{},{}", displayTaskId, errorMsg); |
| | | agvTask.setErrorMemo2(errorMsg); |
| | | agvTask.setErrorTime2(new Date()); |
| | | taskService.updateById(agvTask); |
| | | return null; |
| | | } |
| | | } |
| | | |
| | | // 构建请求JSON |