From dc078f9c55af262452fe6bd109308afbf289d4dd Mon Sep 17 00:00:00 2001 From: zhangzq Date: Tue, 9 Jun 2026 16:59:49 +0800 Subject: [PATCH] =?UTF-8?q?add:=E6=A3=80=E6=B5=8B=E7=AB=99=E7=82=B9?= =?UTF-8?q?=EF=BC=8C=E6=89=8B=E5=8A=A8=E4=BB=BB=E5=8A=A1=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=AE=89=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StandardInspectSiteDeviceDriver.java | 88 +++++++++++++++++++ .../wms/service/impl/AcsToHJXServiceImpl.java | 3 + 2 files changed, 91 insertions(+) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java index c6ada05..b471cf9 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java @@ -177,6 +177,28 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp log.error(instruction.getStart_point_code()+"Storage_Cache_Map数据不存在"); return; } + Object ext_system = device.getExtraValue().get("ext_system"); + if ("3".equals(ext_system)){ + JSONObject jo1 = new JSONObject(); + jo1.put("point", this.devicecode); + jo1.put("type", "1"); + jo1.put("containerCode", task.getVehicle_code()); + Object url = device.getExtraValue().get("address"); + if (StringUtil.isEmpty(ext_system)) { + log.error("请求安全交互失败，未配置焊接线IP" + this.devicecode); + return; + } + jo1.put("url", url); + HttpResponse result = acsToHJXService.actionRequest(jo1); + if (result==null){ + return; + } + JSONObject response = JSONObject.parseObject(result.body()); + int code = response.getInteger("code"); + if (code != 200) { + return; + } + } instruction.setOffSet(dto.getAddress()); instruction.setOffSetName(instruction.getStart_point_code()); HttpResponse result = acsToNDCService.genAgvSchedulingTask(instruction, 10); @@ -284,6 +306,28 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp log.error(instruction.getStart_point_code()+"Storage_Cache_Map数据不存在"); return; } + Object ext_system = device.getExtraValue().get("ext_system"); + if ("3".equals(ext_system)){ + JSONObject jo1 = new JSONObject(); + jo1.put("point", this.devicecode); + jo1.put("type", "3"); + jo1.put("containerCode", task.getVehicle_code()); + Object url = device.getExtraValue().get("address"); + if (StringUtil.isEmpty(ext_system)) { + log.error("请求焊接线失败，未配置焊接线IP" + this.devicecode); + return; + } + jo1.put("url", url); + HttpResponse result = acsToHJXService.actionFinish(jo1); + if (result==null){ + return; + } + JSONObject response = JSONObject.parseObject(result.body()); + int code = response.getInteger("code"); + if (code != 200) { + log.error("请求焊接线取货完成失败，焊接线返回失败"); + } + } instruction.setOffSet(dto.getAddress()); instruction.setOffSetName(instruction.getStart_point_code()); HttpResponse result = acsToNDCService.genAgvSchedulingTask(instruction, 10); @@ -419,6 +463,29 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp log.error(instruction.getStart_point_code()+"Storage_Cache_Map数据不存在"); return; } + Object ext_system = device.getExtraValue().get("ext_system"); + if ("3".equals(ext_system)){ + JSONObject jo1 = new JSONObject(); + jo1.put("point", this.devicecode); + jo1.put("type", "2"); + jo1.put("containerCode", task.getVehicle_code()); + Object url = device.getExtraValue().get("address"); + if (StringUtil.isEmpty(ext_system)) { + log.error("请求焊接线请求放货，未配置焊接线IP" + this.devicecode); + return; + } + jo1.put("url", url); + HttpResponse result = acsToHJXService.actionRequest(jo1); + if (result==null){ + return; + } + JSONObject response = JSONObject.parseObject(result.body()); + int code = response.getInteger("code"); + if (code != 200) { + log.error("请求焊接线请求放货失败，焊接线返回失败"); + return; + } + } instruction.setOffSet(dto.getAddress1()); instruction.setOffSetName(instruction.getNext_point_code()); HttpResponse result1 = acsToNDCService.genAgvSchedulingTask(instruction, 10); @@ -529,6 +596,27 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp log.error(instruction.getStart_point_code()+"Storage_Cache_Map数据不存在"); return; } + Object ext_system = device.getExtraValue().get("ext_system"); + if ("3".equals(ext_system)){ + JSONObject jo1 = new JSONObject(); + jo1.put("point", this.devicecode); + jo1.put("type", "4"); + jo1.put("containerCode", task.getVehicle_code()); + Object url = device.getExtraValue().get("address"); + if (StringUtil.isEmpty(ext_system)) { + log.error("请求MES放货完成失败，未配置焊接线IP" + this.devicecode); + } + jo1.put("url", url); + HttpResponse result = acsToHJXService.actionFinish(jo1); + if (result==null){ + return; + } + JSONObject response = JSONObject.parseObject(result.body()); + int code = response.getInteger("code"); + if (code != 200) { + log.error("请求焊接线放货完成失败，焊接线返回失败"); + } + } instruction.setOffSet(dto.getAddress1()); instruction.setOffSetName(instruction.getNext_point_code()); HttpResponse result1 = acsToNDCService.genAgvSchedulingTask(instruction, 10); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToHJXServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToHJXServiceImpl.java index 58891a9..f78621b 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToHJXServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToHJXServiceImpl.java @@ -47,6 +47,8 @@ public class AcsToHJXServiceImpl implements AcsToHJXService { AddressDto addressDto = addressService.findByCode("actionRequest"); String url = wmsurl + addressDto.getMethods_url(); long start = System.currentTimeMillis(); + System.out.println("----------------AcsToHJXService:actionRequest---------------------"+point); + try { log.info("actionRequest-----请求路径:{},输入参数{}", url, jsonObject); LuceneLogDto build = LuceneLogDto.builder() @@ -106,6 +108,7 @@ public class AcsToHJXServiceImpl implements AcsToHJXService { HttpResponse result = null; long start = System.currentTimeMillis(); try { + System.out.println("----------------AcsToHJXService:actionFinish---------------------"+point); log.info("actionFinish-----输入参数{}, 动作请求{}", whereJson,url); LuceneLogDto build = LuceneLogDto.builder() .log(LogLevelEnum.INFO, LogTypeEnum.接口请求, LogDirectEnum.ACS_TO_HJX)