From 3d01a08969a94d175abad7f9d5253a5182ca6e26 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Thu, 23 Apr 2026 20:04:18 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../box_manipulator/BoxManipulatorDefination.java | 0 .../box_manipulator/BoxManipulatorDeviceDriver.java | 1 + .../box_manipulator/InteractionJsonDTO.java | 0 .../box_manipulator/ItemProtocol.java | 0 .../enums/Action2Enum.java | 0 .../enums/ActionEnum.java | 0 .../enums/ContainerTypeEnum.java | 0 .../enums/ErrorEnum.java | 0 .../enums/ModeEnum.java | 0 .../enums/MoveEnum.java | 0 .../open_close_manipulator/ItemProtocol.java | 0 .../OpenCloseManipulatorDefination.java | 0 .../OpenCloseManipulatorDeviceDriver.java | 0 .../trapped_manipulator/InteractionJsonDTO.java | 0 .../trapped_manipulator/ItemProtocol.java | 0 .../trapped_manipulator/TrappedManipulatorDefination.java | 0 .../TrappedManipulatorManipulatorDeviceDriver.java | 0 .../belt_conveyor/BeltConveyorDefination.java | 0 .../belt_conveyor/BeltConveyorDeviceDriver.java | 0 .../belt_conveyor/ItemProtocol.java | 0 .../BoxSubvolumesConveyorDefination.java | 0 .../BoxSubvolumesConveyorDeviceDriver.java | 0 .../box_subvolumes_conveyor/ItemProtocol.java | 0 .../enums/ActionEnum.java | 0 .../enums/ContainerTypeEnum.java | 0 .../enums/ErrorEnum.java | 0 .../enums/ModeEnum.java | 0 .../enums/MoveEnum.java | 0 .../enums/ToCommandEnum.java | 0 .../FinishedProductOutBindLableConveyorDefination.java | 0 .../FinishedProductOutBindLableDeviceDriver.java | 0 .../ItemProtocol.java | 0 .../fold_disc_site/FoldDiscSiteDefination.java | 0 .../fold_disc_site/FoldDiscSiteDeviceDriver.java | 0 .../fold_disc_site/ItemProtocol.java | 0 .../ConveyorWithScannerWeightDefination.java | 0 .../ConveyorWithScannerWeightDeviceDriver.java | 6 +++--- .../scanner_weight_conveyor/ItemProtocol.java | 0 .../scanner_weight_conveyor/一楼扫码输送线 | 0 .../un_box_lable_conveyor/ItemProtocol.java | 0 .../un_box_lable_conveyor/UnBoxLableConveyorDefination.java | 0 .../UnBoxLableConveyorDeviceDriver.java | 2 +- .../un_box_lable_conveyor/二楼开盒盖 | 0 .../src/main/java/org/nl/acs/enums/StorageTypeEnum.java | 6 +++--- 44 files changed, 8 insertions(+), 7 deletions(-) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_manipulator => 一楼立库行架}/box_manipulator/BoxManipulatorDefination.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_manipulator => 一楼立库行架}/box_manipulator/BoxManipulatorDeviceDriver.java (99%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_manipulator => 一楼立库行架}/box_manipulator/InteractionJsonDTO.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_manipulator => 一楼立库行架}/box_manipulator/ItemProtocol.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_manipulator => 一楼立库行架}/enums/Action2Enum.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_manipulator => 一楼立库行架}/enums/ActionEnum.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_manipulator => 一楼立库行架}/enums/ContainerTypeEnum.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_manipulator => 一楼立库行架}/enums/ErrorEnum.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_manipulator => 一楼立库行架}/enums/ModeEnum.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_manipulator => 一楼立库行架}/enums/MoveEnum.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_manipulator => 一楼立库行架}/open_close_manipulator/ItemProtocol.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_manipulator => 一楼立库行架}/open_close_manipulator/OpenCloseManipulatorDefination.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_manipulator => 一楼立库行架}/open_close_manipulator/OpenCloseManipulatorDeviceDriver.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_manipulator => 一楼立库行架}/trapped_manipulator/InteractionJsonDTO.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_manipulator => 一楼立库行架}/trapped_manipulator/ItemProtocol.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_manipulator => 一楼立库行架}/trapped_manipulator/TrappedManipulatorDefination.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_manipulator => 一楼立库行架}/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_conveyor => 一楼立库输送线}/belt_conveyor/BeltConveyorDefination.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_conveyor => 一楼立库输送线}/belt_conveyor/BeltConveyorDeviceDriver.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_conveyor => 一楼立库输送线}/belt_conveyor/ItemProtocol.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_conveyor => 一楼立库输送线}/box_subvolumes_conveyor/BoxSubvolumesConveyorDefination.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_conveyor => 一楼立库输送线}/box_subvolumes_conveyor/BoxSubvolumesConveyorDeviceDriver.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_conveyor => 一楼立库输送线}/box_subvolumes_conveyor/ItemProtocol.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_conveyor => 一楼立库输送线}/enums/ActionEnum.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_conveyor => 一楼立库输送线}/enums/ContainerTypeEnum.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_conveyor => 一楼立库输送线}/enums/ErrorEnum.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_conveyor => 一楼立库输送线}/enums/ModeEnum.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_conveyor => 一楼立库输送线}/enums/MoveEnum.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_conveyor => 一楼立库输送线}/enums/ToCommandEnum.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_conveyor => 一楼立库输送线}/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableConveyorDefination.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_conveyor => 一楼立库输送线}/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_conveyor => 一楼立库输送线}/finished_product_out_with_bind_lable_conveyor/ItemProtocol.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_conveyor => 一楼立库输送线}/fold_disc_site/FoldDiscSiteDefination.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_conveyor => 一楼立库输送线}/fold_disc_site/FoldDiscSiteDeviceDriver.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_conveyor => 一楼立库输送线}/fold_disc_site/ItemProtocol.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_conveyor => 一楼立库输送线}/scanner_weight_conveyor/ConveyorWithScannerWeightDefination.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_conveyor => 一楼立库输送线}/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java (99%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_conveyor => 一楼立库输送线}/scanner_weight_conveyor/ItemProtocol.java (100%) create mode 100644 acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/scanner_weight_conveyor/一楼扫码输送线 rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_conveyor => 一楼立库输送线}/un_box_lable_conveyor/ItemProtocol.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_conveyor => 一楼立库输送线}/un_box_lable_conveyor/UnBoxLableConveyorDefination.java (100%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/{lk_conveyor => 一楼立库输送线}/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java (99%) create mode 100644 acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/un_box_lable_conveyor/二楼开盒盖 diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/box_manipulator/BoxManipulatorDefination.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/box_manipulator/BoxManipulatorDefination.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/box_manipulator/BoxManipulatorDefination.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/box_manipulator/BoxManipulatorDefination.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/box_manipulator/BoxManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/box_manipulator/BoxManipulatorDeviceDriver.java similarity index 99% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/box_manipulator/BoxManipulatorDeviceDriver.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/box_manipulator/BoxManipulatorDeviceDriver.java index 59a0a79..eadc54a 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/box_manipulator/BoxManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/box_manipulator/BoxManipulatorDeviceDriver.java @@ -48,6 +48,7 @@ import java.util.concurrent.TimeUnit; /** * 一楼木箱机械手 + * 协议：一楼木箱抓取智能桁架 */ @Slf4j @Data diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/box_manipulator/InteractionJsonDTO.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/box_manipulator/InteractionJsonDTO.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/box_manipulator/InteractionJsonDTO.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/box_manipulator/InteractionJsonDTO.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/box_manipulator/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/box_manipulator/ItemProtocol.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/box_manipulator/ItemProtocol.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/box_manipulator/ItemProtocol.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/enums/Action2Enum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/enums/Action2Enum.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/enums/Action2Enum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/enums/Action2Enum.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/enums/ActionEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/enums/ActionEnum.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/enums/ActionEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/enums/ActionEnum.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/enums/ContainerTypeEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/enums/ContainerTypeEnum.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/enums/ContainerTypeEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/enums/ContainerTypeEnum.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/enums/ErrorEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/enums/ErrorEnum.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/enums/ErrorEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/enums/ErrorEnum.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/enums/ModeEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/enums/ModeEnum.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/enums/ModeEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/enums/ModeEnum.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/enums/MoveEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/enums/MoveEnum.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/enums/MoveEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/enums/MoveEnum.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/open_close_manipulator/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/open_close_manipulator/ItemProtocol.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/open_close_manipulator/ItemProtocol.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/open_close_manipulator/ItemProtocol.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/open_close_manipulator/OpenCloseManipulatorDefination.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/open_close_manipulator/OpenCloseManipulatorDefination.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/open_close_manipulator/OpenCloseManipulatorDefination.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/open_close_manipulator/OpenCloseManipulatorDefination.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/open_close_manipulator/OpenCloseManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/open_close_manipulator/OpenCloseManipulatorDeviceDriver.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/open_close_manipulator/OpenCloseManipulatorDeviceDriver.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/open_close_manipulator/OpenCloseManipulatorDeviceDriver.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/trapped_manipulator/InteractionJsonDTO.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/trapped_manipulator/InteractionJsonDTO.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/trapped_manipulator/InteractionJsonDTO.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/trapped_manipulator/InteractionJsonDTO.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/trapped_manipulator/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/trapped_manipulator/ItemProtocol.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/trapped_manipulator/ItemProtocol.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/trapped_manipulator/ItemProtocol.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/trapped_manipulator/TrappedManipulatorDefination.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/trapped_manipulator/TrappedManipulatorDefination.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/trapped_manipulator/TrappedManipulatorDefination.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/trapped_manipulator/TrappedManipulatorDefination.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/belt_conveyor/BeltConveyorDefination.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/belt_conveyor/BeltConveyorDefination.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/belt_conveyor/BeltConveyorDefination.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/belt_conveyor/BeltConveyorDefination.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/belt_conveyor/BeltConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/belt_conveyor/BeltConveyorDeviceDriver.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/belt_conveyor/BeltConveyorDeviceDriver.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/belt_conveyor/BeltConveyorDeviceDriver.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/belt_conveyor/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/belt_conveyor/ItemProtocol.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/belt_conveyor/ItemProtocol.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/belt_conveyor/ItemProtocol.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/box_subvolumes_conveyor/BoxSubvolumesConveyorDefination.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/box_subvolumes_conveyor/BoxSubvolumesConveyorDefination.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/box_subvolumes_conveyor/BoxSubvolumesConveyorDefination.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/box_subvolumes_conveyor/BoxSubvolumesConveyorDefination.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/box_subvolumes_conveyor/BoxSubvolumesConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/box_subvolumes_conveyor/BoxSubvolumesConveyorDeviceDriver.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/box_subvolumes_conveyor/BoxSubvolumesConveyorDeviceDriver.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/box_subvolumes_conveyor/BoxSubvolumesConveyorDeviceDriver.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/box_subvolumes_conveyor/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/box_subvolumes_conveyor/ItemProtocol.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/box_subvolumes_conveyor/ItemProtocol.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/box_subvolumes_conveyor/ItemProtocol.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/enums/ActionEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/enums/ActionEnum.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/enums/ActionEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/enums/ActionEnum.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/enums/ContainerTypeEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/enums/ContainerTypeEnum.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/enums/ContainerTypeEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/enums/ContainerTypeEnum.java 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/一楼立库输送线/enums/ErrorEnum.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/enums/ErrorEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/enums/ErrorEnum.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/enums/ModeEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/enums/ModeEnum.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/enums/ModeEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/enums/ModeEnum.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/enums/MoveEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/enums/MoveEnum.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/enums/MoveEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/enums/MoveEnum.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/enums/ToCommandEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/enums/ToCommandEnum.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/enums/ToCommandEnum.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/enums/ToCommandEnum.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableConveyorDefination.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableConveyorDefination.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableConveyorDefination.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableConveyorDefination.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/finished_product_out_with_bind_lable_conveyor/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/finished_product_out_with_bind_lable_conveyor/ItemProtocol.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/finished_product_out_with_bind_lable_conveyor/ItemProtocol.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/finished_product_out_with_bind_lable_conveyor/ItemProtocol.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/fold_disc_site/FoldDiscSiteDefination.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/fold_disc_site/FoldDiscSiteDefination.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/fold_disc_site/FoldDiscSiteDefination.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/fold_disc_site/FoldDiscSiteDefination.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/fold_disc_site/FoldDiscSiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/fold_disc_site/FoldDiscSiteDeviceDriver.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/fold_disc_site/FoldDiscSiteDeviceDriver.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/fold_disc_site/FoldDiscSiteDeviceDriver.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/fold_disc_site/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/fold_disc_site/ItemProtocol.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/fold_disc_site/ItemProtocol.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/fold_disc_site/ItemProtocol.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDefination.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/scanner_weight_conveyor/ConveyorWithScannerWeightDefination.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDefination.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/scanner_weight_conveyor/ConveyorWithScannerWeightDefination.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java similarity index 99% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java index 33314e1..8ad6d2c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java @@ -47,7 +47,7 @@ import java.util.concurrent.locks.ReentrantLock; import java.util.stream.Collectors; /** - * 输送线工位-带扫码称重 + * 出入库输送线工位-带扫码称重 */ @Slf4j @Data @@ -381,7 +381,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv } } - //申请入库指令、异常位指令 + //申请入库指令、异常位指令，指令下发 if (this.mode == 2 && this.move > 0 && !this.requireSuccess) { instruction_require(); } @@ -548,7 +548,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv param.put("weight", this.weight); } param.put("type", type); - HttpResponse httpResponse = acsToWmsService.applyTwo(param); + HttpResponse httpResponse = acsToWmsService.c(param); if (ObjectUtil.isNotEmpty(httpResponse)) { JSONObject resp = JSONObject.parseObject(httpResponse.body()); if (resp != null && resp.getIntValue("status") == 200) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/scanner_weight_conveyor/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/scanner_weight_conveyor/ItemProtocol.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/scanner_weight_conveyor/ItemProtocol.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/scanner_weight_conveyor/ItemProtocol.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/scanner_weight_conveyor/一楼扫码输送线 b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/scanner_weight_conveyor/一楼扫码输送线 new file mode 100644 index 0000000..e69de29 diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/un_box_lable_conveyor/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/un_box_lable_conveyor/ItemProtocol.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/un_box_lable_conveyor/ItemProtocol.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/un_box_lable_conveyor/ItemProtocol.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDefination.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/un_box_lable_conveyor/UnBoxLableConveyorDefination.java similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDefination.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/un_box_lable_conveyor/UnBoxLableConveyorDefination.java diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java similarity index 99% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java index 87a9376..b40cffc 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/lk_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java @@ -319,7 +319,7 @@ public class UnBoxLableConveyorDeviceDriver extends AbstractOpcDeviceDriver this.requireTime = currentTimeMillis; JSONObject param = new JSONObject(); param.put("device_code", this.currentDeviceCode); - param.put("material_barcode", vehicleCode); + param.put("vehicle_code", vehicleCode); param.put("task", this.task); String response = acsToWmsService.getIsUncap(param); JSONObject jo = JSON.parseObject(response); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/un_box_lable_conveyor/二楼开盒盖 b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/un_box_lable_conveyor/二楼开盒盖 new file mode 100644 index 0000000..e69de29 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 12c334c..7892d89 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 @@ -16,11 +16,11 @@ public enum StorageTypeEnum { ERROR("4", "异常处理位"), - BOX_IN("5", "木箱入库"), + BOX_IN("7", "木箱装箱开盒盖"), BOX_RETURN("6", "退货入库"), - - BOX_RETURN_HJ("7", "退货异常申请行架任务"), +// 这个枚举字段需要跟上位统一 + BOX_RETURN_HJ("9", "退货异常申请行架对接位至NG位"), PACK_ERROR("8", "装箱异常申请任务"); /**