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

update

Browse Source
This commit is contained in:
张江玮
2023-09-07 16:48:17 +08:00
parent 6a5c490676
commit 4a505caacc
22 changed files with 214 additions and 511 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/LnshOutKilnTrussDeviceDriver.java
View File

@@ -264,7 +264,12 @@ public class LnshOutKilnTrussDeviceDriver extends AbstractOpcDeviceDriver implem
if (result.getStatus() == HttpStatus.OK.value()) {
JSONObject jsonObject = JSONObject.parseObject(result.body());
if (ObjectUtil.isNotEmpty(jsonObject) && "200".equals(jsonObject.getString("status"))) {
this.writing(jsonObject.getBooleanValue("data") ? 22 : 23);
Boolean isPackage = jsonObject.getBoolean("data");
if (isPackage == null) {
this.writing(24);
} else {
this.writing(isPackage ? 22 : 23);
}
this.setRequireSucess(true);
}
}

28
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/ItemProtocol.java
View File

@@ -206,9 +206,9 @@ public class ItemProtocol {
}
public static List<ItemDto> getReadableItemDtos() {
ArrayList list = new ArrayList();
ArrayList<ItemDto> list = new ArrayList<>();
list.add(new ItemDto(item_heartbeat, "心跳", "DB1.B0"));
list.add(new ItemDto(item_mode, "工作模式", "DB1.B1", Boolean.valueOf(true)));
list.add(new ItemDto(item_mode, "工作模式", "DB1.B1", Boolean.TRUE));
list.add(new ItemDto(item_status, "设备状态", "DB1.B2"));
list.add(new ItemDto(item_error, "故障代码", "DB1.B3"));
list.add(new ItemDto(item_putStation, "当前工位", "DB1.D4"));
@@ -230,19 +230,17 @@ public class ItemProtocol {
}
public static List<ItemDto> getWriteableItemDtos() {
ArrayList list = new ArrayList();
list.add(new ItemDto(item_to_feedback, "机器人动作反馈", "DB2.B0"));
list.add(new ItemDto(item_to_error, "故障代码", "DB2.B1"));
list.add(new ItemDto(item_to_material, "物料", "DB2.STRING2.50"));
list.add(new ItemDto(item_to_order_No, "工单号", "DB2.STRING54.50"));
list.add(new ItemDto(item_to_order_qty, "工单数量", "DB2.D106"));
list.add(new ItemDto(item_to_product_code, "产品编号", "DB2.W110"));
list.add(new ItemDto(item_to_AlongSide, "A长边", "DB2.W112"));
list.add(new ItemDto(item_to_BshortSide, "B短边", "DB2.W114"));
list.add(new ItemDto(item_to_Htrapezoidal, "H梯形高", "DB2.W116"));
list.add(new ItemDto(item_to_Wthickness, "W厚度", "DB2.W118"));
list.add(new ItemDto(item_to_on_vehicle_qty, "托盘上数量", "DB2.W120"));
list.add(new ItemDto(item_to_vehicle_type, "托盘类型", "DB2.W122"));
ArrayList<ItemDto> list = new ArrayList<>();
list.add(new ItemDto(item_to_feedback, "机器人动作反馈", "DB2.W0"));
list.add(new ItemDto(item_to_error, "故障代码", "DB2.W2"));
list.add(new ItemDto(item_to_material, "物料", "DB2.STRING4.50"));
list.add(new ItemDto(item_to_order_No, "工单号", "DB2.STRING56.50"));
list.add(new ItemDto(item_to_order_qty, "工单数量", "DB2.D108"));
list.add(new ItemDto(item_to_product_code, "产品编号", "DB2.W112"));
list.add(new ItemDto(item_to_AlongSide, "A长边", "DB2.W114"));
list.add(new ItemDto(item_to_BshortSide, "B短边", "DB2.W116"));
list.add(new ItemDto(item_to_Htrapezoidal, "H梯形高", "DB2.W118"));
list.add(new ItemDto(item_to_Wthickness, "W厚度", "DB2.W120"));
return list;
}

22
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDefination.java
View File

@@ -56,27 +56,7 @@ public class LnshPackagePalletManipulatorDefination implements OpcDeviceDriverDe
}
public static List<ItemDto> getReadableItemDtos2() {
ArrayList list = new ArrayList();
list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "DB1.B0"));
list.add(new ItemDto(ItemProtocol.item_mode, "工作模式", "DB1.B1", Boolean.valueOf(true)));
list.add(new ItemDto(ItemProtocol.item_status, "设备状态", "DB1.B2"));
list.add(new ItemDto(ItemProtocol.item_error, "故障代码", "DB1.B3"));
list.add(new ItemDto(ItemProtocol.item_putStation, "当前工位", "DB1.D4"));
list.add(new ItemDto(ItemProtocol.item_material, "物料", "DB1.STRING8.50"));
list.add(new ItemDto(ItemProtocol.item_qty, "拆/码垛数量", "DB1.D60"));
list.add(new ItemDto(ItemProtocol.item_order_qty, "工单总数量", "DB1.D64"));
list.add(new ItemDto(ItemProtocol.item_open_time, "开机时间", "DB1.STRING68.50"));
list.add(new ItemDto(ItemProtocol.item_standby_time, "待机时间", "DB1.D120"));
list.add(new ItemDto(ItemProtocol.item_production_time, "生产时间", "DB1.D124"));
list.add(new ItemDto(ItemProtocol.item_error_time, "故障时间", "DB1.D128"));
list.add(new ItemDto(ItemProtocol.item_order_No, "工单号", "DB1.STRING132.50"));
list.add(new ItemDto(ItemProtocol.item_product_code, "产品编号", "DB1.W184"));
list.add(new ItemDto(ItemProtocol.item_AlongSide, "A长边", "DB1.W186"));
list.add(new ItemDto(ItemProtocol.item_BshortSide, "B短边", "DB1.W188"));
list.add(new ItemDto(ItemProtocol.item_Htrapezoidal, "H梯形高", "DB1.W190"));
list.add(new ItemDto(ItemProtocol.item_Wthickness, "W厚度", "DB1.W192"));
return list;
return ItemProtocol.getReadableItemDtos();
}
@Override