|
|
@ -1,6 +1,6 @@ |
|
|
|
package org.nl.modules.quartz.task; |
|
|
|
|
|
|
|
import cn.hutool.core.map.MapUtil; |
|
|
|
import cn.hutool.core.date.DateUtil; |
|
|
|
import cn.hutool.core.util.ObjectUtil; |
|
|
|
import cn.hutool.core.util.StrUtil; |
|
|
|
import cn.hutool.http.HttpResponse; |
|
|
@ -8,22 +8,14 @@ import lombok.extern.slf4j.Slf4j; |
|
|
|
import net.sf.json.JSONArray; |
|
|
|
import net.sf.json.JSONObject; |
|
|
|
import org.nl.acs.agv.server.AgvService; |
|
|
|
import org.nl.acs.device.service.DeviceService; |
|
|
|
import org.nl.acs.device.service.dto.DeviceDto; |
|
|
|
import org.nl.acs.ext.wms.service.AcsToWmsService; |
|
|
|
import org.nl.acs.ext.wms.service.AcsToWmsZDService; |
|
|
|
import org.nl.acs.instruction.service.InstructionService; |
|
|
|
import org.nl.acs.instruction.service.dto.Instruction; |
|
|
|
import org.nl.acs.opc.Device; |
|
|
|
import org.nl.acs.opc.DeviceAppService; |
|
|
|
import org.nl.acs.task.service.TaskService; |
|
|
|
import org.nl.acs.task.service.dto.TaskDto; |
|
|
|
import org.nl.utils.SpringContextHolder; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Component; |
|
|
|
|
|
|
|
import java.util.List; |
|
|
|
|
|
|
|
/** |
|
|
|
* 查询AGV任务状态 |
|
|
|
*/ |
|
|
@ -60,6 +52,7 @@ public class QueryXZAgvTaskStatus { |
|
|
|
//子任务状态 待以后处理
|
|
|
|
JSONArray blocks = JSONArray.fromObject(one.get("blocks")); |
|
|
|
String state = one.getString("state"); |
|
|
|
log.info("查询到的指令号:{},车号:{}", inst_code, one.getString("vehicle")); |
|
|
|
if (!StrUtil.isEmpty(one.getString("vehicle"))) { |
|
|
|
String carno = one.getString("vehicle"); |
|
|
|
inst.setCarno(carno); |
|
|
|