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-04 12:16:13 +08:00
parent f86be4543c
commit 9fc0a2feb9
4 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
View File

@@ -148,14 +148,12 @@ public class NDCAgvServiceImpl implements NDCAgvService {
(byte) 0X00, (byte) 0X12, (byte) 0X00, (byte) 0X12,
(byte) 0X00, (byte) 0X01, (byte) 0X00, (byte) 0X01,
(byte) 0X00, (byte) 0X6D, (byte) 0X00, (byte) 0X6D,
(byte) 0X00, (byte) 0X0E, (byte) 0X00, (byte) 0X0A,
(byte) indexhigh, (byte) indexlow, (byte) indexhigh, (byte) indexlow,
(byte) 0X01, (byte) 0X14, (byte) 0X01, (byte) 0X14,
(byte) phasehigh, (byte) phaselow, (byte) phasehigh, (byte) phaselow,
(byte) startPointHigh, (byte) startPointLow, (byte) startPointHigh, (byte) startPointLow,
(byte) nextPointHigh, (byte) nextPointLow, (byte) nextPointHigh, (byte) nextPointLow
(byte) startHighHigh, (byte) startHighLow,
(byte) nextHighHigh, (byte) nextHighLow
}; };

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

@@ -174,17 +174,6 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
logServer.deviceExecuteLog(this.device_code, "", "", "未找到关联编号对应的指令" + ikey); logServer.deviceExecuteLog(this.device_code, "", "", "未找到关联编号对应的指令" + ikey);
return; return;
} }
StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver;
if(device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver){
standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver();
if(standardInspectSiteDeviceDriver.getAction()==1){
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, 0, 0, 0, 0);
}else{
log.info("当前涂板线未允许取货");
return;
}
}
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, 0, 0, 0, 0); data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, 0, 0, 0, 0);
//到达取货等待点 //到达取货等待点
//(需要WCS反馈) //(需要WCS反馈)

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

@@ -56,12 +56,12 @@ public class ItemProtocol {
public int getWeight() { public int getWeight() {
return this.getOpcIntegerValue(item_weight); return this.getOpcIntegerValue(item_weight);
} }
public int getSubTray() { public String getSubTray() {
return this.getOpcIntegerValue(item_sub_tray); return this.getOpcStringValue(item_sub_tray);
} }
public int getMotherTray() { public String getMotherTray() {
return this.getOpcIntegerValue(item_mother_tray); return this.getOpcStringValue(item_mother_tray);
} }
public int getToCommand() { public int getToCommand() {
@@ -97,6 +97,14 @@ public class ItemProtocol {
} }
public String getOpcStringValue(String protocol) {
String value = this.driver.getStringValue(protocol);
if (value != null) {
return value;
}
return "";
}
public static List<ItemDto> getReadableItemDtos() { public static List<ItemDto> getReadableItemDtos() {
ArrayList list = new ArrayList(); ArrayList list = new ArrayList();
list.add(new ItemDto(item_heartbeat, "心跳", "DB600.B0")); list.add(new ItemDto(item_heartbeat, "心跳", "DB600.B0"));

8
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/ssx_site/SsxSiteDeviceDriver.java
View File

@@ -79,10 +79,10 @@ public class SsxSiteDeviceDriver extends AbstractOpcDeviceDriver implements Devi
int last_io_action = 0; int last_io_action = 0;
double weight = 0; double weight = 0;
double last_weight = 0; double last_weight = 0;
int sub_tray = 0; String sub_tray = null;
int last_sub_tray =0; String last_sub_tray = null;
int mother_tray = 0; String mother_tray = null;
int last_mother_tray =0; String last_mother_tray =null;
boolean hasVehicle = false; boolean hasVehicle = false;