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

fix:rgv行架冲突问题

Browse Source
This commit is contained in:
lishuai
2023-12-26 19:33:19 +08:00
parent ceaa8a0b34
commit 7739e9062b
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java
View File

@@ -785,11 +785,15 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple
for (int i1 = 0; i1 < taskDtos.size(); i1++) { for (int i1 = 0; i1 < taskDtos.size(); i1++) {
taskDto = taskDtos.get(i1); taskDto = taskDtos.get(i1);
Boolean flag; Boolean flag;
if ("6".equals(task.getTruss_type())) { if ("6".equals(taskDto.getTruss_type())) {
flag = checkAgv(taskDto); flag = checkAgv(taskDto);
if (flag){ if (flag){
break; break;
} }
if (!flag && i1 == taskDtos.size()-1) {
notCreateInstMessage = "rgv条件不匹配"+"任务号为："+taskDto.getTask_code();
return false;
}
}else { }else {
break; break;
} }
@@ -853,6 +857,10 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple
if (flag){ if (flag){
break; break;
} }
if (!flag && i1 == taskDtos.size()-1) {
notCreateInstMessage = "rgv条件不匹配"+"任务号为："+task.getTask_code();
return false;
}
}else { }else {
break; break;
} }
@@ -978,7 +986,7 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple
if (agv1.getDeviceDriver() instanceof RgvDeviceDriver && agv2.getDeviceDriver() instanceof RgvDeviceDriver) { if (agv1.getDeviceDriver() instanceof RgvDeviceDriver && agv2.getDeviceDriver() instanceof RgvDeviceDriver) {
rgv1 = (RgvDeviceDriver) agv1.getDeviceDriver(); rgv1 = (RgvDeviceDriver) agv1.getDeviceDriver();
rgv2 = (RgvDeviceDriver) agv2.getDeviceDriver(); rgv2 = (RgvDeviceDriver) agv2.getDeviceDriver();
if ((rgv1.getMode() == 2 && rgv1.getMove1() == 1) || (rgv2.getMode() == 2 && rgv2.getMove1() == 1)) { if ((rgv1.getMode() == 2 && rgv1.getMove1() == 1 && rgv1.getMove2() == 0 ) || (rgv2.getMode() == 2 && rgv2.getMove1() == 1 && rgv2.getMove2() == 0 )) {
return true; return true;
} }
} }

2
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
View File

@@ -190,7 +190,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
public PutActionResponse putAction(String jsonObject) throws Exception { public PutActionResponse putAction(String jsonObject) throws Exception {
try { try {
MDC.put(log_file_type, log_type); MDC.put(log_file_type, log_type);
log.info("putAction--------------:输出参数" + jsonObject); log.info("putAction--------------:输入参数" + jsonObject);
JSONArray datas = JSONArray.parseArray(jsonObject); JSONArray datas = JSONArray.parseArray(jsonObject);
PutActionResponse response = new PutActionResponse(); PutActionResponse response = new PutActionResponse();
JSONArray errArr = new JSONArray(); JSONArray errArr = new JSONArray();