From 684b6784a679b1ffe853837e585bf37c6b0e4e49 Mon Sep 17 00:00:00 2001 From: "USER-20220102CG\\noblelift" <546428999@qq.com> Date: Tue, 8 Aug 2023 13:08:06 +0800 Subject: [PATCH] =?UTF-8?q?rev=20=E4=B8=8B=E5=8F=91=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ItemProtocol.java | 24 +++++++++---------- .../wms/service/impl/WmsToAcsServiceImpl.java | 4 ---- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/ItemProtocol.java index 7f56303..fb6e4a9 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/ItemProtocol.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/ItemProtocol.java @@ -245,19 +245,19 @@ public class ItemProtocol { public static List 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_on_vehicle_qty, "托盘上数量", "DB2.W120")); - list.add(new ItemDto(item_to_tray_qty, "允许码垛数量", "DB100.W82")); - list.add(new ItemDto(item_to_vehicle_type, "托盘类型", "DB2.W122")); - 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_feedback, "机器人动作反馈", "DB81.B0")); + list.add(new ItemDto(item_to_error, "故障代码", "DB81.B1")); + list.add(new ItemDto(item_to_on_vehicle_qty, "托盘上数量", "DB81.W2")); + list.add(new ItemDto(item_to_tray_qty, "允许码垛数量", "DB81.W4")); + list.add(new ItemDto(item_to_vehicle_type, "托盘类型", "DB81.W6")); + list.add(new ItemDto(item_to_material, "下发物料编号", "DB81.STRING10.50")); + list.add(new ItemDto(item_to_order_No, "工单号", "DB81.STRING62.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_product_code, "产品编号", "DB81.B63")); + list.add(new ItemDto(item_to_AlongSide, "A长边", "DB81.W64")); + list.add(new ItemDto(item_to_BshortSide, "B短边", "DB81.W66")); + list.add(new ItemDto(item_to_Htrapezoidal, "H梯形高", "DB81.W68")); + list.add(new ItemDto(item_to_Wthickness, "W厚度", "DB81.W70")); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index 175e1e4..723fd52 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -361,23 +361,19 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { throw new BadRequestException("物料编号不能为空！"); } lnshPackagePalletManipulatorDeviceDriver.writing("to_order_No", producetask_code); - lnshPackagePalletManipulatorDeviceDriver.writing("to_order_qty", qty); lnshPackagePalletManipulatorDeviceDriver.writing("to_material", material_code); lnshPackagePalletManipulatorDeviceDriver.writing("to_product_code", product_code); lnshPackagePalletManipulatorDeviceDriver.writing("to_AlongSide", AlongSide); lnshPackagePalletManipulatorDeviceDriver.writing("to_BshortSide", BshortSide); lnshPackagePalletManipulatorDeviceDriver.writing("to_Htrapezoidal", Htrapezoidal); lnshPackagePalletManipulatorDeviceDriver.writing("to_Wthickness", Wthickness); - lnshPackagePalletManipulatorDeviceDriver.writing("to_vehicle_type", String.valueOf(json.getIntValue("vehicle_type") - 2)); lnshPackagePalletManipulatorDeviceDriver.writing("to_order_No", producetask_code); - lnshPackagePalletManipulatorDeviceDriver.writing("to_order_qty", qty); lnshPackagePalletManipulatorDeviceDriver.writing("to_material", material_code); lnshPackagePalletManipulatorDeviceDriver.writing("to_product_code", product_code); lnshPackagePalletManipulatorDeviceDriver.writing("to_AlongSide", AlongSide); lnshPackagePalletManipulatorDeviceDriver.writing("to_BshortSide", BshortSide); lnshPackagePalletManipulatorDeviceDriver.writing("to_Htrapezoidal", Htrapezoidal); lnshPackagePalletManipulatorDeviceDriver.writing("to_Wthickness", Wthickness); - lnshPackagePalletManipulatorDeviceDriver.writing("to_vehicle_type", String.valueOf(json.getIntValue("vehicle_type") - 2)); lnshPackagePalletManipulatorDeviceDriver.writing(100); lnshPackagePalletManipulatorDeviceDriver.writing(100); is_flag = true;