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

fix 优化ndc交互

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2023-06-07 09:16:02 +08:00
parent 12cee738cf
commit 8e922888f5
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
acs/nladmin-system/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java
View File

@@ -248,10 +248,15 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
} else { } else {
device = deviceAppService.findDeviceByCode(Integer.toString(arr[20])); device = deviceAppService.findDeviceByCode(Integer.toString(arr[20]));
} }
if (device.getDeviceDriver() instanceof AgvNdcTwoDeviceDriver) { if(ObjectUtil.isNotEmpty(device)){
agvNdcTwoDeviceDriver = (AgvNdcTwoDeviceDriver) device.getDeviceDriver(); if (device.getDeviceDriver() instanceof AgvNdcTwoDeviceDriver) {
agvNdcTwoDeviceDriver.processSocket(arr); agvNdcTwoDeviceDriver = (AgvNdcTwoDeviceDriver) device.getDeviceDriver();
agvNdcTwoDeviceDriver.processSocket(arr);
}
} else {
log.info("当前phase："+ phase +"未找到对应设备");
} }
} }
if (!ObjectUtil.isEmpty(data)) { if (!ObjectUtil.isEmpty(data)) {
write(data); write(data);

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

@@ -667,7 +667,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("task_code", task_code); json.put("task_code", task_code);
json.put("ext_task_id", ext_task_id); json.put("ext_task_id", ext_task_id);
json.put("message", "已存在任务id为"+taskDto.getTask_id()+"相同的任务号:" + task_code); json.put("message", "存在相同的任务号:" + task_code);
errArr.add(json); errArr.add(json);
continue; continue;
} }
@@ -677,7 +677,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("task_code", task_code); json.put("task_code", task_code);
json.put("ext_task_id", ext_task_id); json.put("ext_task_id", ext_task_id);
json.put("message", "已存在任务id为"+vehicle_dto.getTask_id()+"托盘号:" + vehicle_code); json.put("message", "已存在任务编号为"+vehicle_dto.getTask_code()+"托盘号:" + vehicle_code);
errArr.add(json); errArr.add(json);
continue; continue;
} }