From 28befb0110182c5f5b46b2e15e7975b48fb95d42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E4=BF=8A=E6=9D=B0?= <9463626+zhou-junjiezjj@user.noreply.gitee.com> Date: Tue, 7 Nov 2023 17:08:58 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E5=88=86=E6=8B=A3=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E7=BB=99=E7=94=B5=E6=B0=94=E7=89=A9=E6=96=99=E8=A7=84=E6=A0=BC?= =?UTF-8?q?=EF=BC=8C=E5=86=99=E5=85=A5=E6=96=B9=E6=B3=95=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agv/ndcone/AgvNdcOneDeviceDriver.java | 86 ++++-- .../ConveyorBarcodeDeviceDriver.java | 158 +++++++---- .../ConveyorPressStationDeviceDriver.java | 118 ++++++-- .../LnshLaminatingMachineDeviceDriver.java | 34 ++- .../LnshFoldDiscSiteDeviceDriver.java | 46 +++- .../LnshMixingMillDeviceDriver.java | 34 ++- .../ItemProtocol.java | 17 +- ...hPackagePalletManipulatorDeviceDriver.java | 57 ++-- .../LnshPackageSiteDeviceDriver.java | 40 ++- ...alletizingManipulatorSiteDeviceDriver.java | 258 ++++++++++++------ .../lnsh_press/LnshPressDeviceDriver.java | 72 ++++- .../lnsh/lnsh_rgv/LnshRGVDeviceDriver.java | 155 ++++++----- .../LnshSplitManipulatorDeviceDriver.java | 255 ++++++++++------- .../lnsh_station/LnshStationDeviceDriver.java | 118 ++++++-- .../package_site/PackageSiteDeviceDriver.java | 1 + .../wms/service/impl/WmsToAcsServiceImpl.java | 118 ++++---- .../src/main/resources/logback-spring.xml | 1 + 17 files changed, 1086 insertions(+), 482 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java index a2311ac..9542896 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java @@ -49,10 +49,7 @@ import org.nl.modules.wql.util.SpringContextHolder; import org.nl.start.auto.run.NDCSocketConnectionAutoRun; import javax.validation.constraints.NotBlank; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * NDC单工位AGV @@ -239,8 +236,10 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic && (lnshPalletizingManipulatorSiteDeviceDriver.getAction() == 3 || lnshPalletizingManipulatorSiteDeviceDriver.getAction() == 1)) { inst.setExecute_status("1"); instructionService.update(inst); - lnshPalletizingManipulatorSiteDeviceDriver.writing(2); data = AgvService.sendAgvOneModeInst(phase, index, 0); + Map map = new LinkedHashMap<>(); + map.put("to_command",2); + lnshPalletizingManipulatorSiteDeviceDriver.writing(map); lnshPalletizingManipulatorSiteDeviceDriver.setMessage(""); flag = true; } else { @@ -276,6 +275,9 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic inst.setExecute_status("1"); instructionService.update(inst); data = AgvService.sendAgvOneModeInst(phase, index, 0); + Map map = new LinkedHashMap<>(); + map.put("to_command",2); + lnshStationDeviceDriver.writing(map); lnshStationDeviceDriver.setMessage(""); flag=true; }else{ @@ -310,7 +312,9 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic && (conveyorPressStationDeviceDriver.getIo_action() == 3 || conveyorPressStationDeviceDriver.getIo_action() == 1) && (conveyorPressStationDeviceDriver.getAction() == 3 || conveyorPressStationDeviceDriver.getAction() == 1)) { data = AgvService.sendAgvOneModeInst(phase, index, 0); - conveyorPressStationDeviceDriver.writing(2); + Map map = new LinkedHashMap<>(); + map.put("to_command",2); + conveyorPressStationDeviceDriver.writing(map); conveyorPressStationDeviceDriver.setMessage(""); flag = true; } else { @@ -367,7 +371,9 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic instructionService.update(inst); data = AgvService.sendAgvOneModeInst(phase, index, 0); conveyorBarcodeDeviceDriver.setMessage(""); - conveyorBarcodeDeviceDriver.writing(2); + Map map = new LinkedHashMap<>(); + map.put("to_command",2); + conveyorBarcodeDeviceDriver.writing(map); flag = true; } else { String message = ""; @@ -395,8 +401,10 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic // && (lnshFoldDiscSiteDeviceDriver.getAction() == 3 || lnshFoldDiscSiteDeviceDriver.getAction() == 1) inst.setExecute_status("1"); instructionService.update(inst); - lnshFoldDiscSiteDeviceDriver.writing(2); data = AgvService.sendAgvOneModeInst(phase, index, 0); + Map map = new LinkedHashMap<>(); + map.put("to_command",2); + lnshFoldDiscSiteDeviceDriver.writing(map); lnshFoldDiscSiteDeviceDriver.setMessage(""); flag = true; } else { @@ -498,9 +506,11 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic && (lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 3 || lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 2) ) { inst.setExecute_status("5"); - lnshPalletizingManipulatorSiteDeviceDriver.writing(3); instructionService.update(inst); data = AgvService.sendAgvOneModeInst(phase, index, 0); + Map map = new LinkedHashMap<>(); + map.put("to_command",3); + lnshPalletizingManipulatorSiteDeviceDriver.writing(map); lnshPalletizingManipulatorSiteDeviceDriver.setMessage(""); flag = true; } else { @@ -530,10 +540,12 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic && lnshStationDeviceDriver.getMove() == 0 && (lnshStationDeviceDriver.getIo_action() == 3 || lnshStationDeviceDriver.getIo_action() == 2) ) { - lnshStationDeviceDriver.writing(3); inst.setExecute_status("5"); instructionService.update(inst); data = AgvService.sendAgvOneModeInst(phase, index, 0); + Map map = new LinkedHashMap<>(); + map.put("to_command",3); + lnshStationDeviceDriver.writing(map); lnshStationDeviceDriver.setMessage(""); flag = true; } else { @@ -559,7 +571,6 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic //标准版-压制对接位 if(device.getDeviceDriver() instanceof ConveyorPressStationDeviceDriver){ conveyorPressStationDeviceDriver = (ConveyorPressStationDeviceDriver) device.getDeviceDriver(); - conveyorPressStationDeviceDriver.writing(3); if (conveyorPressStationDeviceDriver.getMode() != 0 && conveyorPressStationDeviceDriver.getMove() == 0 && (conveyorPressStationDeviceDriver.getIo_action() == 3 || conveyorPressStationDeviceDriver.getIo_action() == 2) @@ -567,6 +578,9 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic inst.setExecute_status("5"); instructionService.update(inst); data = AgvService.sendAgvOneModeInst(phase, index, 0); + Map map = new LinkedHashMap<>(); + map.put("to_command",3); + conveyorPressStationDeviceDriver.writing(map); conveyorPressStationDeviceDriver.setMessage(""); flag = true; } else { @@ -609,11 +623,13 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic //标准版-下发条码输送线 if(device.getDeviceDriver() instanceof ConveyorBarcodeDeviceDriver){ conveyorBarcodeDeviceDriver = (ConveyorBarcodeDeviceDriver) device.getDeviceDriver(); - conveyorBarcodeDeviceDriver.writing(3); if (conveyorBarcodeDeviceDriver.getMode() != 0) { inst.setExecute_status("5"); instructionService.update(inst); data = AgvService.sendAgvOneModeInst(phase, index, 0); + Map map = new LinkedHashMap<>(); + map.put("to_command",3); + conveyorBarcodeDeviceDriver.writing(map); conveyorBarcodeDeviceDriver.setMessage(""); flag = true; } else { @@ -636,7 +652,6 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic //标准版-叠盘机 if(device.getDeviceDriver() instanceof LnshFoldDiscSiteDeviceDriver){ lnshFoldDiscSiteDeviceDriver = (LnshFoldDiscSiteDeviceDriver) device.getDeviceDriver(); - lnshFoldDiscSiteDeviceDriver.writing(3); if (lnshFoldDiscSiteDeviceDriver.getMode() != 0 // && lnshFoldDiscSiteDeviceDriver.getContainer_qty() == 0 // && (lnshFoldDiscSiteDeviceDriver.getIo_action() == 3 || lnshFoldDiscSiteDeviceDriver.getIo_action() == 2) @@ -644,6 +659,9 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic inst.setExecute_status("5"); instructionService.update(inst); data = AgvService.sendAgvOneModeInst(phase, index, 0); + Map map = new LinkedHashMap<>(); + map.put("to_command",3); + lnshFoldDiscSiteDeviceDriver.writing(map); lnshFoldDiscSiteDeviceDriver.setMessage(""); flag = true; } else { @@ -758,10 +776,12 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic && lnshPalletizingManipulatorSiteDeviceDriver.getMove() == 0 && (lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 1 || lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 3) && (lnshPalletizingManipulatorSiteDeviceDriver.getAction() == 2 || lnshPalletizingManipulatorSiteDeviceDriver.getAction() == 3)) { - lnshPalletizingManipulatorSiteDeviceDriver.writing(4); inst.setExecute_status("3"); instructionService.update(inst); data = AgvService.sendAgvOneModeInst(phase, index, 0); + Map map = new LinkedHashMap<>(); + map.put("to_command",4); + lnshPalletizingManipulatorSiteDeviceDriver.writing(map); lnshPalletizingManipulatorSiteDeviceDriver.setMessage(""); flag = true; } else { @@ -794,10 +814,12 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic && lnshStationDeviceDriver.getMove() == 0 && (lnshStationDeviceDriver.getIo_action() == 1 || lnshStationDeviceDriver.getIo_action() == 3) && (lnshStationDeviceDriver.getAction() == 2 || lnshStationDeviceDriver.getAction() == 3)) { - lnshStationDeviceDriver.writing(4); inst.setExecute_status("3"); instructionService.update(inst); data = AgvService.sendAgvOneModeInst(phase, index, 0); + Map map = new LinkedHashMap<>(); + map.put("to_command",4); + lnshStationDeviceDriver.writing(map); lnshStationDeviceDriver.setMessage(""); flag = true; } else { @@ -826,15 +848,16 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic //标准版-压制对接位 if(device.getDeviceDriver() instanceof ConveyorPressStationDeviceDriver){ conveyorPressStationDeviceDriver = (ConveyorPressStationDeviceDriver) device.getDeviceDriver(); - conveyorPressStationDeviceDriver.writing(4); if (conveyorPressStationDeviceDriver.getMode() != 0 && conveyorPressStationDeviceDriver.getMove() == 0 && (conveyorPressStationDeviceDriver.getIo_action() == 1 || conveyorPressStationDeviceDriver.getIo_action() == 3) && (conveyorPressStationDeviceDriver.getAction() == 2 || conveyorPressStationDeviceDriver.getAction() == 3)) { - conveyorPressStationDeviceDriver.writing(4); inst.setExecute_status("3"); instructionService.update(inst); data = AgvService.sendAgvOneModeInst(phase, index, 0); + Map map = new LinkedHashMap<>(); + map.put("to_command",4); + conveyorPressStationDeviceDriver.writing(map); conveyorPressStationDeviceDriver.setMessage(""); flag = true; } else { @@ -881,10 +904,12 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic if(device.getDeviceDriver() instanceof ConveyorBarcodeDeviceDriver){ conveyorBarcodeDeviceDriver = (ConveyorBarcodeDeviceDriver) device.getDeviceDriver(); if (conveyorBarcodeDeviceDriver.getMode() == 2&& conveyorBarcodeDeviceDriver.getMove()==0){ - conveyorBarcodeDeviceDriver.writing(4); inst.setExecute_status("3"); instructionService.update(inst); data = AgvService.sendAgvOneModeInst(phase, index, 0); + Map map = new LinkedHashMap<>(); + map.put("to_command",4); + conveyorBarcodeDeviceDriver.writing(map); conveyorBarcodeDeviceDriver.setMessage(""); flag = true; } else { @@ -912,10 +937,12 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic // && (lnshFoldDiscSiteDeviceDriver.getIo_action() == 1 || lnshFoldDiscSiteDeviceDriver.getIo_action() == 3) // && (lnshFoldDiscSiteDeviceDriver.getAction() == 2 || lnshFoldDiscSiteDeviceDriver.getAction() == 3) ) { - lnshFoldDiscSiteDeviceDriver.writing(4); inst.setExecute_status("3"); instructionService.update(inst); data = AgvService.sendAgvOneModeInst(phase, index, 0); + Map map = new LinkedHashMap<>(); + map.put("to_command",4); + lnshFoldDiscSiteDeviceDriver.writing(map); lnshFoldDiscSiteDeviceDriver.setMessage(""); flag = true; } else { @@ -1013,8 +1040,10 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic && (lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 2 || lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 3)) { inst.setExecute_status("6"); instructionService.update(inst); - lnshPalletizingManipulatorSiteDeviceDriver.writing(5); data = AgvService.sendAgvOneModeInst(phase, index, 0); + Map map = new LinkedHashMap<>(); + map.put("to_command",5); + lnshPalletizingManipulatorSiteDeviceDriver.writing(map); lnshPalletizingManipulatorSiteDeviceDriver.setMessage(""); flag = true; } else { @@ -1045,8 +1074,10 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic && (lnshStationDeviceDriver.getIo_action() == 2 || lnshStationDeviceDriver.getIo_action() == 3)) { inst.setExecute_status("6"); instructionService.update(inst); - lnshStationDeviceDriver.writing(5); data = AgvService.sendAgvOneModeInst(phase, index, 0); + Map map = new LinkedHashMap<>(); + map.put("to_command",5); + lnshStationDeviceDriver.writing(map); lnshStationDeviceDriver.setMessage(""); flag = true; } else { @@ -1078,7 +1109,6 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic && (conveyorPressStationDeviceDriver.getIo_action() == 2 || conveyorPressStationDeviceDriver.getIo_action() == 3)) { inst.setExecute_status("6"); instructionService.update(inst); - conveyorPressStationDeviceDriver.writing(5); TaskDto task=taskService.findByCode(inst.getTask_code()); if(ObjectUtil.isNotEmpty(task)){ String direction=task.getDirection(); @@ -1094,7 +1124,9 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic } data = AgvService.sendAgvOneModeInst(phase, index, 0); - + Map map = new LinkedHashMap<>(); + map.put("to_command",5); + conveyorPressStationDeviceDriver.writing(map); conveyorPressStationDeviceDriver.setMessage(""); flag = true; } else { @@ -1140,11 +1172,13 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic if (conveyorBarcodeDeviceDriver.getMode() == 2){ inst.setExecute_status("6"); instructionService.update(inst); - conveyorBarcodeDeviceDriver.writing(5); if(ObjectUtil.isNotEmpty(inst.getVehicle_code())){ conveyorBarcodeDeviceDriver.writing("to_barcode",inst.getVehicle_code()); } data = AgvService.sendAgvOneModeInst(phase, index, 0); + Map map = new LinkedHashMap<>(); + map.put("to_command",5); + conveyorBarcodeDeviceDriver.writing(map); TaskDto task=taskService.findByCode(inst.getTask_code()); String material=task.getDirection(); conveyorBarcodeDeviceDriver.setMessage(""); @@ -1176,8 +1210,10 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic ) { inst.setExecute_status("6"); instructionService.update(inst); - lnshFoldDiscSiteDeviceDriver.writing(5); data = AgvService.sendAgvOneModeInst(phase, index, 0); + Map map = new LinkedHashMap<>(); + map.put("to_command",5); + lnshFoldDiscSiteDeviceDriver.writing(map); lnshFoldDiscSiteDeviceDriver.setMessage(""); flag = true; } else { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/converor_barcode/ConveyorBarcodeDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/converor_barcode/ConveyorBarcodeDeviceDriver.java index f670f69..6adc07f 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/converor_barcode/ConveyorBarcodeDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/converor_barcode/ConveyorBarcodeDeviceDriver.java @@ -38,10 +38,7 @@ import org.nl.modules.wql.util.SpringContextHolder; import org.openscada.opc.lib.da.Server; import java.lang.reflect.Method; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 下发条码输送线工位 @@ -508,11 +505,15 @@ public class ConveyorBarcodeDeviceDriver extends AbstractOpcDeviceDriver impleme ApplyTaskResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)),ApplyTaskResponse.class); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); message = RequestMethodEnum.getName("apply_put_full_vehicle") + "apply_put_full_vehicle 接口请求成功" + resp.getMessage(); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("apply_put_full_vehicle") + "apply_put_full_vehicle 接口请求失败" + resp.getMessage();; } lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(request))); @@ -543,10 +544,14 @@ public class ConveyorBarcodeDeviceDriver extends AbstractOpcDeviceDriver impleme lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("apply_put_empty_vehicle") + "apply_put_empty_vehicle 接口请求失败" + resp.getMessage();; } return true; @@ -576,10 +581,14 @@ public class ConveyorBarcodeDeviceDriver extends AbstractOpcDeviceDriver impleme lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("apply_take_empty_vehicle") + "apply_take_empty_vehicle 接口请求失败" + resp.getMessage();; } return true; @@ -623,10 +632,14 @@ public class ConveyorBarcodeDeviceDriver extends AbstractOpcDeviceDriver impleme lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("apply_take_full_vehicle") + "apply_take_full_vehicle 接口请求失败" + resp.getMessage();; } return true; @@ -673,10 +686,14 @@ public class ConveyorBarcodeDeviceDriver extends AbstractOpcDeviceDriver impleme lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("apply_force_take_full_vehicle") + "apply_force_take_full_vehicle 接口请求失败" + resp.getMessage();; } return true; @@ -699,6 +716,7 @@ public class ConveyorBarcodeDeviceDriver extends AbstractOpcDeviceDriver impleme request.setRequest_medthod_code(Thread.currentThread().getStackTrace()[1].getMethodName()); request.setRequest_medthod_name(RequestMethodEnum.getName(Thread.currentThread().getStackTrace()[1].getMethodName())); request.setWeight(String.valueOf(weight)); + request.setVehicle_code(String.valueOf(barcode)); ApplyTaskResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)),ApplyTaskResponse.class); @@ -706,10 +724,14 @@ public class ConveyorBarcodeDeviceDriver extends AbstractOpcDeviceDriver impleme lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("apply_force_take_full_vehicle_in_storage") + "apply_force_take_full_vehicle_in_storage 接口请求失败" + resp.getMessage();; } return true; @@ -739,11 +761,14 @@ public class ConveyorBarcodeDeviceDriver extends AbstractOpcDeviceDriver impleme lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); - this.writing("to_barcode",String.valueOf(resp.getWeight())); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("barcode_success_apply") + "barcode_success_apply 接口请求失败" + resp.getMessage();; } return true; @@ -768,15 +793,18 @@ public class ConveyorBarcodeDeviceDriver extends AbstractOpcDeviceDriver impleme request.setWeight(String.valueOf(weight)); request.setVehicle_code(String.valueOf(barcode)); ApplyTaskResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)),ApplyTaskResponse.class); - message = RequestMethodEnum.getName("get_vehicle_info") + "get_vehicle_info 接口请求LMS..."; lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("get_vehicle_info") + "get_vehicle_info 接口请求失败" + resp.getMessage();; } return true; @@ -805,10 +833,14 @@ public class ConveyorBarcodeDeviceDriver extends AbstractOpcDeviceDriver impleme lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("force_no_package") + "force_no_package 接口请求失败" + resp.getMessage();; } return true; @@ -820,34 +852,64 @@ public class ConveyorBarcodeDeviceDriver extends AbstractOpcDeviceDriver impleme } +// /** +// * 申请贴标 +// */ +// public synchronized boolean apply_labelling() { +// if(move > 0) { +// ApplyTaskRequest request = new ApplyTaskRequest(); +// request.setDevice_code(this.getDevice_code()); +// request.setRequest_medthod_code(Thread.currentThread().getStackTrace()[1].getMethodName()); +// request.setRequest_medthod_name(RequestMethodEnum.getName(Thread.currentThread().getStackTrace()[1].getMethodName())); +// request.setWeight(String.valueOf(weight)); +// request.setVehicle_code(String.valueOf(barcode)); +// ApplyTaskResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)),ApplyTaskResponse.class); +// +// message = RequestMethodEnum.getName("apply_labelling") + "apply_labelling 接口请求LMS..."; +// lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); +// +// if (resp.getCode() == 200) { +// this.writing(200); +// this.setRequireSucess(true); +// } else { +// this.writing(400); +// message = RequestMethodEnum.getName("apply_labelling") + "apply_labelling 接口请求失败" + resp.getMessage();; +// } +// return true; +// } else { +// message = RequestMethodEnum.getName("apply_labelling") + "apply_labelling 设备无货未请求LMS..."; +// lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message)); +// return false; +// } +// } /** - * 申请贴标 + * 多个信号一起下发电气 + * + * @param map */ - public synchronized boolean apply_labelling() { - if(move > 0) { - ApplyTaskRequest request = new ApplyTaskRequest(); - request.setDevice_code(this.getDevice_code()); - request.setRequest_medthod_code(Thread.currentThread().getStackTrace()[1].getMethodName()); - request.setRequest_medthod_name(RequestMethodEnum.getName(Thread.currentThread().getStackTrace()[1].getMethodName())); - request.setWeight(String.valueOf(weight)); - request.setVehicle_code(String.valueOf(barcode)); - ApplyTaskResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)),ApplyTaskResponse.class); - message = RequestMethodEnum.getName("apply_labelling") + "apply_labelling 接口请求LMS..."; - lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); - - if (resp.getCode() == 200) { - this.writing(200); - this.setRequireSucess(true); - } else { - this.writing(400); - message = RequestMethodEnum.getName("apply_labelling") + "apply_labelling 接口请求失败" + resp.getMessage();; + public void writing(Map map) { + LuceneExecuteLogService lucene = SpringContextHolder.getBean(LuceneExecuteLogService.class); + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); + Map itemMap = new LinkedHashMap<>(); + map.forEach((key, value) -> { + if (ObjectUtil.isNotEmpty(value)) { + itemMap.put(getToParam() + key, value); } - return true; - } else { - message = RequestMethodEnum.getName("apply_labelling") + "apply_labelling 设备无货未请求LMS..."; - lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message)); - return false; + }); + if (ObjectUtil.isNotEmpty(itemMap)) { + this.control(itemMap); + logServer.deviceExecuteLog(this.getDevice().getDevice_code(), "", "", "下发多个电气信号:" + itemMap); + lucene.deviceExecuteLog(new LuceneLogDto(this.getDeviceCode(), "下发多个电气信号:" + itemMap)); } } + /** + * 抽取统一下发电气信号前缀 + * + * @return + */ + public String getToParam() { + return this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + "."; + } + } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/conveyor_press_station/ConveyorPressStationDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/conveyor_press_station/ConveyorPressStationDeviceDriver.java index 016ee71..4c4ea1d 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/conveyor_press_station/ConveyorPressStationDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/conveyor_press_station/ConveyorPressStationDeviceDriver.java @@ -38,10 +38,7 @@ import org.nl.modules.wql.util.SpringContextHolder; import org.openscada.opc.lib.da.Server; import java.lang.reflect.Method; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 晟华-工位(交互模板) @@ -498,10 +495,14 @@ public class ConveyorPressStationDeviceDriver extends AbstractOpcDeviceDriver im ApplyTaskResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)),ApplyTaskResponse.class); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("apply_put_full_vehicle") + "apply_put_full_vehicle 接口请求失败" + resp.getMessage();; } lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message)); @@ -532,10 +533,14 @@ public class ConveyorPressStationDeviceDriver extends AbstractOpcDeviceDriver im lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("apply_put_empty_vehicle") + "apply_put_empty_vehicle 接口请求失败" + resp.getMessage();; } return true; @@ -565,12 +570,16 @@ public class ConveyorPressStationDeviceDriver extends AbstractOpcDeviceDriver im lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); message = RequestMethodEnum.getName("apply_take_empty_vehicle") + "apply_take_empty_vehicle 接口请求成功" + resp.getMessage(); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("apply_take_empty_vehicle") + "apply_take_empty_vehicle 接口请求失败" + resp.getMessage(); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); } @@ -602,10 +611,14 @@ public class ConveyorPressStationDeviceDriver extends AbstractOpcDeviceDriver im lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("apply_take_full_vehicle") + "apply_take_full_vehicle 接口请求失败" + resp.getMessage();; } return true; @@ -635,10 +648,14 @@ public class ConveyorPressStationDeviceDriver extends AbstractOpcDeviceDriver im lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("apply_force_take_full_vehicle") + "apply_force_take_full_vehicle 接口请求失败" + resp.getMessage();; } return true; @@ -668,10 +685,14 @@ public class ConveyorPressStationDeviceDriver extends AbstractOpcDeviceDriver im lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("apply_force_take_full_vehicle_in_storage") + "apply_force_take_full_vehicle_in_storage 接口请求失败" + resp.getMessage();; } return true; @@ -702,18 +723,24 @@ public class ConveyorPressStationDeviceDriver extends AbstractOpcDeviceDriver im if (resp.getCode() == 200) { if(StrUtil.equals(resp.getIs_standing_finish(),"1")){ - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); message = RequestMethodEnum.getName("barcode_success_apply") + "barcode_success_apply 接口请求成功" + resp.getMessage(); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); }else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("barcode_success_apply") + "barcode_success_apply 接口请求失败" + "没有静置完成"; message = RequestMethodEnum.getName("barcode_success_apply") + "barcode_success_apply 接口请求失败" + resp.getMessage(); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); } } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("barcode_success_apply") + "barcode_success_apply 接口请求失败" + resp.getMessage(); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); } @@ -744,10 +771,14 @@ public class ConveyorPressStationDeviceDriver extends AbstractOpcDeviceDriver im lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("get_vehicle_info") + "get_vehicle_info 接口请求失败" + resp.getMessage();; } return true; @@ -776,10 +807,14 @@ public class ConveyorPressStationDeviceDriver extends AbstractOpcDeviceDriver im lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("force_no_package") + "force_no_package 接口请求失败" + resp.getMessage();; } return true; @@ -808,10 +843,14 @@ public class ConveyorPressStationDeviceDriver extends AbstractOpcDeviceDriver im lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("apply_labelling") + "apply_labelling 接口请求失败" + resp.getMessage();; } return true; @@ -821,6 +860,35 @@ public class ConveyorPressStationDeviceDriver extends AbstractOpcDeviceDriver im return false; } } + /** + * 多个信号一起下发电气 + * + * @param map + */ + + public void writing(Map map) { + LuceneExecuteLogService lucene = SpringContextHolder.getBean(LuceneExecuteLogService.class); + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); + Map itemMap = new LinkedHashMap<>(); + map.forEach((key, value) -> { + if (ObjectUtil.isNotEmpty(value)) { + itemMap.put(getToParam() + key, value); + } + }); + if (ObjectUtil.isNotEmpty(itemMap)) { + this.control(itemMap); + logServer.deviceExecuteLog(this.getDevice().getDevice_code(), "", "", "下发多个电气信号:" + itemMap); + lucene.deviceExecuteLog(new LuceneLogDto(this.getDeviceCode(), "下发多个电气信号:" + itemMap)); + } + } + /** + * 抽取统一下发电气信号前缀 + * + * @return + */ + public String getToParam() { + return this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + "."; + } public void checkHeartbeat() { Integer heartbeat_temp = null; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java index ad0310d..3e91e49 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java @@ -34,10 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import java.lang.reflect.Field; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 晟华-覆膜机 @@ -391,4 +388,33 @@ public class LnshLaminatingMachineDeviceDriver extends AbstractOpcDeviceDriver i public void setDeviceStatus(JSONObject data) { } + /** + * 多个信号一起下发电气 + * + * @param map + */ + + public void writing(Map map) { + LuceneExecuteLogService lucene = SpringContextHolder.getBean(LuceneExecuteLogService.class); + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); + Map itemMap = new LinkedHashMap<>(); + map.forEach((key, value) -> { + if (ObjectUtil.isNotEmpty(value)) { + itemMap.put(getToParam() + key, value); + } + }); + if (ObjectUtil.isNotEmpty(itemMap)) { + this.control(itemMap); + logServer.deviceExecuteLog(this.getDevice().getDevice_code(), "", "", "下发多个电气信号:" + itemMap); + lucene.deviceExecuteLog(new LuceneLogDto(this.getDeviceCode(), "下发多个电气信号:" + itemMap)); + } + } + /** + * 抽取统一下发电气信号前缀 + * + * @return + */ + public String getToParam() { + return this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + "."; + } } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/LnshFoldDiscSiteDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/LnshFoldDiscSiteDeviceDriver.java index d069f77..aee24aa 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/LnshFoldDiscSiteDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/LnshFoldDiscSiteDeviceDriver.java @@ -33,10 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import java.lang.reflect.Method; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 晟华叠盘机 @@ -265,18 +262,51 @@ public class LnshFoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implem if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); message = RequestMethodEnum.getName("apply_take_empty_vehicle") + "apply_take_empty_vehicle 接口请求成功" + resp.getMessage(); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("apply_take_empty_vehicle") + "apply_take_empty_vehicle 接口请求失败" + resp.getMessage(); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); } return true; } + /** + * 多个信号一起下发电气 + * + * @param map + */ + + public void writing(Map map) { + LuceneExecuteLogService lucene = SpringContextHolder.getBean(LuceneExecuteLogService.class); + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); + Map itemMap = new LinkedHashMap<>(); + map.forEach((key, value) -> { + if (ObjectUtil.isNotEmpty(value)) { + itemMap.put(getToParam() + key, value); + } + }); + if (ObjectUtil.isNotEmpty(itemMap)) { + this.control(itemMap); + logServer.deviceExecuteLog(this.getDevice().getDevice_code(), "", "", "下发多个电气信号:" + itemMap); + lucene.deviceExecuteLog(new LuceneLogDto(this.getDeviceCode(), "下发多个电气信号:" + itemMap)); + } + } + /** + * 抽取统一下发电气信号前缀 + * + * @return + */ + public String getToParam() { + return this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + "."; + } public void writing(String param, String value) { @@ -336,7 +366,9 @@ public class LnshFoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implem if (result.getStatus() == HttpStatus.OK.value()) { JSONObject jsonObject = JSONObject.parseObject(result.body()); if (ObjectUtil.isNotEmpty(jsonObject) && "200".equals(jsonObject.getString("status"))) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); } } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDeviceDriver.java index ec3ef7b..b11f13e 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDeviceDriver.java @@ -35,10 +35,7 @@ import org.openscada.opc.lib.da.Server; import java.lang.reflect.Field; import java.lang.reflect.Method; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 晟华混碾机 @@ -232,6 +229,35 @@ public class LnshMixingMillDeviceDriver extends AbstractOpcDeviceDriver implemen logServer.deviceExecuteLog(this.device_code, "", "", "to_command 写入 " + command); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "to_command 写入 " + command)); } + /** + * 多个信号一起下发电气 + * + * @param map + */ + + public void writing(Map map) { + LuceneExecuteLogService lucene = SpringContextHolder.getBean(LuceneExecuteLogService.class); + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); + Map itemMap = new LinkedHashMap<>(); + map.forEach((key, value) -> { + if (ObjectUtil.isNotEmpty(value)) { + itemMap.put(getToParam() + key, value); + } + }); + if (ObjectUtil.isNotEmpty(itemMap)) { + this.control(itemMap); + logServer.deviceExecuteLog(this.getDevice().getDevice_code(), "", "", "下发多个电气信号:" + itemMap); + lucene.deviceExecuteLog(new LuceneLogDto(this.getDeviceCode(), "下发多个电气信号:" + itemMap)); + } + } + /** + * 抽取统一下发电气信号前缀 + * + * @return + */ + public String getToParam() { + return this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + "."; + } public void writing(int type, int command) { String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() 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 fb6e4a9..0959df1 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 @@ -27,6 +27,7 @@ public class ItemProtocol { public static String item_production_time = "production_time"; public static String item_error_time = "error_time"; public static String item_order_No = "order_No"; + public static String item_formula = "formula"; public static String item_product_code = "product_code"; public static String item_AlongSide = "AlongSide"; public static String item_BshortSide = "BshortSide"; @@ -49,8 +50,7 @@ public class ItemProtocol { public static String item_to_on_vehicle_qty = "to_on_vehicle_qty"; public static String item_to_vehicle_type = "to_vehicle_type"; public static String item_to_tray_qty = "to_tray_qty"; - - + public static String item_to_formula = "to_formula"; private LnshPackagePalletManipulatorDeviceDriver driver; public ItemProtocol(LnshPackagePalletManipulatorDeviceDriver driver) { @@ -61,6 +61,10 @@ public class ItemProtocol { return this.getOpcIntegerValue(item_heartbeat); } + + public String getFormula() { + return this.getOpcStringValue(item_formula); + } public int getToTrayQty() { return this.getOpcIntegerValue(item_to_tray_qty); } @@ -97,6 +101,10 @@ public class ItemProtocol { return this.getOpcIntegerValue(item_qty); } + public int getToFormula() { + return this.getOpcIntegerValue(item_to_formula); + } + public int getOrder_qty() { return this.getOpcIntegerValue(item_order_qty); } @@ -235,6 +243,7 @@ public class ItemProtocol { list.add(new ItemDto(item_order_No, "工单号", "DB80.STRING128.50")); list.add(new ItemDto(item_grab_station, "当前抓取工位", "DB80.B130")); list.add(new ItemDto(item_place_station, "当前放置工位", "DB80.B132")); + list.add(new ItemDto(item_formula, "配方代号", "DB80.STRING182.50")); // list.add(new ItemDto(item_product_code, "产品编号", "DB1.W184")); // list.add(new ItemDto(item_AlongSide, "A长边", "DB1.W186")); // list.add(new ItemDto(item_BshortSide, "B短边", "DB1.W188")); @@ -258,9 +267,7 @@ public class ItemProtocol { 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")); - - - + list.add(new ItemDto(item_to_formula, "配方代号", "DB81.STRING124.50")); return list; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java index fffa987..79785c2 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java @@ -429,12 +429,16 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD ApplyTaskResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)),ApplyTaskResponse.class); if (resp.getCode() == 200) { - this.writing(101); + Map map = new LinkedHashMap<>(); + map.put("to_feedback",101); + this.writing(map); this.setRequireSucess(true); message = RequestMethodEnum.getName("order_verify") + "order_verify 接口请求成功" + resp.getMessage(); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_feedback",400); + this.writing(map); message = RequestMethodEnum.getName("order_verify") + "order_verify 接口请求失败" + resp.getMessage(); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); @@ -456,12 +460,13 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD ApplyTaskResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)),ApplyTaskResponse.class); if (resp.getCode() == 200) { - this.writing(102); this.setRequireSucess(true); message = RequestMethodEnum.getName("order_finish") + "order_finish 接口请求成功" + resp.getMessage(); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_feedback",400); + this.writing(map); message = RequestMethodEnum.getName("order_finish") + "order_finish 接口请求失败" + resp.getMessage(); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); } @@ -505,18 +510,6 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD return flag; } - public void writing(int feedback) { - String to_feedback = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_feedback; - String opcservcerid = this.getDevice().getOpc_server_id(); - Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - itemMap.put(to_feedback, feedback); - ReadUtil.write(itemMap, server); - server.disconnect(); - logServer.deviceExecuteLog(this.device_code, "", "", "to_feedback 写入 " + feedback); - lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "to_feedback 写入 " + feedback)); - } public void writing(String param, String value) { @@ -532,6 +525,36 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD logServer.deviceExecuteLog(this.device_code, "", "", param + " 写入 " + value); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, param + " 写入 " + value)); } + /** + * 多个信号一起下发电气 + * + * @param map + */ + + public void writing(Map map) { + LuceneExecuteLogService lucene = SpringContextHolder.getBean(LuceneExecuteLogService.class); + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); + Map itemMap = new LinkedHashMap<>(); + map.forEach((key, value) -> { + if (ObjectUtil.isNotEmpty(value)) { + itemMap.put(getToParam() + key, value); + } + }); + if (ObjectUtil.isNotEmpty(itemMap)) { + this.control(itemMap); + logServer.deviceExecuteLog(this.getDevice().getDevice_code(), "", "", "下发多个电气信号:" + itemMap); + lucene.deviceExecuteLog(new LuceneLogDto(this.getDeviceCode(), "下发多个电气信号:" + itemMap)); + } + } + /** + * 抽取统一下发电气信号前缀 + * + * @return + */ + public String getToParam() { + return this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + "."; + } + @Override public JSONObject getDeviceStatusName() throws Exception { @@ -611,7 +634,7 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD jo.put("Wthickness", Wthickness); jo.put("isError", iserror); jo.put("isOnline", isonline); - jo.put("message", message); + return jo; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/LnshPackageSiteDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/LnshPackageSiteDeviceDriver.java index c07fc01..4b29cd3 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/LnshPackageSiteDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_site/LnshPackageSiteDeviceDriver.java @@ -20,13 +20,12 @@ import org.nl.acs.monitor.DeviceStageMonitor; import org.nl.acs.opc.Device; import org.nl.acs.route.service.RouteLineService; import org.nl.acs.task.service.TaskService; +import org.nl.modules.lucene.service.LuceneExecuteLogService; +import org.nl.modules.lucene.service.dto.LuceneLogDto; import org.nl.modules.wql.util.SpringContextHolder; import org.openscada.opc.lib.da.Server; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 晟华-包装线工位 @@ -40,6 +39,9 @@ public class LnshPackageSiteDeviceDriver extends AbstractOpcDeviceDriver impleme InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); + LuceneExecuteLogService lucene = SpringContextHolder.getBean("luceneExecuteLogServiceImpl"); + + DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl"); RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl"); @@ -238,6 +240,36 @@ public class LnshPackageSiteDeviceDriver extends AbstractOpcDeviceDriver impleme logServer.deviceExecuteLog(this.device_code, "", "", param + " 写入 " + value); } + /** + * 多个信号一起下发电气 + * + * @param map + */ + + public void writing(Map map) { + LuceneExecuteLogService lucene = SpringContextHolder.getBean(LuceneExecuteLogService.class); + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); + Map itemMap = new LinkedHashMap<>(); + map.forEach((key, value) -> { + if (ObjectUtil.isNotEmpty(value)) { + itemMap.put(getToParam() + key, value); + } + }); + if (ObjectUtil.isNotEmpty(itemMap)) { + this.control(itemMap); + logServer.deviceExecuteLog(this.getDevice().getDevice_code(), "", "", "下发多个电气信号:" + itemMap); + lucene.deviceExecuteLog(new LuceneLogDto(this.getDeviceCode(), "下发多个电气信号:" + itemMap)); + } + } + /** + * 抽取统一下发电气信号前缀 + * + * @return + */ + public String getToParam() { + return this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + "."; + } + public String toString() { return ""; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java index 70968c2..80075e0 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java @@ -744,10 +744,14 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); ApplyTaskResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)),ApplyTaskResponse.class); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",102); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); this.setIserror(true); message = RequestMethodEnum.getName("apply_put_full_vehicle") + "apply_put_full_vehicle 接口请求失败" + resp.getMessage();; } @@ -776,12 +780,12 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic // message = RequestMethodEnum.getName("apply_put_empty_vehicle") + "apply_put_empty_vehicle 接口请求LMS..."; // lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); // if (resp.getCode() == 200) { -// this.writing(200); +// map.put(200); // this.setRequireSucess(true); // message = RequestMethodEnum.getName("apply_put_empty_vehicle") + "apply_put_empty_vehicle 接口请求成功" + resp.getMessage(); // lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); // } else { -// this.writing(400); +// map.put(400); // this.setIserror(true); // message = RequestMethodEnum.getName("apply_put_empty_vehicle") + "apply_put_empty_vehicle 接口请求失败" + resp.getMessage(); // lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); @@ -803,10 +807,17 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic if (resp.getCode() == 200) { this.writing(200); this.setRequireSucess(true); + if(resp.getIs_satisfy()==1){ + this.writing(20); + this.writing(20); + log.info("下发20,库存不足"); + } message = RequestMethodEnum.getName("apply_put_empty_vehicle") + "apply_put_empty_vehicle 接口请求成功" + resp.getMessage(); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); this.setIserror(true); message = RequestMethodEnum.getName("apply_put_empty_vehicle") + "apply_put_empty_vehicle 接口请求失败" + resp.getMessage(); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); @@ -832,10 +843,14 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); this.setIserror(true); message = RequestMethodEnum.getName("apply_take_empty_vehicle") + "apply_take_empty_vehicle 接口请求失败" + resp.getMessage();; } @@ -911,12 +926,20 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic // log.info("{}",JSON.toJSONString(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)))); if (resp.getCode() == 200) { - this.writing(200); this.setRequireSucess(true); + if(resp.getIs_satisfy()==1){ + Map map = new LinkedHashMap<>(); + map.put("to_command",20); + writing(map); + message = RequestMethodEnum.getName("apply_take_full_vehicle") + "给电气下发20货架没有对应库存无库存"; + } + this.writing(200); message = RequestMethodEnum.getName("apply_take_full_vehicle") + "apply_take_full_vehicle 接口请求成功" + resp.getMessage(); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); this.setIserror(true); message = RequestMethodEnum.getName("apply_take_full_vehicle") + "apply_take_full_vehicle 接口请求失败" + resp.getMessage(); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); @@ -947,12 +970,16 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); message = RequestMethodEnum.getName("apply_force_take_full_vehicle") + "apply_force_take_full_vehicle 接口请求成功" + resp.getMessage(); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); this.setIserror(true); message = RequestMethodEnum.getName("apply_force_take_full_vehicle") + "apply_force_take_full_vehicle 接口请求失败" + resp.getMessage(); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); @@ -978,15 +1005,20 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic request.setRequest_medthod_name(RequestMethodEnum.getName(Thread.currentThread().getStackTrace()[1].getMethodName())); request.setWeight(String.valueOf(weight)); request.setVehicle_code(String.valueOf(barcode)); + request.setQty(String.valueOf(encoder_qty)); ApplyTaskResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)),ApplyTaskResponse.class); message = RequestMethodEnum.getName("apply_force_take_full_vehicle_in_storage") + "apply_force_take_full_vehicle_in_storage 接口请求LMS..."; lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); this.setIserror(true); message = RequestMethodEnum.getName("apply_force_take_full_vehicle_in_storage") + "apply_force_take_full_vehicle_in_storage 接口请求失败" + resp.getMessage();; } @@ -1016,11 +1048,15 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); - this.writing(resp.getIs_standing_finish(),"1"); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + map.put(resp.getIs_standing_finish(),"1"); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); this.setIserror(true); message = RequestMethodEnum.getName("barcode_success_apply") + "barcode_success_apply 接口请求失败" + resp.getMessage();; } @@ -1045,18 +1081,24 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic request.setRequest_medthod_name(RequestMethodEnum.getName(Thread.currentThread().getStackTrace()[1].getMethodName())); request.setVehicle_code(String.valueOf(barcode)); GetPalletizeResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)),GetPalletizeResponse.class); + message = RequestMethodEnum.getName("get_vehicle_info") + "get_vehicle_info 接口请求LMS..."; lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { if(ObjectUtil.isNotEmpty(resp.getPalletizeDto())){ PalletizeDto dto = resp.getPalletizeDto(); - } - this.writing(200); + Integer qty=resp.getMaterial_qty(); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + map.put("to_tray_qty",qty); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); this.setIserror(true); message = RequestMethodEnum.getName("get_vehicle_info") + "get_vehicle_info 接口请求失败" + resp.getMessage();; } @@ -1085,10 +1127,14 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); this.setIserror(true); message = RequestMethodEnum.getName("force_no_package") + "force_no_package 接口请求失败" + resp.getMessage();; } @@ -1117,10 +1163,14 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(false); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); this.setIserror(true); message = RequestMethodEnum.getName("apply_labelling") + "apply_labelling 接口请求失败" + resp.getMessage();; } @@ -1184,6 +1234,8 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic + "." + ItemProtocol.item_to_target; String to_task = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + "." + ItemProtocol.item_to_task; + String to_tray_qty = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + + "." + ItemProtocol.item_to_tray_qty; String opcservcerid = this.getDevice().getOpc_server_id(); Server server = ReadUtil.getServer(opcservcerid); Map itemMap = new HashMap(); @@ -1191,9 +1243,10 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic itemMap.put(to_command, command); } else if (type == 2) { itemMap.put(to_target, command); - } else if (type == 3) { itemMap.put(to_task, command); + }else if(type==4){ + itemMap.put(to_tray_qty, command); } ReadUtil.write(itemMap, server); server.disconnect(); @@ -1349,7 +1402,9 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic if (ObjectUtil.isNotEmpty(jsonObject) && "200".equals(jsonObject.getString("status"))) { JSONObject content = jsonObject.getJSONObject("data"); if (ObjectUtil.isEmpty(content)) { - this.writing(20); + Map map = new LinkedHashMap<>(); + map.put("to_command",20); + this.writing(map); this.setRequireSucess(true); } else { String qty = content.getString("qty"); @@ -1407,62 +1462,64 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic String Htrapezoidal = content.getString("htrapezoidal"); String Wthickness = content.getString("wthickness"); - this.writing("to_product_code", StrUtil.isBlank(product_code) ? "0" : product_code); - this.writing("to_AlongSide", StrUtil.isBlank(AlongSide) ? "0" : AlongSide); - this.writing("to_BshortSide", StrUtil.isBlank(BshortSide) ? "0" : BshortSide); - this.writing("to_Htrapezoidal", StrUtil.isBlank(Htrapezoidal) ? "0" : Htrapezoidal); - this.writing("to_Wthickness", StrUtil.isBlank(Wthickness) ? "0" : Wthickness); + Map map = new LinkedHashMap<>(); + map.put("to_product_code", StrUtil.isBlank(product_code) ? "0" : product_code); + map.put("to_AlongSide", StrUtil.isBlank(AlongSide) ? "0" : AlongSide); + map.put("to_BshortSide", StrUtil.isBlank(BshortSide) ? "0" : BshortSide); + map.put("to_Htrapezoidal", StrUtil.isBlank(Htrapezoidal) ? "0" : Htrapezoidal); + map.put("to_Wthickness", StrUtil.isBlank(Wthickness) ? "0" : Wthickness); //当前托盘砖数量 - this.writing("to_tray_qty", StrUtil.isBlank(qty) ? "0" : qty); - this.writing("to_tray_high", StrUtil.isBlank(tray_high) ? "0" : tray_high); - this.writing("to_crib_category", StrUtil.isBlank(crib_category) ? "0" : crib_category); - this.writing("to_palletX1_line", StrUtil.isBlank(palletX1_line) ? "0" : palletX1_line); - this.writing("to_palletY1_row", StrUtil.isBlank(palletY1_row) ? "0" : palletY1_row); - this.writing("to_palletA1_angle", StrUtil.isBlank(palletA1_angle) ? "0" : palletA1_angle); - this.writing("to_palletX2_line", StrUtil.isBlank(palletX2_line) ? "0" : palletX2_line); - this.writing("to_palletY2_row", StrUtil.isBlank(palletY2_row) ? "0" : palletY2_row); - this.writing("to_palletA2_angle", StrUtil.isBlank(palletA2_angle) ? "0" : palletA2_angle); - this.writing("to_palletX3_line", StrUtil.isBlank(palletX3_line) ? "0" : palletX3_line); - this.writing("to_palletY3_row", StrUtil.isBlank(palletY3_row) ? "0" : palletY3_row); - this.writing("to_palletA3_angle", StrUtil.isBlank(palletA3_angle) ? "0" : palletA3_angle); - this.writing("to_pressCribX1_line", StrUtil.isBlank(pressCribX1_line) ? "0" : pressCribX1_line); - this.writing("to_pressCribY1_row", StrUtil.isBlank(pressCribY1_row) ? "0" : pressCribY1_row); - this.writing("to_pressCribA1_angle", StrUtil.isBlank(pressCribA1_angle) ? "0" : pressCribA1_angle); - this.writing("to_pressCribX2_line", StrUtil.isBlank(pressCribX2_line) ? "0" : pressCribX2_line); - this.writing("to_pressCribY2_row", StrUtil.isBlank(pressCribY2_row) ? "0" : pressCribY2_row); - this.writing("to_pressCribA2_angle", StrUtil.isBlank(pressCribA2_angle) ? "0" : pressCribA2_angle); - this.writing("to_pressCribX3_line", StrUtil.isBlank(pressCribX3_line) ? "0" : pressCribX3_line); - this.writing("to_pressCribY3_row", StrUtil.isBlank(pressCribY3_row) ? "0" : pressCribY3_row); - this.writing("to_pressCribA3_angle", StrUtil.isBlank(pressCribA3_angle) ? "0" : pressCribA3_angle); - this.writing("to_Zoffset", StrUtil.isBlank(Zoffset) ? "0" : Zoffset); - this.writing("to_pallet_layerQty", StrUtil.isBlank(pallet_layerQty) ? "0" : pallet_layerQty); - this.writing("to_pressCrib_layerQty", StrUtil.isBlank(pressCrib_layerQty) ? "0" : pressCrib_layerQty); - this.writing("to_codeLayerX1_interval", StrUtil.isBlank(codeLayerX1_interval) ? "0" : codeLayerX1_interval); - this.writing("to_codeLayerY1_interval", StrUtil.isBlank(codeLayerY1_interval) ? "0" : codeLayerY1_interval); - this.writing("to_codeLayerX2_interval", StrUtil.isBlank(codeLayerX2_interval) ? "0" : codeLayerX2_interval); - this.writing("to_codeLayerY2_interval", StrUtil.isBlank(codeLayerY2_interval) ? "0" : codeLayerY2_interval); - this.writing("to_codeLayerX3_interval", StrUtil.isBlank(codeLayerX3_interval) ? "0" : codeLayerX3_interval); - this.writing("to_codeLayerY3_interval", StrUtil.isBlank(codeLayerY3_interval) ? "0" : codeLayerY3_interval); - this.writing("to_codeLayerX1_offset", StrUtil.isBlank(codeLayerX1_offset) ? "0" : codeLayerX1_offset); - this.writing("to_codeLayerY1_offset", StrUtil.isBlank(codeLayerY1_offset) ? "0" : codeLayerY1_offset); - this.writing("to_codeLayerX2_offset", StrUtil.isBlank(codeLayerX2_offset) ? "0" : codeLayerX2_offset); - this.writing("to_codeLayerY2_offset", StrUtil.isBlank(codeLayerY2_offset) ? "0" : codeLayerY2_offset); - this.writing("to_codeLayerX3_offset", StrUtil.isBlank(codeLayerX3_offset) ? "0" : codeLayerX3_offset); - this.writing("to_codeLayerY3_offset", StrUtil.isBlank(codeLayerY3_offset) ? "0" : codeLayerY3_offset); - this.writing("to_pressLayerX1_interval", StrUtil.isBlank(pressLayerX1_interval) ? "0" : pressLayerX1_interval); - this.writing("to_pressLayerY1_interval", StrUtil.isBlank(pressLayerY1_interval) ? "0" : pressLayerY1_interval); - this.writing("to_pressLayerX2_interval", StrUtil.isBlank(pressLayerX2_interval) ? "0" : pressLayerX2_interval); - this.writing("to_pressLayerY2_interval", StrUtil.isBlank(pressLayerY2_interval) ? "0" : pressLayerY2_interval); - this.writing("to_pressLayerX3_interval", StrUtil.isBlank(pressLayerX3_interval) ? "0" : pressLayerX3_interval); - this.writing("to_pressLayerY3_interval", StrUtil.isBlank(pressLayerY3_interval) ? "0" : pressLayerY3_interval); - this.writing("to_pressLayerX1_offset", StrUtil.isBlank(pressLayerX1_offset) ? "0" : pressLayerX1_offset); - this.writing("to_pressLayerY1_offset", StrUtil.isBlank(pressLayerY1_offset) ? "0" : pressLayerY1_offset); - this.writing("to_pressLayerX2_offset", StrUtil.isBlank(pressLayerX2_offset) ? "0" : pressLayerX2_offset); - this.writing("to_pressLayerY2_offset", StrUtil.isBlank(pressLayerY2_offset) ? "0" : pressLayerY2_offset); - this.writing("to_pressLayerX3_offset", StrUtil.isBlank(pressLayerX3_offset) ? "0" : pressLayerX3_offset); - this.writing("to_pressLayerY3_offset", StrUtil.isBlank(pressLayerY3_offset) ? "0" : pressLayerY3_offset); - this.writing("to_tool_coordinate", StrUtil.isBlank(tool_coordinate) ? "0" : tool_coordinate); - this.writing(200); + map.put("to_tray_qty", StrUtil.isBlank(qty) ? "0" : qty); + map.put("to_tray_high", StrUtil.isBlank(tray_high) ? "0" : tray_high); + map.put("to_crib_category", StrUtil.isBlank(crib_category) ? "0" : crib_category); + map.put("to_palletX1_line", StrUtil.isBlank(palletX1_line) ? "0" : palletX1_line); + map.put("to_palletY1_row", StrUtil.isBlank(palletY1_row) ? "0" : palletY1_row); + map.put("to_palletA1_angle", StrUtil.isBlank(palletA1_angle) ? "0" : palletA1_angle); + map.put("to_palletX2_line", StrUtil.isBlank(palletX2_line) ? "0" : palletX2_line); + map.put("to_palletY2_row", StrUtil.isBlank(palletY2_row) ? "0" : palletY2_row); + map.put("to_palletA2_angle", StrUtil.isBlank(palletA2_angle) ? "0" : palletA2_angle); + map.put("to_palletX3_line", StrUtil.isBlank(palletX3_line) ? "0" : palletX3_line); + map.put("to_palletY3_row", StrUtil.isBlank(palletY3_row) ? "0" : palletY3_row); + map.put("to_palletA3_angle", StrUtil.isBlank(palletA3_angle) ? "0" : palletA3_angle); + map.put("to_pressCribX1_line", StrUtil.isBlank(pressCribX1_line) ? "0" : pressCribX1_line); + map.put("to_pressCribY1_row", StrUtil.isBlank(pressCribY1_row) ? "0" : pressCribY1_row); + map.put("to_pressCribA1_angle", StrUtil.isBlank(pressCribA1_angle) ? "0" : pressCribA1_angle); + map.put("to_pressCribX2_line", StrUtil.isBlank(pressCribX2_line) ? "0" : pressCribX2_line); + map.put("to_pressCribY2_row", StrUtil.isBlank(pressCribY2_row) ? "0" : pressCribY2_row); + map.put("to_pressCribA2_angle", StrUtil.isBlank(pressCribA2_angle) ? "0" : pressCribA2_angle); + map.put("to_pressCribX3_line", StrUtil.isBlank(pressCribX3_line) ? "0" : pressCribX3_line); + map.put("to_pressCribY3_row", StrUtil.isBlank(pressCribY3_row) ? "0" : pressCribY3_row); + map.put("to_pressCribA3_angle", StrUtil.isBlank(pressCribA3_angle) ? "0" : pressCribA3_angle); + map.put("to_Zoffset", StrUtil.isBlank(Zoffset) ? "0" : Zoffset); + map.put("to_pallet_layerQty", StrUtil.isBlank(pallet_layerQty) ? "0" : pallet_layerQty); + map.put("to_pressCrib_layerQty", StrUtil.isBlank(pressCrib_layerQty) ? "0" : pressCrib_layerQty); + map.put("to_codeLayerX1_interval", StrUtil.isBlank(codeLayerX1_interval) ? "0" : codeLayerX1_interval); + map.put("to_codeLayerY1_interval", StrUtil.isBlank(codeLayerY1_interval) ? "0" : codeLayerY1_interval); + map.put("to_codeLayerX2_interval", StrUtil.isBlank(codeLayerX2_interval) ? "0" : codeLayerX2_interval); + map.put("to_codeLayerY2_interval", StrUtil.isBlank(codeLayerY2_interval) ? "0" : codeLayerY2_interval); + map.put("to_codeLayerX3_interval", StrUtil.isBlank(codeLayerX3_interval) ? "0" : codeLayerX3_interval); + map.put("to_codeLayerY3_interval", StrUtil.isBlank(codeLayerY3_interval) ? "0" : codeLayerY3_interval); + map.put("to_codeLayerX1_offset", StrUtil.isBlank(codeLayerX1_offset) ? "0" : codeLayerX1_offset); + map.put("to_codeLayerY1_offset", StrUtil.isBlank(codeLayerY1_offset) ? "0" : codeLayerY1_offset); + map.put("to_codeLayerX2_offset", StrUtil.isBlank(codeLayerX2_offset) ? "0" : codeLayerX2_offset); + map.put("to_codeLayerY2_offset", StrUtil.isBlank(codeLayerY2_offset) ? "0" : codeLayerY2_offset); + map.put("to_codeLayerX3_offset", StrUtil.isBlank(codeLayerX3_offset) ? "0" : codeLayerX3_offset); + map.put("to_codeLayerY3_offset", StrUtil.isBlank(codeLayerY3_offset) ? "0" : codeLayerY3_offset); + map.put("to_pressLayerX1_interval", StrUtil.isBlank(pressLayerX1_interval) ? "0" : pressLayerX1_interval); + map.put("to_pressLayerY1_interval", StrUtil.isBlank(pressLayerY1_interval) ? "0" : pressLayerY1_interval); + map.put("to_pressLayerX2_interval", StrUtil.isBlank(pressLayerX2_interval) ? "0" : pressLayerX2_interval); + map.put("to_pressLayerY2_interval", StrUtil.isBlank(pressLayerY2_interval) ? "0" : pressLayerY2_interval); + map.put("to_pressLayerX3_interval", StrUtil.isBlank(pressLayerX3_interval) ? "0" : pressLayerX3_interval); + map.put("to_pressLayerY3_interval", StrUtil.isBlank(pressLayerY3_interval) ? "0" : pressLayerY3_interval); + map.put("to_pressLayerX1_offset", StrUtil.isBlank(pressLayerX1_offset) ? "0" : pressLayerX1_offset); + map.put("to_pressLayerY1_offset", StrUtil.isBlank(pressLayerY1_offset) ? "0" : pressLayerY1_offset); + map.put("to_pressLayerX2_offset", StrUtil.isBlank(pressLayerX2_offset) ? "0" : pressLayerX2_offset); + map.put("to_pressLayerY2_offset", StrUtil.isBlank(pressLayerY2_offset) ? "0" : pressLayerY2_offset); + map.put("to_pressLayerX3_offset", StrUtil.isBlank(pressLayerX3_offset) ? "0" : pressLayerX3_offset); + map.put("to_pressLayerY3_offset", StrUtil.isBlank(pressLayerY3_offset) ? "0" : pressLayerY3_offset); + map.put("to_tool_coordinate", StrUtil.isBlank(tool_coordinate) ? "0" : tool_coordinate); + map.put("to_command",200); + this.writing(map); } this.setRequireSucess(true); } @@ -1561,7 +1618,9 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic if (result.getStatus() == HttpStatus.OK.value()) { JSONObject jsonObject = JSONObject.parseObject(result.body()); if (ObjectUtil.isNotEmpty(jsonObject) && "200".equals(jsonObject.getString("status"))) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); } } @@ -1590,7 +1649,9 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic if (result.getStatus() == HttpStatus.OK.value()) { JSONObject jsonObject = JSONObject.parseObject(result.body()); if (ObjectUtil.isNotEmpty(jsonObject) && "200".equals(jsonObject.getString("status"))) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); } } @@ -1619,7 +1680,9 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic if (result.getStatus() == HttpStatus.OK.value()) { JSONObject jsonObject = JSONObject.parseObject(result.body()); if (ObjectUtil.isNotEmpty(jsonObject) && "200".equals(jsonObject.getString("status"))) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); } } @@ -1627,5 +1690,34 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic return true; } } + /** + * 多个信号一起下发电气 + * + * @param map + */ + + public void writing(Map map) { + LuceneExecuteLogService lucene = SpringContextHolder.getBean(LuceneExecuteLogService.class); + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); + Map itemMap = new LinkedHashMap<>(); + map.forEach((key, value) -> { + if (ObjectUtil.isNotEmpty(value)) { + itemMap.put(getToParam() + key, value); + } + }); + if (ObjectUtil.isNotEmpty(itemMap)) { + this.control(itemMap); + logServer.deviceExecuteLog(this.getDevice().getDevice_code(), "", "", "下发多个电气信号:" + itemMap); + lucene.deviceExecuteLog(new LuceneLogDto(this.getDeviceCode(), "下发多个电气信号:" + itemMap)); + } + } + /** + * 抽取统一下发电气信号前缀 + * + * @return + */ + public String getToParam() { + return this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + "."; + } } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDeviceDriver.java index c75ddf6..6356a35 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDeviceDriver.java @@ -39,10 +39,7 @@ import org.springframework.http.HttpStatus; import java.lang.reflect.Field; import java.lang.reflect.Method; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 晟华压力机 @@ -302,12 +299,16 @@ public class LnshPressDeviceDriver extends AbstractOpcDeviceDriver implements De ApplyTaskResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)),ApplyTaskResponse.class); if (resp.getCode() == 200) { - this.writing(101); + Map map = new LinkedHashMap<>(); + map.put("to_command",101); + this.writing(map); this.setRequireSucess(true); message = RequestMethodEnum.getName("order_verify") + "order_verify 接口请求成功" + resp.getMessage(); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("order_verify") + "order_verify 接口请求失败" + resp.getMessage(); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); } @@ -331,12 +332,16 @@ public class LnshPressDeviceDriver extends AbstractOpcDeviceDriver implements De ApplyTaskResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)),ApplyTaskResponse.class); if (resp.getCode() == 200) { - this.writing(102); + Map map = new LinkedHashMap<>(); + map.put("to_command",102); + this.writing(map); this.setRequireSucess(true); message = RequestMethodEnum.getName("order_finish") + "order_finish 接口请求成功" + resp.getMessage(); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("order_finish") + "order_finish 接口请求失败" + resp.getMessage(); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); } @@ -360,12 +365,16 @@ public class LnshPressDeviceDriver extends AbstractOpcDeviceDriver implements De lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "请求参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); message = RequestMethodEnum.getName("pressRequestMaterial") + "pressRequestMaterial 接口请求成功" + resp.getMessage(); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("pressRequestMaterial") + "pressRequestMaterial 接口请求失败" + resp.getMessage(); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); } @@ -389,12 +398,16 @@ public class LnshPressDeviceDriver extends AbstractOpcDeviceDriver implements De lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); message = RequestMethodEnum.getName("apply_feedback_weight") + "apply_feedback_weight 接口请求成功" + resp.getMessage(); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("apply_feedback_weight") + "apply_feedback_weight 接口请求失败" + resp.getMessage(); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); } @@ -437,12 +450,45 @@ public class LnshPressDeviceDriver extends AbstractOpcDeviceDriver implements De server.disconnect(); logServer.deviceExecuteLog(this.device_code, "", "", param + " 写入 " + value); } + /** + * 多个信号一起下发电气 + * + * @param map + */ + + public void writing(Map map) { + LuceneExecuteLogService lucene = SpringContextHolder.getBean(LuceneExecuteLogService.class); + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); + Map itemMap = new LinkedHashMap<>(); + map.forEach((key, value) -> { + if (ObjectUtil.isNotEmpty(value)) { + itemMap.put(getToParam() + key, value); + } + }); + if (ObjectUtil.isNotEmpty(itemMap)) { + this.control(itemMap); + logServer.deviceExecuteLog(this.getDevice().getDevice_code(), "", "", "下发多个电气信号:" + itemMap); + lucene.deviceExecuteLog(new LuceneLogDto(this.getDeviceCode(), "下发多个电气信号:" + itemMap)); + } + } + /** + * 抽取统一下发电气信号前缀 + * + * @return + */ + public String getToParam() { + return this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + "."; + } + + + public void executing(Server server, Map itemMap) { ReadUtil.write(itemMap, server); server.disconnect(); } + public void writing(int command) { String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + "." + ItemProtocol.item_to_command; @@ -544,4 +590,6 @@ public class LnshPressDeviceDriver extends AbstractOpcDeviceDriver implements De public void setDeviceStatus(JSONObject data) { } + + } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java index 7d61ea8..d4ed68b 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java @@ -30,6 +30,8 @@ import org.nl.acs.route.service.RouteLineService; import org.nl.acs.task.service.TaskService; import org.nl.acs.task.service.dto.TaskDto; import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.lucene.service.LuceneExecuteLogService; +import org.nl.modules.lucene.service.dto.LuceneLogDto; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; import org.openscada.opc.lib.da.Server; @@ -57,6 +59,8 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl"); @Autowired TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); + @Autowired + LuceneExecuteLogService lucene = SpringContextHolder.getBean("luceneExecuteLogServiceImpl"); @Autowired DeviceAppService deviceAppservice = SpringContextHolder.getBean(DeviceAppServiceImpl.class); @@ -149,8 +153,8 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi int to_target2 = 0; int to_task2 = 0; - int to_container_type = 0; - int last_to_container_type = 0; +// int to_container_type = 0; +// int last_to_container_type = 0; int last_to_command2 = 0; int last_to_oneset2 = 0; @@ -213,10 +217,10 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi logServer.deviceItemValue(this.device_code, "mode", String.valueOf(mode)); logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode); } - if (to_container_type != last_to_container_type) { - logServer.deviceItemValue(this.device_code, "to_container_type", String.valueOf(to_container_type)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号container_type：" + last_to_container_type + "->" + to_container_type); - } +// if (to_container_type != last_to_container_type) { +// logServer.deviceItemValue(this.device_code, "to_container_type", String.valueOf(to_container_type)); +// logServer.deviceExecuteLog(this.device_code, "", "", "信号container_type：" + last_to_container_type + "->" + to_container_type); +// } if (error != last_error) { logServer.deviceItemValue(this.device_code, "error", String.valueOf(error)); logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error); @@ -337,9 +341,6 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi driver.setMessage(msg); logServer.deviceExecuteLog(startDevice.getDevice_code(), "", "", msg); } - } else if (startDevice.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { - this.writing("to_command1", "3"); - logServer.deviceExecuteLog(startDevice.getDevice_code(), "", "", "允许RGV前工位取货。"); } } @@ -434,44 +435,45 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi driver.setMessage(msg); logServer.deviceExecuteLog(startDevice.getDevice_code(), "", "", msg); } - } else if (startDevice.getDeviceDriver() instanceof LnshStationDeviceDriver) { - LnshStationDeviceDriver driver = (LnshStationDeviceDriver) startDevice.getDeviceDriver(); - if (driver.getMode() != 0 - && driver.getMove() != 0 - && (driver.getIo_action() == 3 || driver.getIo_action() == 1) - && (driver.getAction() == 3 || driver.getAction() == 1)) { - this.writing("to_command2", "1"); - driver.setMessage(""); - logServer.deviceExecuteLog(startDevice.getDevice_code(), "", "", "允许RGV后工位取货。"); - } else { - String msg = ""; - if (driver.getMode() == 0) { - msg += "站点未联机，"; - } else { - if (driver.getMove() == 0) { - msg += "站点无货，"; - } - if (driver.getIo_action() != 3 && driver.getIo_action() != 1) { - msg += "站点不允许进入，"; - } - if (driver.getAction() != 3 && driver.getAction() != 1) { - msg += "站点不允许取货，"; - } - } - msg += "不允许RGV后工位取货。"; - driver.setMessage(msg); - logServer.deviceExecuteLog(startDevice.getDevice_code(), "", "", msg); - } } +// else if (startDevice.getDeviceDriver() instanceof LnshStationDeviceDriver) { +// LnshStationDeviceDriver driver = (LnshStationDeviceDriver) startDevice.getDeviceDriver(); +// if (driver.getMode() != 0 +// && driver.getMove() != 0 +// && (driver.getIo_action() == 3 || driver.getIo_action() == 1) +// && (driver.getAction() == 3 || driver.getAction() == 1)) { +// this.writing("to_command2", "1"); +// driver.setMessage(""); +// logServer.deviceExecuteLog(startDevice.getDevice_code(), "", "", "允许RGV后工位取货。"); +// } else { +// String msg = ""; +// if (driver.getMode() == 0) { +// msg += "站点未联机，"; +// } else { +// if (driver.getMove() == 0) { +// msg += "站点无货，"; +// } +// if (driver.getIo_action() != 3 && driver.getIo_action() != 1) { +// msg += "站点不允许进入，"; +// } +// if (driver.getAction() != 3 && driver.getAction() != 1) { +// msg += "站点不允许取货，"; +// } +// } +// msg += "不允许RGV后工位取货。"; +// driver.setMessage(msg); +// logServer.deviceExecuteLog(startDevice.getDevice_code(), "", "", msg); +// } +// } } //后工位放货时判断放货位光电信号 if (mode == 3 && error == 0 && status != 3 && action2 == 2 && move2 != 0 && task2 > 0 && action1 != 1) { Instruction inst1 = instructionService.findByCodeFromCache(String.valueOf(task2)); - String next_parent_code = inst1.getNext_parent_code(); + String next_device_code = inst1.getNext_device_code(); String start_device_code=inst1.getStart_device_code(); //后工位单任务 - Device nextDevice = deviceAppservice.findDeviceByCode(next_parent_code); + Device nextDevice = deviceAppservice.findDeviceByCode(next_device_code); //双工位 Device nextDevice1 = deviceAppservice.findDeviceByCode(start_device_code); if (nextDevice.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) { @@ -482,7 +484,6 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi // && (driver.getAction() == 2 || driver.getAction() == 3) ) { this.writing("to_command2", "2"); - this.requireSucess1 = false; driver.setMessage(""); logServer.deviceExecuteLog(nextDevice.getDevice_code(), "", "", "允许RGV后工位放货。"); } else { @@ -504,8 +505,7 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi driver.setMessage(msg); logServer.deviceExecuteLog(device_code, "", "", msg); } - } - if(nextDevice1.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver){ + } else if(nextDevice1.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver){ LnshPalletizingManipulatorSiteDeviceDriver driver = (LnshPalletizingManipulatorSiteDeviceDriver) nextDevice1.getDeviceDriver(); if (driver.getMode() != 0 && driver.getMove() == 0 @@ -513,7 +513,6 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi // && (driver.getAction() == 2 || driver.getAction() == 3) ) { this.writing("to_command2", "2"); - this.requireSucess1 = false; driver.setMessage(""); logServer.deviceExecuteLog(nextDevice.getDevice_code(), "", "", "允许RGV后工位放货。"); } @@ -521,10 +520,12 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi } - } catch (Exception var17) { + } catch (Exception e) { + log.error("捕获到异常：" + e.getMessage(), e); return; } + log.info("当前RGV的模式为{}",mode); if (mode == 0) { this.setIsonline(false); this.setIserror(true); @@ -538,6 +539,7 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi } else { this.setIsonline(true); this.setIserror(false); + logServer.deviceExecuteLog(this.device_code, "", "", "RGV准备接受任务"); message = ""; Instruction instruction = null; List toInstructions; @@ -546,7 +548,8 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi log.debug("设备运转模式:等待工作"); return; case 2: - if (move1 == 0 && move2 == 0 && !requireSucess1 &&mode==2) { + logServer.deviceExecuteLog(this.device_code, "", "", "前工位光电信号" + move1 + "后工位光电信号" + move2+"复位标记"+ requireSucess1+"模式"+mode); + if (move1 == 0 && move2 == 0 && !requireSucess1 &&mode==2 && action2 == 0 && action1==0&& task1==0&& task2==0) { instruction_require(); } break; @@ -594,7 +597,7 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi last_to_oneset2 = to_oneset2; last_to_target2 = to_target2; last_to_task2 = to_task2; - last_to_container_type = to_container_type; +// last_to_container_type = to_container_type; } @@ -686,7 +689,6 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi //下发4个点任务 if (ObjectUtil.isNotEmpty(start_device_code2) && ObjectUtil.isNotEmpty(next_device_code2)) { sendHeadBackSignalType(instdto); - log.info("下发五点任务，指令信息()",instdto); requireSucess1 = true; logServer.deviceExecuteLog(this.device_code, "", "", "申请前后工位任务成功,requireSucess1" + requireSucess1 + ",指令号:" + instdto.getInstruction_code()); if(ObjectUtil.isNotEmpty(start_device_code)){ @@ -704,8 +706,9 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi } else { //申请后工位任务 TaskDto task2 = null; + //后工位取货关联设备 List getDeviceCodeList2 = this.getExtraDeviceCodes("get_device_code2"); - //前工位放货关联设备 + //后工位放货关联设备 List putDeviceCodeList2 = this.getExtraDeviceCodes("put_device_code2"); for (int i = 0; i < putDeviceCodeList2.size(); i++) { if (ObjectUtil.isNotEmpty(taskserver.queryTaskByDeviceCode(getDeviceCodeList2.get(i).replace("\"", "")))) { @@ -871,15 +874,34 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi logServer.deviceExecuteLog(this.device_code, "", "", to_command1 + " 写入 " + command); } - public void writing2(int command) { - String to_command2 = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_command2; + /** + * 多个信号一起下发电气 + * + * @param map + */ - - Map itemMap = new HashMap(); - itemMap.put(to_command2, command); - this.control(itemMap); - logServer.deviceExecuteLog(this.device_code, "", "", to_command2 + " 写入 " + command); + public void writing(Map map) { + LuceneExecuteLogService lucene = SpringContextHolder.getBean(LuceneExecuteLogService.class); + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); + Map itemMap = new LinkedHashMap<>(); + map.forEach((key, value) -> { + if (ObjectUtil.isNotEmpty(value)) { + itemMap.put(getToParam() + key, value); + } + }); + if (ObjectUtil.isNotEmpty(itemMap)) { + this.control(itemMap); + logServer.deviceExecuteLog(this.getDevice().getDevice_code(), "", "", "下发多个电气信号:" + itemMap); + lucene.deviceExecuteLog(new LuceneLogDto(this.getDeviceCode(), "下发多个电气信号:" + itemMap)); + } + } + /** + * 抽取统一下发电气信号前缀 + * + * @return + */ + public String getToParam() { + return this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + "."; } public void writing(int type, int command) { @@ -1040,8 +1062,7 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi log.error("RGV 双工位完成指令异常", e); logServer.deviceExecuteLog(this.device_code, "", "", "前工位指令" + task1 + "完成异常，异常原因：" + e.getMessage()); } - log.info("五点任务完成"); - this.setRequireSucess1(false); + writing("to_command1", "0"); writing("to_command1", "0"); writing("to_onset1", "0"); @@ -1058,11 +1079,8 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi writing("to_target2", "0"); writing("to_task2", "0"); writing("to_task2", "0"); - writing("to_container_type", "0"); - writing("to_container_type", "0"); + } - this.requireSucess1 = false; - log.info("前后工位任务完成复位"); //单独的后工位任务 } else if (action2 == 4 && move2 == 0 && task2 > 0 && action1 == 0 && move2 == 0 && task1 == 0) { //inst_message @@ -1074,8 +1092,6 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi log.error("RGV 后工位完成指令异常", e); logServer.deviceExecuteLog(this.device_code, "", "", "后工位指令" + task1 + "完成异常，异常原因：" + e.getMessage()); } - log.info("后工位任务完成"); - this.setRequireSucess1(false); writing("to_command2", "0"); writing("to_command2", "0"); writing("to_onset2", "0"); @@ -1085,8 +1101,6 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi writing("to_task2", "0"); writing("to_task2", "0"); } - this.requireSucess1 = false; - log.info("后工位任务完成复位"); } else if (action1 == 4 && move1 == 0 && task1 > 0 && action2 == 0 && move2 == 0 && task2 == 0) { inst1 = checkInst(); if (inst1 != null) { @@ -1096,8 +1110,6 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi log.error("RGV 前工位完成指令异常", e); logServer.deviceExecuteLog(this.device_code, "", "", "前工位指令" + task1 + "完成异常，异常原因：" + e.getMessage()); } - log.info("前工位任务完成"); - this.setRequireSucess1(false); writing("to_command1", "0"); writing("to_command1", "0"); writing("to_onset1", "0"); @@ -1106,11 +1118,9 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi writing("to_target1", "0"); writing("to_task1", "0"); writing("to_task1", "0"); - writing("to_container_type", "0"); - writing("to_container_type", "0"); +// writing("to_container_type", "0"); +// writing("to_container_type", "0"); } - this.requireSucess1 = false; - log.info("前工位任务完成复位"); } @@ -1194,7 +1204,6 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi this.writing("to_command1", "1"); this.writing("to_command1", "1"); } - /** * 下发后工位任务 * @param dto diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java index 4497988..5813768 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java @@ -758,10 +758,14 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); ApplyTaskResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)),ApplyTaskResponse.class); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_feedback",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_feedback",400); + this.writing(map); message = RequestMethodEnum.getName("apply_put_full_vehicle") + "apply_put_full_vehicle 接口请求失败" + resp.getMessage();; } lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message)); @@ -791,10 +795,14 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_feedback",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_feedback",400); + this.writing(map); message = RequestMethodEnum.getName("apply_put_empty_vehicle") + "apply_put_empty_vehicle 接口请求失败" + resp.getMessage();; } return true; @@ -823,10 +831,14 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_feedback",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_feedback",400); + this.writing(map); message = RequestMethodEnum.getName("apply_take_empty_vehicle") + "apply_take_empty_vehicle 接口请求失败" + resp.getMessage();; } return true; @@ -867,10 +879,14 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_feedback",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_feedback",400); + this.writing(map); message = RequestMethodEnum.getName("apply_take_full_vehicle") + "apply_take_full_vehicle 接口请求失败" + resp.getMessage();; } return true; @@ -899,10 +915,14 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_feedback",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_feedback",400); + this.writing(map); message = RequestMethodEnum.getName("apply_force_take_full_vehicle") + "apply_force_take_full_vehicle 接口请求失败" + resp.getMessage();; } return true; @@ -931,10 +951,14 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_feedback",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_feedback",400); + this.writing(map); message = RequestMethodEnum.getName("apply_force_take_full_vehicle_in_storage") + "apply_force_take_full_vehicle_in_storage 接口请求失败" + resp.getMessage();; } return true; @@ -963,11 +987,15 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_feedback",200); + this.writing(map); this.writing(resp.getIs_standing_finish(),"1"); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_feedback",400); + this.writing(map); message = RequestMethodEnum.getName("barcode_success_apply") + "barcode_success_apply 接口请求失败" + resp.getMessage();; } return true; @@ -996,10 +1024,14 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_feedback",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_feedback",400); + this.writing(map); message = RequestMethodEnum.getName("get_vehicle_info") + "get_vehicle_info 接口请求失败" + resp.getMessage();; } return true; @@ -1027,10 +1059,14 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_feedback",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_feedback",400); + this.writing(map); message = RequestMethodEnum.getName("force_no_package") + "force_no_package 接口请求失败" + resp.getMessage();; } return true; @@ -1056,12 +1092,15 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im ApplyTaskResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)),ApplyTaskResponse.class); message = RequestMethodEnum.getName("apply_labelling") + "apply_labelling 接口请求LMS..."; lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); - if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_feedback",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_feedback",400); + this.writing(map); message = RequestMethodEnum.getName("apply_labelling") + "apply_labelling 接口请求失败" + resp.getMessage();; } return true; @@ -1168,65 +1207,67 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im String two_qty = content.getString("two_qty"); String tool_coordinate = content.getString("tool_coordinate"); - this.writing("to_material", material_code); - this.writing("to_AlongSide", AlongSide); - this.writing("to_BshortSide", BshortSide); - this.writing("to_Htrapezoidal", Htrapezoidal); - this.writing("to_Wthickness", Wthickness); - this.writing("to_tray_qty", tray_qty); - this.writing("to_tray_high", tray_high); - this.writing("to_crib_category", crib_category); - this.writing("to_palletX1_line", palletX1_line); - this.writing("to_palletY1_row", palletY1_row); - this.writing("to_palletA1_angle", palletA1_angle); - this.writing("to_palletX2_line", palletX2_line); - this.writing("to_palletY2_row", palletY2_row); - this.writing("to_palletA2_angle", palletA2_angle); - this.writing("to_palletX3_line", palletX3_line); - this.writing("to_palletY3_row", palletY3_row); - this.writing("to_palletA3_angle", palletA3_angle); - this.writing("to_pressCribX1_line", pressCribX1_line); - this.writing("to_pressCribY1_row", pressCribY1_row); - this.writing("to_pressCribA1_angle", pressCribA1_angle); - this.writing("to_pressCribX2_line", pressCribX2_line); - this.writing("to_pressCribY2_row", pressCribY2_row); - this.writing("to_pressCribA2_angle", pressCribA2_angle); - this.writing("to_pressCribX3_line", pressCribX3_line); - this.writing("to_pressCribY3_row", pressCribY3_row); - this.writing("to_pressCribA3_angle", pressCribA3_angle); - this.writing("to_Zoffset", Zoffset); - this.writing("to_pallet_layerQty", pallet_layerQty); - this.writing("to_pressCrib_layerQty", pressCrib_layerQty); - this.writing("to_codeLayerX1_interval", codeLayerX1_interval); - this.writing("to_codeLayerY1_interval", codeLayerY1_interval); - this.writing("to_codeLayerX2_interval", codeLayerX2_interval); - this.writing("to_codeLayerY2_interval", codeLayerY2_interval); - this.writing("to_codeLayerX3_interval", codeLayerX3_interval); - this.writing("to_codeLayerY3_interval", codeLayerY3_interval); - this.writing("to_codeLayerX1_offset", codeLayerX1_offset); - this.writing("to_codeLayerY1_offset", codeLayerY1_offset); - this.writing("to_codeLayerX2_offset", codeLayerX2_offset); - this.writing("to_codeLayerY2_offset", codeLayerY2_offset); - this.writing("to_codeLayerX3_offset", codeLayerX3_offset); - this.writing("to_codeLayerY3_offset", codeLayerY3_offset); - this.writing("to_pressLayerX1_interval", pressLayerX1_interval); - this.writing("to_pressLayerY1_interval", pressLayerY1_interval); - this.writing("to_pressLayerX2_interval", pressLayerX2_interval); - this.writing("to_pressLayerY2_interval", pressLayerY2_interval); - this.writing("to_pressLayerX3_interval", pressLayerX3_interval); - this.writing("to_pressLayerY3_interval", pressLayerY3_interval); - this.writing("to_pressLayerX1_offset", pressLayerX1_offset); - this.writing("to_pressLayerY1_offset", pressLayerY1_offset); - this.writing("to_pressLayerX2_offset", pressLayerX2_offset); - this.writing("to_pressLayerY2_offset", pressLayerY2_offset); - this.writing("to_pressLayerX3_offset", pressLayerX3_offset); - this.writing("to_pressLayerY3_offset", pressLayerY3_offset); - this.writing("to_one_cribTotal", one_cribTotal); - this.writing("to_two_cribTotal", two_cribTotal); - this.writing("to_one_qty", one_qty); - this.writing("to_two_qty", two_qty); - this.writing("to_tool_coordinate", tool_coordinate); - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_material", material_code); + map.put("to_AlongSide", AlongSide); + map.put("to_BshortSide", BshortSide); + map.put("to_Htrapezoidal", Htrapezoidal); + map.put("to_Wthickness", Wthickness); + map.put("to_tray_qty", tray_qty); + map.put("to_tray_high", tray_high); + map.put("to_crib_category", crib_category); + map.put("to_palletX1_line", palletX1_line); + map.put("to_palletY1_row", palletY1_row); + map.put("to_palletA1_angle", palletA1_angle); + map.put("to_palletX2_line", palletX2_line); + map.put("to_palletY2_row", palletY2_row); + map.put("to_palletA2_angle", palletA2_angle); + map.put("to_palletX3_line", palletX3_line); + map.put("to_palletY3_row", palletY3_row); + map.put("to_palletA3_angle", palletA3_angle); + map.put("to_pressCribX1_line", pressCribX1_line); + map.put("to_pressCribY1_row", pressCribY1_row); + map.put("to_pressCribA1_angle", pressCribA1_angle); + map.put("to_pressCribX2_line", pressCribX2_line); + map.put("to_pressCribY2_row", pressCribY2_row); + map.put("to_pressCribA2_angle", pressCribA2_angle); + map.put("to_pressCribX3_line", pressCribX3_line); + map.put("to_pressCribY3_row", pressCribY3_row); + map.put("to_pressCribA3_angle", pressCribA3_angle); + map.put("to_Zoffset", Zoffset); + map.put("to_pallet_layerQty", pallet_layerQty); + map.put("to_pressCrib_layerQty", pressCrib_layerQty); + map.put("to_codeLayerX1_interval", codeLayerX1_interval); + map.put("to_codeLayerY1_interval", codeLayerY1_interval); + map.put("to_codeLayerX2_interval", codeLayerX2_interval); + map.put("to_codeLayerY2_interval", codeLayerY2_interval); + map.put("to_codeLayerX3_interval", codeLayerX3_interval); + map.put("to_codeLayerY3_interval", codeLayerY3_interval); + map.put("to_codeLayerX1_offset", codeLayerX1_offset); + map.put("to_codeLayerY1_offset", codeLayerY1_offset); + map.put("to_codeLayerX2_offset", codeLayerX2_offset); + map.put("to_codeLayerY2_offset", codeLayerY2_offset); + map.put("to_codeLayerX3_offset", codeLayerX3_offset); + map.put("to_codeLayerY3_offset", codeLayerY3_offset); + map.put("to_pressLayerX1_interval", pressLayerX1_interval); + map.put("to_pressLayerY1_interval", pressLayerY1_interval); + map.put("to_pressLayerX2_interval", pressLayerX2_interval); + map.put("to_pressLayerY2_interval", pressLayerY2_interval); + map.put("to_pressLayerX3_interval", pressLayerX3_interval); + map.put("to_pressLayerY3_interval", pressLayerY3_interval); + map.put("to_pressLayerX1_offset", pressLayerX1_offset); + map.put("to_pressLayerY1_offset", pressLayerY1_offset); + map.put("to_pressLayerX2_offset", pressLayerX2_offset); + map.put("to_pressLayerY2_offset", pressLayerY2_offset); + map.put("to_pressLayerX3_offset", pressLayerX3_offset); + map.put("to_pressLayerY3_offset", pressLayerY3_offset); + map.put("to_one_cribTotal", one_cribTotal); + map.put("to_two_cribTotal", two_cribTotal); + map.put("to_one_qty", one_qty); + map.put("to_two_qty", two_qty); + map.put("to_tool_coordinate", tool_coordinate); + map.put("to_feedback",200); + this.writing(map); requireSucess = true; } return true; @@ -1257,7 +1298,9 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json); if (ObjectUtil.isNotEmpty(result)) { if (result.getStatus() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_feedback",200); + this.writing(map); requireSucess = true; } } @@ -1288,7 +1331,9 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json); if (ObjectUtil.isNotEmpty(result)) { if (result.getStatus() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_feedback",200); + this.writing(map); requireSucess = true; } } @@ -1320,7 +1365,9 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json); if (ObjectUtil.isNotEmpty(result)) { if (result.getStatus() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_feedback",200); + this.writing(map); } } @@ -1351,18 +1398,6 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im server.disconnect(); } - public void writing(int feedback) { - String to_feedback = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + ItemProtocol.item_to_feedback; - String opcservcerid = this.getDevice().getOpc_server_id(); - Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - itemMap.put(to_feedback, feedback); - ReadUtil.write(itemMap, server); - server.disconnect(); - logServer.deviceExecuteLog(this.device_code, "", "", "to_feedback 写入 " + feedback); - lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "to_feedback 写入 " + feedback)); - } public void writing(int type, int command) { String opcservcerid = this.getDevice().getOpc_server_id(); @@ -1386,4 +1421,34 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im server.disconnect(); logServer.deviceExecuteLog(this.device_code, "", "", param + " 写入 " + value); } + /** + * 多个信号一起下发电气 + * + * @param map + */ + + public void writing(Map map) { + LuceneExecuteLogService lucene = SpringContextHolder.getBean(LuceneExecuteLogService.class); + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); + Map itemMap = new LinkedHashMap<>(); + map.forEach((key, value) -> { + if (ObjectUtil.isNotEmpty(value)) { + itemMap.put(getToParam() + key, value); + } + }); + if (ObjectUtil.isNotEmpty(itemMap)) { + this.control(itemMap); + logServer.deviceExecuteLog(this.getDevice().getDevice_code(), "", "", "下发多个电气信号:" + itemMap); + lucene.deviceExecuteLog(new LuceneLogDto(this.getDeviceCode(), "下发多个电气信号:" + itemMap)); + } + } + /** + * 抽取统一下发电气信号前缀 + * + * @return + */ + public String getToParam() { + return this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + "."; + } + } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java index fbf5ed3..7bccc1e 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java @@ -37,10 +37,7 @@ import org.nl.modules.wql.util.SpringContextHolder; import org.openscada.opc.lib.da.Server; import java.lang.reflect.Method; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 晟华-工位(交互模板) @@ -146,7 +143,9 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements if (mode != last_mode) { if(mode==2){ - this.writing(0); + Map map = new LinkedHashMap<>(); + map.put("to_command",0); + this.writing(map); } this.setRequireSucess(false); logServer.deviceItemValue(this.device_code, "mode", String.valueOf(mode)); @@ -367,6 +366,35 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements server.disconnect(); } + /** + * 多个信号一起下发电气 + * + * @param map + */ + + public void writing(Map map) { + LuceneExecuteLogService lucene = SpringContextHolder.getBean(LuceneExecuteLogService.class); + DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); + Map itemMap = new LinkedHashMap<>(); + map.forEach((key, value) -> { + if (ObjectUtil.isNotEmpty(value)) { + itemMap.put(getToParam() + key, value); + } + }); + if (ObjectUtil.isNotEmpty(itemMap)) { + this.control(itemMap); + logServer.deviceExecuteLog(this.getDevice().getDevice_code(), "", "", "下发多个电气信号:" + itemMap); + lucene.deviceExecuteLog(new LuceneLogDto(this.getDeviceCode(), "下发多个电气信号:" + itemMap)); + } + } + /** + * 抽取统一下发电气信号前缀 + * + * @return + */ + public String getToParam() { + return this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + "."; + } public void writing(String param, String value) { @@ -549,10 +577,14 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); ApplyTaskResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)),ApplyTaskResponse.class); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("apply_put_full_vehicle") + "apply_put_full_vehicle 接口请求失败" + resp.getMessage();; } lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message)); @@ -582,12 +614,16 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); message = RequestMethodEnum.getName("apply_put_empty_vehicle") + "apply_put_empty_vehicle 接口请求成功" + resp.getMessage(); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("apply_put_empty_vehicle") + "apply_put_empty_vehicle 接口请求失败" + resp.getMessage(); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); } @@ -617,10 +653,14 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("apply_take_empty_vehicle") + "apply_take_empty_vehicle 接口请求失败" + resp.getMessage();; } return true; @@ -661,12 +701,16 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); message = RequestMethodEnum.getName("apply_take_full_vehicle") + "apply_take_full_vehicle 接口请求成功" + resp.getMessage(); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("apply_take_full_vehicle") + "apply_take_full_vehicle 接口请求失败" + resp.getMessage(); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); } @@ -699,10 +743,14 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("apply_force_take_full_vehicle") + "apply_force_take_full_vehicle 接口请求失败" + resp.getMessage();; } return true; @@ -731,10 +779,14 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("apply_force_take_full_vehicle_in_storage") + "apply_force_take_full_vehicle_in_storage 接口请求失败" + resp.getMessage();; } return true; @@ -763,12 +815,16 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); message = RequestMethodEnum.getName("barcode_success_apply") + "barcode_success_apply 接口请求成功" + resp.getMessage(); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("barcode_success_apply") + "barcode_success_apply 接口请求失败" + resp.getMessage(); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); } @@ -798,10 +854,14 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("get_vehicle_info") + "get_vehicle_info 接口请求失败" + resp.getMessage();; } return true; @@ -829,10 +889,14 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("force_no_package") + "force_no_package 接口请求失败" + resp.getMessage();; } return true; @@ -860,10 +924,14 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); if (resp.getCode() == 200) { - this.writing(200); + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); this.setRequireSucess(true); } else { - this.writing(400); + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); message = RequestMethodEnum.getName("apply_labelling") + "apply_labelling 接口请求失败" + resp.getMessage();; } return true; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/package_site/PackageSiteDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/package_site/PackageSiteDeviceDriver.java index 3efb5db..f592759 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/package_site/PackageSiteDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/package_site/PackageSiteDeviceDriver.java @@ -397,6 +397,7 @@ public class PackageSiteDeviceDriver extends AbstractOpcDeviceDriver implements jo.put("isOnline", isonline); jo.put("hasGoods", hasGoods); jo.put("message", message); + jo.put("requireSucess",requireSucess); return jo; } 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 47dc3fb..e1a9736 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 @@ -59,6 +59,7 @@ import org.slf4j.MDC; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -423,13 +424,16 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { errArr.add(json); continue; } - lnshMixingMillDeviceDriver.writing("to_order_No", order_code); - lnshMixingMillDeviceDriver.writing("to_weight", qty); - lnshMixingMillDeviceDriver.writing("to_material_code", material_code); - lnshMixingMillDeviceDriver.writing(100); + Map map = new LinkedHashMap<>(); + map.put("to_order_No", order_code); + map.put("to_weight", qty); + map.put("to_material_code", material_code); + map.put("to_command",100); + lnshMixingMillDeviceDriver.writing(map); is_flag = true; } if (device.getDeviceDriver() instanceof LnshPressDeviceDriver) { + lnshPressDeviceDriver = (LnshPressDeviceDriver) device.getDeviceDriver(); if (lnshPressDeviceDriver.getMode() == 0) { JSONObject json = new JSONObject(); @@ -455,26 +459,28 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { errArr.add(json); continue; } - lnshPressDeviceDriver.writing("to_order_No", order_code); - lnshPressDeviceDriver.writing("to_qty", qty); - lnshPressDeviceDriver.writing("to_material_code", material_code); - lnshPressDeviceDriver.writing("to_product_code", product_code); - lnshPressDeviceDriver.writing("to_AlongSide", AlongSide); - lnshPressDeviceDriver.writing("to_BshortSide", BshortSide); - lnshPressDeviceDriver.writing("to_Htrapezoidal", Htrapezoidal); - lnshPressDeviceDriver.writing("to_Wthickness", Wthickness); - lnshPressDeviceDriver.writing("to_brick_code", brick_code); - lnshPressDeviceDriver.writing("to_formula", formula); - lnshPressDeviceDriver.writing("to_size_error", size_error); - lnshPressDeviceDriver.writing("to_single_weight", single_weight); - lnshPressDeviceDriver.writing("to_drawing_address", drawing_address); - lnshPressDeviceDriver.writing("to_standard_weight", standard_weight); - lnshPressDeviceDriver.writing("to_detection_error", detection_error); - lnshPressDeviceDriver.writing("to_standard_size_height1", standard_size_height1); - lnshPressDeviceDriver.writing("to_standard_size_height2", standard_size_height2); - lnshPressDeviceDriver.writing("to_standard_size_height3", standard_size_height3); - lnshPressDeviceDriver.writing("to_standard_size_height4", standard_size_height4); - lnshPressDeviceDriver.writing(100); + Map map = new LinkedHashMap<>(); + map.put("to_order_No", order_code); + map.put("to_qty", qty); + map.put("to_material_code", material_code); + map.put("to_product_code", product_code); + map.put("to_AlongSide", AlongSide); + map.put("to_BshortSide", BshortSide); + map.put("to_Htrapezoidal", Htrapezoidal); + map.put("to_Wthickness", Wthickness); + map.put("to_brick_code", brick_code); + map.put("to_formula", formula); + map.put("to_size_error", size_error); + map.put("to_single_weight", single_weight); + map.put("to_drawing_address", drawing_address); + map.put("to_standard_weight", standard_weight); + map.put("to_detection_error", detection_error); + map.put("to_standard_size_height1", standard_size_height1); + map.put("to_standard_size_height2", standard_size_height2); + map.put("to_standard_size_height3", standard_size_height3); + map.put("to_standard_size_height4", standard_size_height4); + map.put("to_command",100); + lnshPressDeviceDriver.writing(map); is_flag = true; } if (device.getDeviceDriver() instanceof LnshPackagePalletManipulatorDeviceDriver) { @@ -503,14 +509,17 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { errArr.add(json); continue; } - lnshPackagePalletManipulatorDeviceDriver.writing("to_order_No", order_code); - 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(100); + Map map = new LinkedHashMap<>(); + map.put("to_order_No", order_code); + map.put("to_material", material_code); + map.put("to_product_code", product_code); + map.put("to_AlongSide", AlongSide); + map.put("to_BshortSide", BshortSide); + map.put("to_Htrapezoidal", Htrapezoidal); + map.put("to_Wthickness", Wthickness); + map.put("to_feedback",100); + map.put("to_formula",formula); + lnshPackagePalletManipulatorDeviceDriver.writing(map); is_flag = true; } if (device.getDeviceDriver() instanceof LnshSplitManipulatorDeviceDriver) { @@ -539,15 +548,19 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { errArr.add(json); continue; } - lnshSplitManipulatorDeviceDriver.writing("to_order_No", order_code); - lnshSplitManipulatorDeviceDriver.writing("to_material_qty", qty); - lnshSplitManipulatorDeviceDriver.writing("to_material_code", material_code); - lnshSplitManipulatorDeviceDriver.writing("to_product_code", product_code); - lnshSplitManipulatorDeviceDriver.writing("to_AlongSide", AlongSide); - lnshSplitManipulatorDeviceDriver.writing("to_BshortSide", BshortSide); - lnshSplitManipulatorDeviceDriver.writing("to_Htrapezoidal", Htrapezoidal); - lnshSplitManipulatorDeviceDriver.writing("to_Wthickness", Wthickness); - lnshSplitManipulatorDeviceDriver.writing(100); + Map map = new LinkedHashMap<>(); + map.put("to_order_No", order_code); + map.put("to_material_qty", qty); + map.put("to_material_code", material_code); + map.put("to_product_code", product_code); + map.put("to_AlongSide", AlongSide); + map.put("to_BshortSide", BshortSide); + map.put("to_Htrapezoidal", Htrapezoidal); + map.put("to_Wthickness", Wthickness); + map.put("to_formula",formula); + map.put("to_feedback",100); + lnshSplitManipulatorDeviceDriver.writing(map); + is_flag = true; } @@ -1148,8 +1161,9 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { if (driver.getMode() != 0 && driver.getError() == 0 && driver.getMove() != 0) { - driver.writing(100); - driver.writing(100); + Map map = new LinkedHashMap<>(); + map.put("to_command",100); + driver.writing(map); } else { String message = ""; if (driver.getMode() != 0) { @@ -1344,18 +1358,12 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { if (ObjectUtil.isNotEmpty(device)) { if (device.getDeviceDriver() instanceof LnshPackageSiteDeviceDriver) { LnshPackageSiteDeviceDriver driver = (LnshPackageSiteDeviceDriver) device.getDeviceDriver(); - - driver.writing("to_vehicle_type", info.getString("vehicle_type")); - driver.writing("to_vehicle_type", info.getString("vehicle_type")); - - driver.writing("to_vehicle_code", String.valueOf(info.getIntValue("vehicle_code"))); - driver.writing("to_vehicle_code", String.valueOf(info.getIntValue("vehicle_code"))); - - driver.writing("to_is_package", info.getString("is_package")); - driver.writing("to_is_package", info.getString("is_package")); - - driver.writing(5); - driver.writing(5); + Map map = new LinkedHashMap<>(); + map.put("to_vehicle_type", info.getString("vehicle_type")); + map.put("to_vehicle_code", String.valueOf(info.getIntValue("vehicle_code"))); + map.put("to_is_package", info.getString("is_package")); + map.put("to_command",5); + driver.writing(map); } } } diff --git a/acs/nladmin-system/src/main/resources/logback-spring.xml b/acs/nladmin-system/src/main/resources/logback-spring.xml index a5017fc..df3d92d 100644 --- a/acs/nladmin-system/src/main/resources/logback-spring.xml +++ b/acs/nladmin-system/src/main/resources/logback-spring.xml @@ -28,6 +28,7 @@ https://juejin.cn/post/6844903775631572999 +