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

立库更新

Browse Source
This commit is contained in:
loujf
2022-09-07 15:20:02 +08:00
parent 5735bb53ec
commit 9c90c55c2a
2 changed files with 73 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java
View File

@@ -417,6 +417,9 @@ public class AgvServiceImpl implements AgvService {
if (StrUtil.equals(acsConfigService.findConfigFromCache().get(AcsConfig.FORKAGV).toString(), "1")) { if (StrUtil.equals(acsConfigService.findConfigFromCache().get(AcsConfig.FORKAGV).toString(), "1")) {
String instcode = inst.getInstruction_code(); String instcode = inst.getInstruction_code();
int type = Integer.parseInt(inst.getInstruction_type()); int type = Integer.parseInt(inst.getInstruction_type());
if (type == 3) {
type = 1;
}
int priority = Integer.parseInt(inst.getPriority()) + 128; int priority = Integer.parseInt(inst.getPriority()) + 128;
DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);
DeviceService deviceService = SpringContextHolder.getBean(DeviceServiceImpl.class); DeviceService deviceService = SpringContextHolder.getBean(DeviceServiceImpl.class);

37
hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java
View File

@@ -829,6 +829,10 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
break; break;
case 1: case 1:
TaskDto taskDto = taskService.findByCode(inst.getTask_code()); TaskDto taskDto = taskService.findByCode(inst.getTask_code());
boolean tag = false;
if (!StrUtil.startWith(inst.getTask_code(), "-") || StrUtil.equals(taskDto.getTask_type(),"3")) {
tag = true;
}
//开始任务/上报订单号（无车id及状态） //开始任务/上报订单号（无车id及状态）
if (phase == 0x01) { if (phase == 0x01) {
@@ -879,6 +883,9 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
} }
if (device.getDeviceDriver() instanceof StorageConveyorDeviceDriver) { if (device.getDeviceDriver() instanceof StorageConveyorDeviceDriver) {
storageConveyorDeviceDriver = (StorageConveyorDeviceDriver) device.getDeviceDriver(); storageConveyorDeviceDriver = (StorageConveyorDeviceDriver) device.getDeviceDriver();
//如果为acs创建的任务并且任务类型为3，那么就不需要调用立库接口
if (!tag) {
HttpResponse response = acsToXrlkService.isTakePermission(device.getDevice_code()); HttpResponse response = acsToXrlkService.isTakePermission(device.getDevice_code());
if (response.getStatus() == 200) { if (response.getStatus() == 200) {
JSONObject jo = JSONObject.fromObject(response.body()); JSONObject jo = JSONObject.fromObject(response.body());
@@ -890,6 +897,10 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
} else { } else {
log.info("AGV请求取货设备{}，接口请求立库WMS失败", device_code); log.info("AGV请求取货设备{}，接口请求立库WMS失败", device_code);
} }
} else {
data = AgvService.sendAgvOneModeInst(phase, index, 0);
}
} }
if (device.getDeviceDriver() instanceof StandardEmptyPalletSiteDeviceDriver) { if (device.getDeviceDriver() instanceof StandardEmptyPalletSiteDeviceDriver) {
standardEmptyPalletSiteDeviceDriver = (StandardEmptyPalletSiteDeviceDriver) device.getDeviceDriver(); standardEmptyPalletSiteDeviceDriver = (StandardEmptyPalletSiteDeviceDriver) device.getDeviceDriver();
@@ -947,6 +958,9 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
} }
if (device.getDeviceDriver() instanceof StorageConveyorDeviceDriver) { if (device.getDeviceDriver() instanceof StorageConveyorDeviceDriver) {
storageConveyorDeviceDriver = (StorageConveyorDeviceDriver) device.getDeviceDriver(); storageConveyorDeviceDriver = (StorageConveyorDeviceDriver) device.getDeviceDriver();
//如果为acs创建的任务并且任务类型为3，那么就不需要调用立库接口
if (!tag) {
HttpResponse response = acsToXrlkService.AGVWorkStatus(device.getDevice_code(), "2"); HttpResponse response = acsToXrlkService.AGVWorkStatus(device.getDevice_code(), "2");
if (response.getStatus() == 200) { if (response.getStatus() == 200) {
JSONObject jo = JSONObject.fromObject(response.body()); JSONObject jo = JSONObject.fromObject(response.body());
@@ -958,7 +972,9 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
} else { } else {
log.info("AGV取货完成反馈设备{}，接口请求立库WMS失败", device_code); log.info("AGV取货完成反馈设备{}，接口请求立库WMS失败", device_code);
} }
} else {
data = AgvService.sendAgvOneModeInst(phase, index, 0);
}
} }
if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver(); standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver();
@@ -1100,6 +1116,9 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
} }
if (device.getDeviceDriver() instanceof StorageConveyorDeviceDriver) { if (device.getDeviceDriver() instanceof StorageConveyorDeviceDriver) {
storageConveyorDeviceDriver = (StorageConveyorDeviceDriver) device.getDeviceDriver(); storageConveyorDeviceDriver = (StorageConveyorDeviceDriver) device.getDeviceDriver();
//如果为acs创建的任务并且任务类型为3，那么就不需要调用立库接口
if (!tag) {
HttpResponse response = acsToXrlkService.isPutPermission(device.getDevice_code()); HttpResponse response = acsToXrlkService.isPutPermission(device.getDevice_code());
if (response.getStatus() == 200) { if (response.getStatus() == 200) {
JSONObject jo = JSONObject.fromObject(response.body()); JSONObject jo = JSONObject.fromObject(response.body());
@@ -1111,6 +1130,9 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
} else { } else {
log.info("AGV请求放货设备{}，接口请求立库WMS失败", device_code); log.info("AGV请求放货设备{}，接口请求立库WMS失败", device_code);
} }
} else {
data = AgvService.sendAgvOneModeInst(phase, index, 0);
}
} }
if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver(); standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver();
@@ -1272,6 +1294,9 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
} }
if (device.getDeviceDriver() instanceof StorageConveyorDeviceDriver) { if (device.getDeviceDriver() instanceof StorageConveyorDeviceDriver) {
storageConveyorDeviceDriver = (StorageConveyorDeviceDriver) device.getDeviceDriver(); storageConveyorDeviceDriver = (StorageConveyorDeviceDriver) device.getDeviceDriver();
//如果为acs创建的任务并且任务类型为3，那么就不需要调用立库接口
if (!tag) {
HttpResponse response = acsToXrlkService.AGVWorkStatus(device.getDevice_code(), "1"); HttpResponse response = acsToXrlkService.AGVWorkStatus(device.getDevice_code(), "1");
if (response.getStatus() == 200) { if (response.getStatus() == 200) {
JSONObject jo = JSONObject.fromObject(response.body()); JSONObject jo = JSONObject.fromObject(response.body());
@@ -1283,7 +1308,9 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
} else { } else {
log.info("AGV放货完成反馈设备{}，接口请求立库WMS失败", device_code); log.info("AGV放货完成反馈设备{}，接口请求立库WMS失败", device_code);
} }
} else {
data = AgvService.sendAgvOneModeInst(phase, index, 0);
}
} }
} }
//任务完毕 //任务完毕
@@ -1336,6 +1363,8 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
} }
if (relevance_device.getDeviceDriver() instanceof StorageConveyorDeviceDriver) { if (relevance_device.getDeviceDriver() instanceof StorageConveyorDeviceDriver) {
storageConveyorDeviceDriver = (StorageConveyorDeviceDriver) device.getDeviceDriver(); storageConveyorDeviceDriver = (StorageConveyorDeviceDriver) device.getDeviceDriver();
//如果为acs创建的任务并且任务类型为3，那么就不需要调用立库接口
if (!tag) {
HttpResponse response = acsToXrlkService.invokeDoor(device.getDevice_code()); HttpResponse response = acsToXrlkService.invokeDoor(device.getDevice_code());
if (response.getStatus() == 200) { if (response.getStatus() == 200) {
JSONObject jo = JSONObject.fromObject(response.body()); JSONObject jo = JSONObject.fromObject(response.body());
@@ -1347,6 +1376,10 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
} else { } else {
log.info("AGV请求进入设备{}，接口请求立库WMS失败", device_code); log.info("AGV请求进入设备{}，接口请求立库WMS失败", device_code);
} }
} else {
data = AgvService.sendAgvOneModeInst(phase, index, 0);
}
} }
} }