From 5ce79d36fd4902516605208a7801eed544116638 Mon Sep 17 00:00:00 2001 From: LENOVO <1793460677@qq.com> Date: Mon, 1 Apr 2024 15:09:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=88=9E=E5=8F=B0=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConveyorWithScannerWeightDeviceDriver.java | 11 ++++++++++- .../BoxPackageManipulatorDeviceDriver.java | 3 ++- .../BoxStorageManipulatorDeviceDriver.java | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java index 4551aedf0..21a4e11df 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java @@ -140,6 +140,10 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv String material_barcode = null; String last_material_barcode = null; + String hand_barcode = null; + + String hand_material_barcode = null; + //数量 int qty = 0; int last_qty = 0; @@ -685,6 +689,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv jo.put("device_name", this.getDevice().getDevice_name()); jo.put("mode", mode); + jo.put("hand_barcode", hand_barcode); jo.put("move", move); jo.put("action", action); jo.put("task", task); @@ -695,7 +700,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv jo.put("notCreateTaskMessage", notCreateTaskMessage); jo.put("notCreateInstMessage", notCreateInstMessage); jo.put("feedMessage", LangProcess.msg(feedMessage)); - jo.put("driver_type", "siemens_conveyor"); + jo.put("driver_type", "conveyor_with_scanner_weight"); jo.put("is_click", true); return jo; } @@ -708,6 +713,10 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv } else if (StrUtil.equals(requestSucess, "1")) { this.requireSucess = true; } + String hand_barcode = data.getString("hand_barcode"); + this.setHand_barcode(hand_barcode); + String hand_material_barcode = data.getString("hand_material_barcode"); + this.setHand_material_barcode(hand_material_barcode); } @Override diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java index 5506b97d4..92cc3f01a 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java @@ -149,6 +149,7 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i List putDeviceCodeList = null; + @Override public Device getDevice() { return this.device; @@ -605,7 +606,7 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i jo.put("notCreateTaskMessage", notCreateTaskMessage); jo.put("notCreateInstMessage", notCreateInstMessage); jo.put("feedMessage", LangProcess.msg(feedMessage)); - jo.put("driver_type", "siemens_conveyor"); + jo.put("driver_type", "box_package_manipulator"); jo.put("is_click", true); jo.put("x", x); jo.put("y", y); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java index 3aa349481..cfeaad9c6 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java @@ -561,7 +561,7 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i jo.put("notCreateTaskMessage", notCreateTaskMessage); jo.put("notCreateInstMessage", notCreateInstMessage); jo.put("feedMessage", LangProcess.msg(feedMessage)); - jo.put("driver_type", "siemens_conveyor"); + jo.put("driver_type", "box_storage_manipulator"); jo.put("is_click", true); return jo; }