From 9d8e61c25935397e06b3c59085cf28ade2dc7826 Mon Sep 17 00:00:00 2001 From: yanps Date: Fri, 28 Jun 2024 11:27:19 +0800 Subject: [PATCH 1/4] =?UTF-8?q?add:=E6=B7=BB=E5=8A=A0=E8=A1=8C=E6=9E=B6-ag?= =?UTF-8?q?v=E5=AF=B9=E6=8E=A5=E4=BD=8D=E5=8F=96=E8=B4=A7=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E5=8F=8D=E9=A6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/acs/device/driver/manipulator_agv_station.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/acs2/nladmin-ui/src/views/acs/device/driver/manipulator_agv_station.vue b/acs2/nladmin-ui/src/views/acs/device/driver/manipulator_agv_station.vue index 08d9e2a80..e0c4a5037 100644 --- a/acs2/nladmin-ui/src/views/acs/device/driver/manipulator_agv_station.vue +++ b/acs2/nladmin-ui/src/views/acs/device/driver/manipulator_agv_station.vue @@ -80,6 +80,11 @@ + + + + + From 6955df3274bfcbd032acc717ea062d2568be1384 Mon Sep 17 00:00:00 2001 From: yanps Date: Fri, 28 Jun 2024 11:28:54 +0800 Subject: [PATCH 2/4] =?UTF-8?q?opt:=20=E5=8F=96=E8=B4=A7=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=8F=8D=E9=A6=88=E6=97=A5=E5=BF=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java index 9dd4ef120..307923931 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java @@ -684,10 +684,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { String wmsurl = paramService.findByCode(AcsConfig.WMSURL).getValue(); AddressDto addressDto = addressService.findByCode("actionFinishRequest2"); String url = wmsurl + addressDto.getMethods_url(); - log.info("feedbackDie - 反馈管芯请求路径{}", jsonObject); + log.info("actionFinishRequest2 - 设备工位取货完成反馈{}", jsonObject); LuceneLogDto luceneLogDto = new LuceneLogDto(4,"actionFinishRequest2", "", String.valueOf(jsonObject), - "", jsonObject.getString("task_code") + "任务取货完成反馈"); + "", jsonObject.getString("task_code") + "设备工位取货完成反馈"); luceneLogService.interfaceExecuteLog(luceneLogDto); try { execute = HttpRequest.post(url) @@ -701,7 +701,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } catch (Exception e) { LuceneLogDto luceneLogDto = new LuceneLogDto(4,"actionFinishRequest2", String.valueOf(execute.getStatus()), JSON.toJSONString(execute.body()), - String.valueOf(execute.body()), jsonObject.getString("task_code") + "任务取货完成反馈失败"); + String.valueOf(execute.body()), jsonObject.getString("task_code") + "设备工位取货完成反馈失败"); luceneLogService.interfaceExecuteLog(luceneLogDto); } } From ed59096b164c14a56caa0bfcce481172262a417c Mon Sep 17 00:00:00 2001 From: yanps Date: Fri, 28 Jun 2024 16:04:18 +0800 Subject: [PATCH 3/4] =?UTF-8?q?opt:=20=E6=B7=BB=E5=8A=A0=E6=99=AE=E9=80=9A?= =?UTF-8?q?=E7=AB=99=E7=82=B9=E5=8F=96=E8=B4=A7=E5=AE=8C=E6=88=90=E5=8F=8D?= =?UTF-8?q?=E9=A6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agv/ndctwo/AgvNdcTwoDeviceDriver.java | 33 +++++++++++++++---- .../device/driver/standard_ordinary_site.vue | 5 +++ 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java index 6a99fb316..8b2c1dfa8 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java @@ -570,15 +570,30 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); } + String task_code = inst.getTask_code(); + EXECUTOR.submit(() -> { + if(ObjectUtil.isNotEmpty(standardOrdinarySiteDeviceDriver.getDevice().getExtraValue().get("feedbackToLms")) + && StrUtil.equals("true", standardOrdinarySiteDeviceDriver.getDevice().getExtraValue().get("feedbackToLms").toString())){ + JSONObject jsonObject = new JSONObject(); + jsonObject.put("task_code", task_code); + LuceneLogDto logDto = LuceneLogDto.builder() + .device_code(standardOrdinarySiteDeviceDriver.getDevice_code()) + .content("取货完成反馈:" + jsonObject.toJSONString() + ";设备:" + standardOrdinarySiteDeviceDriver.getDevice_code()) + .build(); + logDto.setLog_level(4); + luceneExecuteLogService.deviceExecuteLog(logDto); + acsToWmsService.actionFinishRequest2(jsonObject); + } + }); this.setPhase(phase); } else if (device.getDeviceDriver() instanceof ManipulatorAgvStationDeviceDriver) { manipulatorAgvStationDeviceDriver = (ManipulatorAgvStationDeviceDriver) device.getDeviceDriver(); - try { - manipulatorAgvStationDeviceDriver.writing(3); + /*try { + // manipulatorAgvStationDeviceDriver.writing(3); } catch (Exception e) { e.printStackTrace(); - } + }*/ data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) @@ -588,15 +603,19 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); String task_code = inst.getTask_code(); EXECUTOR.submit(() -> { - boolean feedbackToLms = (boolean)manipulatorAgvStationDeviceDriver.getDevice().getExtraValue().get("feedbackToLms"); - if(feedbackToLms){ + if(ObjectUtil.isNotEmpty(manipulatorAgvStationDeviceDriver.getDevice().getExtraValue().get("feedbackToLms")) + && StrUtil.equals("true", manipulatorAgvStationDeviceDriver.getDevice().getExtraValue().get("feedbackToLms").toString())){ JSONObject jsonObject = new JSONObject(); jsonObject.put("task_code", task_code); + LuceneLogDto logDto1 = LuceneLogDto.builder() + .device_code(manipulatorAgvStationDeviceDriver.getDevice_code()) + .content("取货完成反馈:" + jsonObject.toJSONString() + ";设备:" + manipulatorAgvStationDeviceDriver.getDevice_code()) + .build(); + logDto1.setLog_level(4); + luceneExecuteLogService.deviceExecuteLog(logDto1); acsToWmsService.actionFinishRequest2(jsonObject); } }); - - } else if (device.getDeviceDriver() instanceof HongXiangStationDeviceDriver) { hongXiangStationDeviceDriver = (HongXiangStationDeviceDriver) device.getDeviceDriver(); try { diff --git a/acs2/nladmin-ui/src/views/acs/device/driver/standard_ordinary_site.vue b/acs2/nladmin-ui/src/views/acs/device/driver/standard_ordinary_site.vue index 4c0e63e5c..1e0064849 100644 --- a/acs2/nladmin-ui/src/views/acs/device/driver/standard_ordinary_site.vue +++ b/acs2/nladmin-ui/src/views/acs/device/driver/standard_ordinary_site.vue @@ -38,6 +38,11 @@ + + + + + From a627c9c74caa3ea1f741ab4f23ef2b089a145897 Mon Sep 17 00:00:00 2001 From: yanps Date: Fri, 28 Jun 2024 16:06:14 +0800 Subject: [PATCH 4/4] =?UTF-8?q?opt:=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java index 8b2c1dfa8..bc0e4b48f 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java @@ -588,12 +588,11 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic this.setPhase(phase); } else if (device.getDeviceDriver() instanceof ManipulatorAgvStationDeviceDriver) { manipulatorAgvStationDeviceDriver = (ManipulatorAgvStationDeviceDriver) device.getDeviceDriver(); - - /*try { - // manipulatorAgvStationDeviceDriver.writing(3); + try { + manipulatorAgvStationDeviceDriver.writing(3); } catch (Exception e) { e.printStackTrace(); - }*/ + } data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code)