root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev 信号下发

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2023-10-31 16:02:14 +08:00
parent d3063b472b
commit b5cd16b295
2 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
View File

@@ -383,7 +383,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
//存在行架->暂存的AGV任务 需要过滤 //存在行架->暂存的AGV任务 需要过滤
// 6 行架任务 8烘箱任务 // 6 行架任务 8烘箱任务
if(!StrUtil.equals(taskDto.getTask_type(),"6") || StrUtil.equals(taskDto.getTask_type(),"8")){ if(!StrUtil.equals(taskDto.getTask_type(),"6") && !StrUtil.equals(taskDto.getTask_type(),"8")){
taskDto = null; taskDto = null;
continue; continue;
} }
@@ -478,7 +478,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
taskDtoList = this.sortTask(taskDtoList); taskDtoList = this.sortTask(taskDtoList);
task = taskDtoList.get(j); task = taskDtoList.get(j);
// 6 行架任务 8烘箱任务 // 6 行架任务 8烘箱任务
if(!StrUtil.equals(task.getTask_type(),"6") || StrUtil.equals(task.getTask_type(),"8")){ if(!StrUtil.equals(task.getTask_type(),"6") && !StrUtil.equals(task.getTask_type(),"8")){
task = null; task = null;
continue; continue;
} }

38
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java
View File

@@ -936,8 +936,16 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
+ "." + param; + "." + param;
Map<String, Object> itemMap = new HashMap<String, Object>(); Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_param, Integer.parseInt(value)); itemMap.put(to_param, Integer.parseInt(value));
this.control(itemMap); try {
this.checkcontrol(itemMap);
} catch (Exception e) {
e.printStackTrace();
try{
this.checkcontrol(itemMap);
} catch (Exception e1){
e1.printStackTrace();
}
}
} }
// 申请贴标 // 申请贴标
@@ -1017,6 +1025,21 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
} else { } else {
message = "申请贴标失败," + applyLabelingAndBindingResponse.getMessage(); message = "申请贴标失败," + applyLabelingAndBindingResponse.getMessage();
logServer.deviceExecuteLog(this.device_code, "", "", "申请贴标,返回参数:" + JSON.toJSONString(applyLabelingAndBindingResponse)); logServer.deviceExecuteLog(this.device_code, "", "", "申请贴标,返回参数:" + JSON.toJSONString(applyLabelingAndBindingResponse));
List list = new ArrayList();
Map map = new HashMap();
map.put("code", "to_target");
map.put("value", "1011");
list.add(map);
Map map2 = new HashMap();
map2.put("code", "to_command");
map2.put("value", "1");
list.add(map2);
Map map3 = new HashMap();
map3.put("code", "to_task");
map3.put("value", "0");
list.add(map3);
this.writing(list);
requireSucess = true;
} }
} }
@@ -1034,7 +1057,16 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
} }
} }
logServer.deviceExecuteLog(device_code, "", "", "下发电气信号:" + itemMap); logServer.deviceExecuteLog(device_code, "", "", "下发电气信号:" + itemMap);
this.control(itemMap); try {
this.checkcontrol(itemMap);
} catch (Exception e) {
e.printStackTrace();
try{
this.checkcontrol(itemMap);
} catch (Exception e1){
e1.printStackTrace();
}
}
} }
@Override @Override