From 2c4820fff7afc69d17d60ff0dbda960cde2c827d Mon Sep 17 00:00:00 2001 From: "USER-20220102CG\\noblelift" <546428999@qq.com> Date: Thu, 1 Jun 2023 17:16:14 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E5=BD=93=E5=89=8D=E7=A0=81=E5=9E=9B?= =?UTF-8?q?=E4=BD=8D=E4=B8=8A=E6=8A=A5lms?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ItemProtocol.java | 5 + ...nshPackagePalletManipulatorDefination.java | 2 + ...hPackagePalletManipulatorDeviceDriver.java | 24 ++++- ...alletizingManipulatorSiteDeviceDriver.java | 1 + .../lnsh_split_manipulator/ItemProtocol.java | 7 ++ .../LnshSplitManipulatorDefination.java | 2 + .../LnshSplitManipulatorDeviceDriver.java | 27 +++++- .../ItemProtocol.java | 15 +++ ...ckagePalletSplitManipulatorDefination.java | 3 + ...agePalletSplitManipulatorDeviceDriver.java | 97 ++++++++++++++++++- .../acs/ext/wms/service/AcsToWmsService.java | 5 + .../wms/service/impl/AcsToWmsServiceImpl.java | 30 ++++++ .../rljn_package_palletSplit_manipulator.vue | 8 +- 13 files changed, 219 insertions(+), 7 deletions(-) diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/ItemProtocol.java index d4c3ce2..e244e21 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/ItemProtocol.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/ItemProtocol.java @@ -94,6 +94,7 @@ public class ItemProtocol { public static String item_one_qty = "one_qty"; public static String item_two_qty = "two_qty"; public static String item_tool_coordinate = "tool_coordinate"; + public static String item_present_palleting_station = "present_palleting_station"; public static String item_to_feedback = "to_feedback"; public static String item_to_error = "to_error"; @@ -495,6 +496,10 @@ public class ItemProtocol { return this.getOpcIntegerValue(item_tool_coordinate); } + public int getPresent_palleting_station() { + return this.getOpcIntegerValue(item_present_palleting_station); + } + public int getTo_feedback() { return this.getOpcIntegerValue(item_to_feedback); } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDefination.java index 8adac90..d8dde16 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDefination.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDefination.java @@ -138,6 +138,8 @@ public class LnshPackagePalletManipulatorDefination implements OpcDeviceDriverDe list.add(new ItemDto(ItemProtocol.item_getY_offset, "1#抓取Y偏移", "DB56.W1180")); list.add(new ItemDto(ItemProtocol.item_tool_coordinate, "工具坐标", "DB56.W1182")); list.add(new ItemDto(ItemProtocol.item_order_qty, "工单码垛数量", "DB56.W1184")); + list.add(new ItemDto(ItemProtocol.item_present_palleting_station, "当前码垛工位", "DB56.W1186")); + return list; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java index e50fe0c..0551dbb 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java @@ -59,6 +59,8 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD int last_error = 0; Boolean isonline = true; int hasGoods = 0; + int present_palleting_station =0; + int last_present_palleting_station = 0; String message = null; Boolean iserror = false; @@ -341,7 +343,7 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD one_qty = this.itemProtocol.getOne_qty(); two_qty = this.itemProtocol.getTwo_qty(); tool_coordinate = this.itemProtocol.getTool_coordinate(); - + present_palleting_station = this.itemProtocol.getPresent_palleting_station(); if (mode != last_mode) { this.setRequireSucess(false); this.setResultSucess(false); @@ -351,6 +353,25 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); } + if(present_palleting_station != last_present_palleting_station){ + logServer.deviceExecuteLog(this.device_code,"","","信号present_palleting_station：" + last_present_palleting_station + "->" + present_palleting_station); + if(present_palleting_station > 0){ + String linkobj = (String)this.getDevice().getExtraValue().get("link_device_code"); + String demosub = linkobj.substring(1,linkobj.length()-1); + String demoArray[] = demosub.split(","); + List demoList = Arrays.asList(demoArray); + JSONObject json = new JSONObject(); + json.put("device_code",this.device_code); + if(last_present_palleting_station ==0 ){ + json.put("last_palleting_station","0"); + } else { + json.put("last_palleting_station",demoList.get(last_present_palleting_station-1).replace("\"","")); + } + json.put("present_palleting_station",demoList.get(present_palleting_station-1).replace("\"","")); + logServer.deviceExecuteLog(this.device_code,"","","feedBackSplitPalletStation 请求LMS:" + json); + acsToWmsService.feedBackSplitPalletStation(json); + } + } if (status != last_status) { logServer.deviceItemValue(this.device_code,"status" ,String.valueOf(status)); logServer.deviceExecuteLog(this.device_code,"","","信号status：" + last_status + "->" + status); @@ -850,6 +871,7 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD last_container_getQty = container_getQty; last_getX_offset = getX_offset; last_getY_offset = getY_offset; + last_present_palleting_station = present_palleting_station; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_palletizing_manipulator_site/LnshPackagePalletizingManipulatorSiteDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_palletizing_manipulator_site/LnshPackagePalletizingManipulatorSiteDeviceDriver.java index 709f310..6379261 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_palletizing_manipulator_site/LnshPackagePalletizingManipulatorSiteDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_palletizing_manipulator_site/LnshPackagePalletizingManipulatorSiteDeviceDriver.java @@ -383,6 +383,7 @@ public class LnshPackagePalletizingManipulatorSiteDeviceDriver extends AbstractO if (mode != last_mode) { this.setRequireSucess(false); + this.setResultSucess(false); logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/ItemProtocol.java index b81b174..1e0ddd0 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/ItemProtocol.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/ItemProtocol.java @@ -89,6 +89,7 @@ public class ItemProtocol { public static String item_tool_coordinate = "tool_coordinate"; public static String item_order_No = "order_No"; public static String item_order_qty = "order_qty"; + public static String item_present_stripping_station = "present_stripping_station"; public static String item_to_feedback = "to_feedback"; public static String item_to_error = "to_error"; @@ -453,6 +454,12 @@ public class ItemProtocol { return this.getOpcIntegerValue(item_tool_coordinate); } + + public int getPresent_stripping_station() { + return this.getOpcIntegerValue(item_present_stripping_station); + } + + public int getTo_command() { return this.getOpcIntegerValue(item_to_feedback); } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDefination.java index 4d50174..85e9409 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDefination.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDefination.java @@ -133,6 +133,8 @@ public class LnshSplitManipulatorDefination implements OpcDeviceDriverDefination list.add(new ItemDto(ItemProtocol.item_tool_coordinate, "工具坐标", "DB50.D918")); list.add(new ItemDto(ItemProtocol.item_order_qty, "工单数量", "DB50.W920")); list.add(new ItemDto(ItemProtocol.item_order_No, "工单号", "DB50.STRING924.50")); + list.add(new ItemDto(ItemProtocol.item_present_stripping_station, "当前拆垛位", "DB50.W1178")); + return list; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java index 2fe6c57..026157b 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java @@ -120,7 +120,7 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im String last_specifications = ""; int qty = 0; int last_qty = 0; - + int present_stripping_station = 0; //垛型参数 int product_code = 0; int AlongSide = 0; @@ -240,6 +240,8 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im int last_one_qty = 0; int last_two_qty = 0; int last_tool_coordinate = 0; + int last_present_stripping_station =0; + @Override public Device getDevice() { @@ -327,12 +329,34 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im one_qty = this.itemProtocol.getOne_qty(); two_qty = this.itemProtocol.getTwo_qty(); tool_coordinate = this.itemProtocol.getTool_coordinate(); + present_stripping_station = this.itemProtocol.getPresent_stripping_station(); to_command = this.itemProtocol.getTo_command(); if (mode != last_mode) { this.setRequireSucess(false); logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); } + if(present_stripping_station != last_present_stripping_station){ + logServer.deviceExecuteLog(this.device_code,"","","信号present_stripping_station：" + last_present_stripping_station + "->" + present_stripping_station); + + if(present_stripping_station > 0){ + String linkobj = (String)this.getDevice().getExtraValue().get("link_device_code"); + String demosub = linkobj.substring(1,linkobj.length()-1); + String demoArray[] = demosub.split(","); + List demoList = Arrays.asList(demoArray); + JSONObject json = new JSONObject(); + json.put("device_code",this.device_code); + if(last_present_stripping_station ==0 ){ + json.put("last_stripping_station","0"); + } else { + json.put("last_stripping_station",demoList.get(last_present_stripping_station-1).replace("\"","")); + } + json.put("present_stripping_station",demoList.get(present_stripping_station-1).replace("\"","")); + logServer.deviceExecuteLog(this.device_code,"","","feedBackSplitPalletStation 请求LMS:" + json); + + acsToWmsService.feedBackSplitPalletStation(json); + } + } if (getStation != last_getStation) { logServer.deviceItemValue(this.device_code,"getStation" ,String.valueOf(getStation)); logServer.deviceExecuteLog(this.device_code,"","","信号getStation：" + last_getStation + "->" + getStation); @@ -792,6 +816,7 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im last_one_qty = one_qty; last_two_qty = two_qty; last_tool_coordinate = tool_coordinate; + last_present_stripping_station = present_stripping_station; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/ItemProtocol.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/ItemProtocol.java index 13d1aaf..1cd9ff9 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/ItemProtocol.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/ItemProtocol.java @@ -96,6 +96,9 @@ public class ItemProtocol { public static String item_one_qty = "one_qty"; public static String item_two_qty = "two_qty"; public static String item_tool_coordinate = "tool_coordinate"; + public static String item_present_stripping_station = "present_stripping_station"; + public static String item_present_palleting_station = "present_palleting_station"; + public static String item_to_feedback = "to_feedback"; public static String item_to_error = "to_error"; @@ -505,6 +508,17 @@ public class ItemProtocol { return this.getOpcIntegerValue(item_tool_coordinate); } + public int getPresent_stripping_station() { + return this.getOpcIntegerValue(item_present_stripping_station); + } + + + public int getPresent_palleting_station() { + return this.getOpcIntegerValue(item_present_palleting_station); + } + + + public int getTo_feedback() { return this.getOpcIntegerValue(item_to_feedback); } @@ -905,6 +919,7 @@ public class ItemProtocol { list.add(new ItemDto(item_getY_offset, "1#抓取Y偏移", "DB62.W1188")); list.add(new ItemDto(item_tool_coordinate, "工具坐标", "DB62.W1190")); list.add(new ItemDto(item_order_qty, "工单数量", "DB62.W1192")); + return list; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDefination.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDefination.java index 07f013d..8a257ff 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDefination.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDefination.java @@ -140,6 +140,9 @@ public class RljnPackagePalletSplitManipulatorDefination implements OpcDeviceDri list.add(new ItemDto(ItemProtocol.item_getY_offset, "1#抓取Y偏移", "DB62.W1188")); list.add(new ItemDto(ItemProtocol.item_tool_coordinate, "工具坐标", "DB62.W1190")); list.add(new ItemDto(ItemProtocol.item_order_qty, "工单数量", "DB62.W1192")); + list.add(new ItemDto(ItemProtocol.item_present_stripping_station, "当前拆垛工位", "DB62.W1194")); + list.add(new ItemDto(ItemProtocol.item_present_palleting_station, "当前码垛工位", "DB62.W1196")); + return list; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java index ab7d533..a8ef9dc 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java @@ -61,7 +61,10 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe int hasGoods = 0; String message = null; Boolean iserror = false; - + int present_stripping_station = 0; + int last_present_stripping_station = 0; + int present_palleting_station = 0; + int last_present_palleting_station = 0; private Date instruction_require_time = new Date(); private Date instruction_finished_time = new Date(); @@ -349,6 +352,8 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe one_qty = this.itemProtocol.getOne_qty(); two_qty = this.itemProtocol.getTwo_qty(); tool_coordinate = this.itemProtocol.getTool_coordinate(); + present_stripping_station = this.itemProtocol.getPresent_stripping_station(); + present_palleting_station = this.itemProtocol.getPresent_palleting_station(); if (mode != last_mode) { this.setRequireSucess(false); @@ -359,6 +364,94 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); } + if(present_stripping_station != last_present_stripping_station){ + logServer.deviceExecuteLog(this.device_code,"","","信号present_stripping_station：" + last_present_stripping_station + "->" + present_stripping_station); + + if(present_stripping_station > 0 && present_palleting_station > 0){ + String linkobj = (String)this.getDevice().getExtraValue().get("link_device_code"); + String demosub = linkobj.substring(1,linkobj.length()-1); + String demoArray[] = demosub.split(","); + List demoList = Arrays.asList(demoArray); + + String link_palletingobj = (String)this.getDevice().getExtraValue().get("link_palleting_device_code"); + String demo_palletsub = link_palletingobj.substring(1,link_palletingobj.length()-1); + String demo_palletArray[] = demo_palletsub.split(","); + List demo_palletList = Arrays.asList(demo_palletArray); + + JSONObject json = new JSONObject(); + json.put("device_code",this.device_code); + + + if(last_present_stripping_station ==0 ){ + json.put("last_stripping_station","0"); + } else { + json.put("last_stripping_station",demoList.get(last_present_stripping_station-1).replace("\"","")); + } + if(present_stripping_station ==0 ){ + json.put("present_stripping_station","0"); + } else { + json.put("present_stripping_station",demoList.get(present_stripping_station-1).replace("\"","")); + } + + if(last_present_palleting_station ==0 ){ + json.put("last_palleting_station","0"); + } else { + json.put("last_palleting_station",demo_palletList.get(last_present_palleting_station-1).replace("\"","")); + } + if(present_palleting_station ==0 ){ + json.put("present_palleting_station","0"); + } else { + json.put("present_palleting_station",demo_palletList.get(present_palleting_station-1).replace("\"","")); + } + logServer.deviceExecuteLog(this.device_code,"","","feedBackSplitPalletStation 请求LMS:" + json); + + acsToWmsService.feedBackSplitPalletStation(json); + } + } + if(present_palleting_station != last_present_palleting_station){ + logServer.deviceExecuteLog(this.device_code,"","","信号present_palleting_station：" + last_present_palleting_station + "->" + present_palleting_station); + + if(present_palleting_station > 0 && present_stripping_station > 0){ + String linkobj = (String)this.getDevice().getExtraValue().get("link_device_code"); + String demosub = linkobj.substring(1,linkobj.length()-1); + String demoArray[] = demosub.split(","); + List demoList = Arrays.asList(demoArray); + + String link_palletingobj = (String)this.getDevice().getExtraValue().get("link_palleting_device_code"); + String demo_palletsub = link_palletingobj.substring(1,link_palletingobj.length()-1); + String demo_palletArray[] = demo_palletsub.split(","); + List demo_palletList = Arrays.asList(demo_palletArray); + + JSONObject json = new JSONObject(); + json.put("device_code",this.device_code); + + + if(last_present_stripping_station ==0 ){ + json.put("last_stripping_station","0"); + } else { + json.put("last_stripping_station",demoList.get(last_present_stripping_station-1).replace("\"","")); + } + if(present_stripping_station ==0 ){ + json.put("present_stripping_station","0"); + } else { + json.put("present_stripping_station",demoList.get(present_stripping_station-1).replace("\"","")); + } + + if(last_present_palleting_station ==0 ){ + json.put("last_palleting_station","0"); + } else { + json.put("last_palleting_station",demo_palletList.get(last_present_palleting_station-1).replace("\"","")); + } + if(present_palleting_station ==0 ){ + json.put("present_palleting_station","0"); + } else { + json.put("present_palleting_station",demo_palletList.get(present_palleting_station-1).replace("\"","")); + } + logServer.deviceExecuteLog(this.device_code,"","","feedBackSplitPalletStation 请求LMS:" + json); + + acsToWmsService.feedBackSplitPalletStation(json); + } + } if (status != last_status) { logServer.deviceItemValue(this.device_code,"status" ,String.valueOf(status)); logServer.deviceExecuteLog(this.device_code,"","","信号status：" + last_status + "->" + status); @@ -882,6 +975,8 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe last_container_getQty = container_getQty; last_getX_offset = getX_offset; last_getY_offset = getY_offset; + last_present_stripping_station = present_stripping_station; + last_present_palleting_station = present_palleting_station; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java index 0cd5bcc..57e5cb1 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java @@ -165,5 +165,10 @@ public interface AcsToWmsService { */ public HttpResponse feedbackActionStatusToWms(JSONArray arr); + /** + * 反馈当前拆码垛工位 + */ + JSONObject feedBackSplitPalletStation(JSONObject jo); + } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java index af18253..5787f41 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java @@ -435,6 +435,36 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } + + @Override + public JSONObject feedBackSplitPalletStation(JSONObject json) { + try { + MDC.put(log_file_type, log_type); + + } finally { + MDC.remove(log_file_type); + } + String wmsurl = acsConfigService.findConfigFromCache().get(AcsConfig.WMSURL); + AddressDto addressDto = addressService.findByCode("feedBackSplitPalletStation"); + String methods_url = addressDto.getMethods_url(); + String url = wmsurl + methods_url; + + + log.info("feedBackSplitPalletStation----请求参数{}", json.toString()); + HttpResponse result = null; + try { + result = HttpRequest.post(url) + .header("Authorization", token) + .body(String.valueOf(json)) + .execute(); + System.out.println(result); + } catch (Exception e) { + System.out.println(e.getMessage()); + } + log.info("feedBackSplitPalletStation----返回参数{}", result.body()); + return JSONObject.parseObject(result.body()); + } + @Override public JSONObject getVehicleCode(String device_code) { try { diff --git a/acs/qd/src/views/acs/device/driver/lnsh/rljn_package_palletSplit_manipulator.vue b/acs/qd/src/views/acs/device/driver/lnsh/rljn_package_palletSplit_manipulator.vue index d167a85..28d9d58 100644 --- a/acs/qd/src/views/acs/device/driver/lnsh/rljn_package_palletSplit_manipulator.vue +++ b/acs/qd/src/views/acs/device/driver/lnsh/rljn_package_palletSplit_manipulator.vue @@ -114,11 +114,11 @@ - +