diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/enums/ErrorEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/enums/ErrorEnum.java index 63dca52..14efbe6 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/enums/ErrorEnum.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/enums/ErrorEnum.java @@ -51,7 +51,12 @@ public enum ErrorEnum { ERROR_37(37, "210037"), ERROR_38(38, "210038"), ERROR_40(40, "210040"), - ERROR_41(41, "210041"); + ERROR_41(41, "210041"), + ERROR_52(52, "210052"), + ERROR_53(53, "210053"), + ERROR_54(54, "210054"), + ERROR_55(55, "210055"), + ERROR_56(56, "210056"); private int code; private String desc; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/ItemProtocol.java index 78d04d7..4afdf52 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/ItemProtocol.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/ItemProtocol.java @@ -102,6 +102,17 @@ public class ItemProtocol { public static String item_to_height_level = "to_height_level"; + /** + *下发木箱层数 + */ + public static String item_to_type = "to_type"; + + /** + *下发高度等级 + */ + public static String item_to_container_type = "to_container_type"; + + private BoxStorageManipulatorDeviceDriver driver; @@ -237,6 +248,8 @@ public class ItemProtocol { list.add(new ItemDto(item_to_height, "木箱高度", "DB601.W18")); list.add(new ItemDto(item_to_barcode, "下发木箱条码", "DB601.STRING1.50")); list.add(new ItemDto(item_to_layer, "下发木箱层数", "DB601.W22")); + list.add(new ItemDto(item_to_type, "下发任务类型", "DB601.STRING1.50")); + list.add(new ItemDto(item_to_container_type, "下发托盘类型", "DB601.W22")); list.add(new ItemDto(item_to_height_level, "下发高度等级", "DB601.W24")); return list; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/enums/StorageTypeEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/enums/StorageTypeEnum.java index 7892d89..7ce8f21 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/enums/StorageTypeEnum.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/enums/StorageTypeEnum.java @@ -22,7 +22,9 @@ public enum StorageTypeEnum { // 这个枚举字段需要跟上位统一 BOX_RETURN_HJ("9", "退货异常申请行架对接位至NG位"), - PACK_ERROR("8", "装箱异常申请任务"); + PACK_ERROR("8", "装箱异常申请任务"), + + CHANGE_LABEL_IN("10","一楼换标入库"); /** * 索引 */