From c7b6d79b38e941242526278ddefe052d2aa84f07 Mon Sep 17 00:00:00 2001 From: lishuai <1793460677@qq.com> Date: Tue, 16 Jan 2024 09:59:11 +0800 Subject: [PATCH] =?UTF-8?q?add:=E5=89=8D=E7=AB=AF=E5=8F=AF=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BoxSubvolumesConveyorDefination.java} | 0 .../BoxSubvolumesConveyorDeviceDriver.java} | 0 .../ItemProtocol.java | 0 .../org/nl/acs/enums/StorageTypeEnum.java | 2 + .../views/acs/device/driver/belt_conveyor.vue | 100 +--- .../one_conveyor/box_storage_out_conveyor.vue | 9 + .../one_conveyor/box_subvolumes_conveyor.vue | 564 ++++++++++++++++++ ...d_product_out_with_bind_lable_conveyor.vue | 9 + .../driver/one_conveyor/fold_disc_site.vue | 9 + .../one_conveyor/scanner_weight_conveyor.vue | 9 + .../one_conveyor/un_box_lable_conveyor.vue | 9 + .../box_package_manipulator.vue | 9 + .../box_storage_manipulator.vue | 9 + .../return_good_manipulator.vue | 9 + .../one_manipulator/trapped_manipulator.vue | 9 + 15 files changed, 648 insertions(+), 99 deletions(-) rename acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/{box_out_subvolumes_conveyor/BoxOutSubvolumesConveyorDefination.java => box_subvolumes_conveyor/BoxSubvolumesConveyorDefination.java} (100%) rename acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/{box_out_subvolumes_conveyor/BoxOutSubvolumesConveyorDeviceDriver.java => box_subvolumes_conveyor/BoxSubvolumesConveyorDeviceDriver.java} (100%) rename acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/{box_out_subvolumes_conveyor => box_subvolumes_conveyor}/ItemProtocol.java (100%) create mode 100644 acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/enums/StorageTypeEnum.java create mode 100644 acs/nladmin-ui/src/views/acs/device/driver/one_conveyor/box_storage_out_conveyor.vue create mode 100644 acs/nladmin-ui/src/views/acs/device/driver/one_conveyor/box_subvolumes_conveyor.vue create mode 100644 acs/nladmin-ui/src/views/acs/device/driver/one_conveyor/finished_product_out_with_bind_lable_conveyor.vue create mode 100644 acs/nladmin-ui/src/views/acs/device/driver/one_conveyor/fold_disc_site.vue create mode 100644 acs/nladmin-ui/src/views/acs/device/driver/one_conveyor/scanner_weight_conveyor.vue create mode 100644 acs/nladmin-ui/src/views/acs/device/driver/one_conveyor/un_box_lable_conveyor.vue create mode 100644 acs/nladmin-ui/src/views/acs/device/driver/one_manipulator/box_package_manipulator.vue create mode 100644 acs/nladmin-ui/src/views/acs/device/driver/one_manipulator/box_storage_manipulator.vue create mode 100644 acs/nladmin-ui/src/views/acs/device/driver/one_manipulator/return_good_manipulator.vue create mode 100644 acs/nladmin-ui/src/views/acs/device/driver/one_manipulator/trapped_manipulator.vue diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_out_subvolumes_conveyor/BoxOutSubvolumesConveyorDefination.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_subvolumes_conveyor/BoxSubvolumesConveyorDefination.java similarity index 100% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_out_subvolumes_conveyor/BoxOutSubvolumesConveyorDefination.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_subvolumes_conveyor/BoxSubvolumesConveyorDefination.java diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_out_subvolumes_conveyor/BoxOutSubvolumesConveyorDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_subvolumes_conveyor/BoxSubvolumesConveyorDeviceDriver.java similarity index 100% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_out_subvolumes_conveyor/BoxOutSubvolumesConveyorDeviceDriver.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_subvolumes_conveyor/BoxSubvolumesConveyorDeviceDriver.java diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_out_subvolumes_conveyor/ItemProtocol.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_subvolumes_conveyor/ItemProtocol.java similarity index 100% rename from acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_out_subvolumes_conveyor/ItemProtocol.java rename to acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_subvolumes_conveyor/ItemProtocol.java diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/enums/StorageTypeEnum.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/enums/StorageTypeEnum.java new file mode 100644 index 0000000..d1165cf --- /dev/null +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/enums/StorageTypeEnum.java @@ -0,0 +1,2 @@ +package org.nl.acs.enums;public enum StorageTypeEnum { +} diff --git a/acs/nladmin-ui/src/views/acs/device/driver/belt_conveyor.vue b/acs/nladmin-ui/src/views/acs/device/driver/belt_conveyor.vue index 24ecf90..e325724 100644 --- a/acs/nladmin-ui/src/views/acs/device/driver/belt_conveyor.vue +++ b/acs/nladmin-ui/src/views/acs/device/driver/belt_conveyor.vue @@ -63,87 +63,6 @@