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

联调fix

Browse Source
This commit is contained in:
psh
2024-04-06 15:52:07 +08:00
parent 7b7a0bca85
commit df534d863a
8 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
View File

@@ -15,6 +15,7 @@ import org.nl.acs.device.domain.Device;
import org.nl.acs.device.service.DeviceService;
import org.nl.acs.device_driver.DeviceDriver;
import org.nl.acs.device_driver.basedriver.siemens_conveyor.SiemensConveyorDeviceDriver;
import org.nl.acs.device_driver.basedriver.ssx_site.SsxSiteDeviceDriver;
import org.nl.acs.device_driver.basedriver.standard_inspect_site.StandardInspectSiteDeviceDriver;
import org.nl.acs.device_driver.basedriver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
import org.nl.acs.device_driver.basedriver.standard_storage.StandardStorageDeviceDriver;
@@ -224,6 +225,12 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
}
}
SsxSiteDeviceDriver ssxSiteDeviceDriver;
if(device.getDeviceDriver() instanceof SsxSiteDeviceDriver){
ssxSiteDeviceDriver = (SsxSiteDeviceDriver) device.getDeviceDriver();
ssxSiteDeviceDriver.writing(9);
}
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, 0, 0, 0, 0);
//到达放货等待点
//(需要WCS反馈)
@@ -298,6 +305,13 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
log.info("未找到编号{}对应的指令", ikey);
return;
}
SsxSiteDeviceDriver ssxSiteDeviceDriver;
if(device.getDeviceDriver() instanceof SsxSiteDeviceDriver){
ssxSiteDeviceDriver = (SsxSiteDeviceDriver) device.getDeviceDriver();
ssxSiteDeviceDriver.writing(9);
}
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, 0, 0, 0, 0);
}
//到达位置点

3
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/fold_disc_site/FoldDiscSiteDefinition.java
View File

@@ -4,7 +4,6 @@ import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
import org.nl.acs.device.domain.Device;
import org.nl.acs.device.enums.DeviceType;
import org.nl.acs.device_driver.DeviceDriver;
import org.nl.acs.device_driver.basedriver.ssx_site.ItemProtocol;
import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination;
import org.springframework.stereotype.Service;
@@ -50,7 +49,7 @@ public class FoldDiscSiteDefinition implements OpcDeviceDriverDefination {
@Override
public List<ItemDto> getReadableItemDtos() {
return org.nl.acs.device_driver.basedriver.ssx_site.ItemProtocol.getReadableItemDtos();
return ItemProtocol.getReadableItemDtos();
}
@Override

2
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/fold_disc_site/ItemProtocol.java
View File

@@ -98,7 +98,7 @@ public class ItemProtocol {
ArrayList<ItemDto> list = new ArrayList<>();
list.add(new ItemDto(item_heartbeat, "心跳", "DB1.B0"));
list.add(new ItemDto(item_mode, "工作模式", "DB1.B1", Boolean.TRUE));
list.add(new ItemDto(item_move, "广电信号", "DB1.B2"));
list.add(new ItemDto(item_move, "光电信号", "DB1.B2"));
list.add(new ItemDto(item_number, "数量", "DB1.B3"));
list.add(new ItemDto(item_error, "error", "DB1.B5"));
list.add(new ItemDto(item_task, "任务号", "DB1.D6"));