Browse Source

更新

master
gengby 2 years ago
parent
commit
db5bbbd28b
  1. 4
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/agv/ItemProtocol.java
  2. 4
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/agv/MaGangAgvDeviceDriver.java
  3. 2
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/led/MaGangLedDeviceDriver.java

4
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/agv/ItemProtocol.java

@ -70,8 +70,8 @@ public class ItemProtocol {
ArrayList list = new ArrayList(); ArrayList list = new ArrayList();
list.add(new ItemDto(item_status, "AGV状态", "DB602.W0")); list.add(new ItemDto(item_status, "AGV状态", "DB602.W0"));
list.add(new ItemDto(item_type, "AGV任务类型", "DB602.W2")); list.add(new ItemDto(item_type, "AGV任务类型", "DB602.W2"));
list.add(new ItemDto(item_x_coordinate, "AGVx坐标", "DB602.D4")); //list.add(new ItemDto(item_x_coordinate, "AGVx坐标", "DB602.D4"));
list.add(new ItemDto(item_y_coordinate, "AGVy坐标", "DB602.D6")); //list.add(new ItemDto(item_y_coordinate, "AGVy坐标", "DB602.D6"));
return list; return list;
} }

4
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/agv/MaGangAgvDeviceDriver.java

@ -99,8 +99,8 @@ public class MaGangAgvDeviceDriver extends AbstractOpcDeviceDriver implements De
device_code = this.getDeviceCode(); device_code = this.getDeviceCode();
status = this.itemProtocol.getStatus(); status = this.itemProtocol.getStatus();
type = this.itemProtocol.getType(); type = this.itemProtocol.getType();
x_coordinate = this.itemProtocol.getX_coordinate(); //x_coordinate = this.itemProtocol.getX_coordinate();
y_coordinate = this.itemProtocol.getY_coordinate(); //y_coordinate = this.itemProtocol.getY_coordinate();
} }

2
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/led/MaGangLedDeviceDriver.java

@ -87,7 +87,7 @@ public class MaGangLedDeviceDriver extends AbstractOpcDeviceDriver implements De
public void execute() throws Exception { public void execute() throws Exception {
String message = null; String message = null;
device_code = this.getDeviceCode(); device_code = this.getDeviceCode();
D01 = this.itemProtocol.getD01(); //D01 = this.itemProtocol.getD01();
} }

Loading…
Cancel
Save