Commit 69251cfa authored by zhoumaotao's avatar zhoumaotao

Merge branch 'master' of gitlab.gavelinfo.com:gavelinfo/qzsa

parents 2de24e4e 5adf78b5
...@@ -60,6 +60,7 @@ public class AgvTaskQueueHandler implements Runnable { ...@@ -60,6 +60,7 @@ public class AgvTaskQueueHandler implements Runnable {
agvTask.setGuid(agvtaskQueue.getGuid()); agvTask.setGuid(agvtaskQueue.getGuid());
agvTask.setMsgtype(agvtaskQueue.getMsgtype()); agvTask.setMsgtype(agvtaskQueue.getMsgtype());
agvTask.setDesttask(DataConvert.getData2List(agvtaskQueue.getDesttask(), Device.class)); agvTask.setDesttask(DataConvert.getData2List(agvtaskQueue.getDesttask(), Device.class));
agvTask.setEquipID(agvtaskQueue.getEquipID());
try { try {
if (StringUtils.isNotEmpty(agvtaskQueue.getBody())){ if (StringUtils.isNotEmpty(agvtaskQueue.getBody())){
JSONObject jsonObject = JSONObject.parseObject(agvtaskQueue.getBody()); JSONObject jsonObject = JSONObject.parseObject(agvtaskQueue.getBody());
......
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