From 460e6ebadcc56b4ff68ce58c516ef906646031e0 Mon Sep 17 00:00:00 2001 From: lishuai <1793460677@qq.com> Date: Sat, 23 Dec 2023 17:34:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=97=A5=E5=BF=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../indoor_manipulator/IndoorManipulatorDeviceDriver.java | 4 ++-- .../paper_tube_device2/PaperTubeConveyor2DeviceDriver.java | 4 ++-- .../PluggingUnpluggingMachineDeviceDriver.java | 4 ++-- .../org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java index 8608eef02..e9bced618 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java @@ -150,7 +150,7 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple String message = null; Boolean iserror = false; private Date instruction_update_time = new Date(); - private int instruction_update_time_out = 1000; + private int instruction_update_time_out = 3000; Integer heartbeat_tag; private Date instruction_require_time = new Date(); @@ -507,7 +507,7 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple } else { feedbackSucess = false; message = "申请新取货点失败"; - logServer.deviceExecuteLog(this.device_code, "", "", "申请新取货点,返回参数:" + applyManipulatorActionResponse); + logServer.deviceExecuteLog(this.device_code, "", "", "申请新取货点失败,返回参数:" + applyManipulatorActionResponse); } } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java index 09e314790..85f404b54 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java @@ -524,7 +524,7 @@ public class PaperTubeConveyor2DeviceDriver extends AbstractOpcDeviceDriver impl map3.put("to_command", "4"); this.writing(map3); requireSucess = true; - logServer.deviceExecuteLog(this.device_code, "", "", "申请出纸管,返回参数:" + applyPaperActionResponse); + logServer.deviceExecuteLog(this.device_code, "", "", "申请出纸管成功,返回参数:" + applyPaperActionResponse); message = "申请出货成功"; } else { message = applyPaperActionResponse.getMessage(); @@ -532,7 +532,7 @@ public class PaperTubeConveyor2DeviceDriver extends AbstractOpcDeviceDriver impl this.writing(map3); requireSucess = false; message = "出库顺序错误"; - logServer.deviceExecuteLog(this.device_code, "", "", "申请出纸管,返回参数:" + applyPaperActionResponse); + logServer.deviceExecuteLog(this.device_code, "", "", "申请出纸管顺序错误,返回参数:" + applyPaperActionResponse); } } } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/plugging_unplugging_machine/PluggingUnpluggingMachineDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/plugging_unplugging_machine/PluggingUnpluggingMachineDeviceDriver.java index 601affab1..54b0b4ba0 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/plugging_unplugging_machine/PluggingUnpluggingMachineDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/plugging_unplugging_machine/PluggingUnpluggingMachineDeviceDriver.java @@ -181,7 +181,7 @@ public class PluggingUnpluggingMachineDeviceDriver extends AbstractOpcDeviceDriv map.put("to_command", 6); this.writing(map); requireSucess = true; - logServer.deviceExecuteLog(this.device_code, "", "", "拔轴完成反馈,返回参数:" + applyManipulatorActionResponse); + logServer.deviceExecuteLog(this.device_code, "", "", "拔轴成功反馈,返回参数:" + applyManipulatorActionResponse); message = "拔轴完成成功"; }else{ message = applyManipulatorActionResponse.getMessage(); @@ -189,7 +189,7 @@ public class PluggingUnpluggingMachineDeviceDriver extends AbstractOpcDeviceDriv map.put("to_command", 99); requireSucess = true; message = "拔轴失败"; - logServer.deviceExecuteLog(this.device_code, "", "", "拔轴完成反馈,返回参数:" + applyManipulatorActionResponse); + logServer.deviceExecuteLog(this.device_code, "", "", "拔轴失败反馈,返回参数:" + applyManipulatorActionResponse); } } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java index 364b5c542..f7c9a0318 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java @@ -458,14 +458,14 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { AddressDto addressDto = addressService.findByCode("actionFinishRequest"); String methods_url = addressDto.getMethods_url(); String url = wmsUrl + methods_url; - log.info("ApplyManipulatorActionRequest----请求参数{}", param); + log.info("actionFinishRequest----请求参数{}", param); try { // String result = ""; String result = HttpRequest.post(url) .body(JSON.toJSONString(param)) .execute().body(); JSONObject jsonObject = JSONObject.parseObject(result); - log.info("ApplyManipulatorActionResponse----返回参数{}", result); + log.info("actionFinishResponse----返回参数{}", result); actionFinishRequestResponse = JSONObject.toJavaObject(jsonObject, ApplyManipulatorActionResponse.class); } catch (Exception e) { JSONObject map = new JSONObject();