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

opt：kit套件优化

Browse Source
This commit is contained in:
zhangzq
2026-02-24 10:48:57 +08:00
parent c90204e7f8
commit 36ad0e2b9f
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java
View File

@@ -170,15 +170,15 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
device = deviceAppService.findDeviceByCode(this.devicecode); device = deviceAppService.findDeviceByCode(this.devicecode);
TaskService taskService = SpringContextHolder.getBean("taskServiceImpl"); TaskService taskService = SpringContextHolder.getBean("taskServiceImpl");
TaskDto task = taskService.findByCode(instruction.getTask_code()); TaskDto task = taskService.findByCode(instruction.getTask_code());
if ((StrUtil.startWith(task.getTask_code(), "-"))) {
log.info("定点任务下发agv允许取货信号");
StorageCellDto dto = StorageCellServiceImpl.Storage_Cache_Map.get(instruction.getStart_point_code()); StorageCellDto dto = StorageCellServiceImpl.Storage_Cache_Map.get(instruction.getStart_point_code());
if (dto == null) { if (dto == null) {
log.error(instruction.getStart_point_code()+"Storage_Cache_Map数据不存在"); log.error(instruction.getStart_point_code()+"Storage_Cache_Map数据不存在");
return; return;
} instruction.setOffSet(dto.getAddress()); }
instruction.setOffSetName(instruction.getNext_point_code()); instruction.setOffSet(dto.getAddress());
instruction.setOffSetName(instruction.getStart_point_code());
if ((StrUtil.startWith(task.getTask_code(), "-"))) {
log.info("定点任务下发agv允许取货信号");
HttpResponse result = acsToNDCService.genAgvSchedulingTask(instruction, 10); HttpResponse result = acsToNDCService.genAgvSchedulingTask(instruction, 10);
if (ObjectUtils.isEmpty(result) || result.getStatus() != 200) { if (ObjectUtils.isEmpty(result) || result.getStatus() != 200) {
return; return;
@@ -218,6 +218,13 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
//放货申请 //放货申请
else if (ObjectUtil.isNotEmpty(instruction) && StrUtil.equals(instruction.getNext_point_code(), this.devicecode)) { else if (ObjectUtil.isNotEmpty(instruction) && StrUtil.equals(instruction.getNext_point_code(), this.devicecode)) {
if (agvphase == 3) { if (agvphase == 3) {
StorageCellDto dto = StorageCellServiceImpl.Storage_Cache_Map.get(instruction.getNext_point_code());
if (dto == null) {
log.error(instruction.getStart_point_code()+"Storage_Cache_Map数据不存在");
return;
}
instruction.setOffSet(dto.getAddress());
instruction.setOffSetName(instruction.getNext_point_code());
device = deviceAppService.findDeviceByCode(this.devicecode); device = deviceAppService.findDeviceByCode(this.devicecode);
HttpResponse result = acsToNDCService.genAgvSchedulingTask(instruction, 10); HttpResponse result = acsToNDCService.genAgvSchedulingTask(instruction, 10);
if (ObjectUtils.isEmpty(result) || result.getStatus() != 200) { if (ObjectUtils.isEmpty(result) || result.getStatus() != 200) {
@@ -232,6 +239,13 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
device = deviceAppService.findDeviceByCode(this.devicecode); device = deviceAppService.findDeviceByCode(this.devicecode);
TaskService taskService = SpringContextHolder.getBean("taskServiceImpl"); TaskService taskService = SpringContextHolder.getBean("taskServiceImpl");
TaskDto task = taskService.findByCode(instruction.getTask_code()); TaskDto task = taskService.findByCode(instruction.getTask_code());
StorageCellDto dto = StorageCellServiceImpl.Storage_Cache_Map.get(instruction.getNext_point_code());
if (dto == null) {
log.error(instruction.getStart_point_code()+"Storage_Cache_Map数据不存在");
return;
}
instruction.setOffSet(dto.getAddress());
instruction.setOffSetName(instruction.getNext_point_code());
if ((StrUtil.startWith(task.getTask_code(), "-"))) { if ((StrUtil.startWith(task.getTask_code(), "-"))) {
log.info("定点任务下发agv允许取货信号"); log.info("定点任务下发agv允许取货信号");
HttpResponse result = acsToNDCService.genAgvSchedulingTask(instruction, 10); HttpResponse result = acsToNDCService.genAgvSchedulingTask(instruction, 10);