diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java b/acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java index 559e3d5..f933975 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java @@ -245,12 +245,9 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { log.info("下发电气信号失败:" + e.getMessage()); e.printStackTrace(); } - if (lnshStationDeviceDriver.getTo_command() == 5) { - data = AgvService.sendAgvOneModeInst(phase, index, 0); - flag = true; - } else { - logServer.deviceExecuteLog("ndc", "", "", "AGV请求取货下发命令不等于5,无法反馈"); - } + data = AgvService.sendAgvOneModeInst(phase, index, 0); + flag = true; + } else { logServer.deviceExecuteLog("ndc", "", "", "AGV请求取货设备{}无货,无法反馈"); } @@ -268,12 +265,9 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { log.info("下发电气信号失败:" + e.getMessage()); e.printStackTrace(); } - if (lnshPalletizingManipulatorSiteDeviceDriver.getTo_command() == 12) { - data = AgvService.sendAgvOneModeInst(phase, index, 0); - flag = true; - } else { - logServer.deviceExecuteLog("ndc", "", "", "AGV请求取货下发命令不等于12,无法反馈"); - } + data = AgvService.sendAgvOneModeInst(phase, index, 0); + flag = true; + } else { logServer.deviceExecuteLog("ndc", "", "", "AGV请求取货设备{}无货,无法反馈"); @@ -292,12 +286,9 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { log.info("下发电气信号失败:" + e.getMessage()); e.printStackTrace(); } - if (lnshPalletizingManipulatorDeviceDriver.getTo_command() == 12) { - data = AgvService.sendAgvOneModeInst(phase, index, 0); - flag = true; - } else { - logServer.deviceExecuteLog("ndc", "", "", "AGV请求取货下发命令不等于12,无法反馈"); - } + data = AgvService.sendAgvOneModeInst(phase, index, 0); + flag = true; + } else { logServer.deviceExecuteLog("ndc", "", "", "AGV请求取货设备{}无货,无法反馈"); } @@ -365,14 +356,10 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { lnshStationDeviceDriver = (LnshStationDeviceDriver) device.getDeviceDriver(); if (lnshStationDeviceDriver.getMove() == 0 && (lnshStationDeviceDriver.getIo_action() == 3 || lnshStationDeviceDriver.getIo_action() == 2)) { lnshStationDeviceDriver.writing(2); - if (lnshStationDeviceDriver.getTo_command() == 2) { - inst.setExecute_status("5"); - instructionService.update(inst); - data = AgvService.sendAgvOneModeInst(phase, index, 0); - flag = true; - } else { - logServer.deviceExecuteLog("ndc", "", "", "AGV取货完成请求离开设备下发命令不等于2,无法反馈"); - } + inst.setExecute_status("5"); + instructionService.update(inst); + data = AgvService.sendAgvOneModeInst(phase, index, 0); + flag = true; } else { logServer.deviceExecuteLog("ndc", "", "", "AGV取货完成请求离开设备{}有货,无法反馈"); @@ -390,14 +377,10 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { e.printStackTrace(); } - if (lnshPalletizingManipulatorSiteDeviceDriver.getTo_command() == 10) { - inst.setExecute_status("5"); - instructionService.update(inst); - data = AgvService.sendAgvOneModeInst(phase, index, 0); - flag = true; - } else { - logServer.deviceExecuteLog("ndc", "", "", "AGV取货完成请求离开设备下发命令不等于10,无法反馈"); - } + inst.setExecute_status("5"); + instructionService.update(inst); + data = AgvService.sendAgvOneModeInst(phase, index, 0); + flag = true; } else { logServer.deviceExecuteLog("ndc", "", "", "AGV取货完成请求离开设备{}有货,无法反馈"); @@ -417,14 +400,10 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { e.printStackTrace(); } - if (lnshPalletizingManipulatorDeviceDriver.getTo_command() == 10) { - inst.setExecute_status("5"); - instructionService.update(inst); - data = AgvService.sendAgvOneModeInst(phase, index, 0); - flag = true; - } else { - logServer.deviceExecuteLog("ndc", "", "", "AGV取货完成请求离开设备下发命令不等于10,无法反馈"); - } + inst.setExecute_status("5"); + instructionService.update(inst); + data = AgvService.sendAgvOneModeInst(phase, index, 0); + flag = true; } else { logServer.deviceExecuteLog("ndc", "", "", "AGV取货完成请求离开设备{}有货,无法反馈"); @@ -439,16 +418,23 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { logServer.deviceExecuteLog("ndc", "", "", "未找到指令号对应的指令：" + ikey); continue; } + boolean requestFlag = false; logServer.deviceExecuteLog("ndc", "", "", "phase==0x06," + "指令号：" + ikey + ",address：RYSMW01"); //检测站点 if (ObjectUtil.isNotEmpty(device) && device.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) { lnshLaminatingMachineDeviceDriver = (LnshLaminatingMachineDeviceDriver) device.getDeviceDriver(); - if (lnshLaminatingMachineDeviceDriver.getMode() == 2 && lnshLaminatingMachineDeviceDriver.getMode() != 6) { + if (lnshLaminatingMachineDeviceDriver.getMode() == 2 && lnshLaminatingMachineDeviceDriver.getMode() != 6 && !requestFlag) { inst.setExecute_status("9"); instructionService.update(inst); try { - lnshLaminatingMachineDeviceDriver.writing("to_task", inst.getInstruction_code()); - lnshLaminatingMachineDeviceDriver.writing(1); + if(lnshLaminatingMachineDeviceDriver.getTask() != Integer.parseInt(inst.getInstruction_code())){ + lnshLaminatingMachineDeviceDriver.writing("to_task", inst.getInstruction_code()); + lnshLaminatingMachineDeviceDriver.writing(1); + } else { + log.info("电气指令号:" + lnshLaminatingMachineDeviceDriver.getTask() + "与下发当前指令号"+ + inst.getInstruction_code() + "相同，不再下发命令:1" ); + } + } catch (Exception e) { log.info("下发电气信号失败:" + e.getMessage()); e.printStackTrace(); @@ -458,25 +444,25 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { //如果组盘绑定条码成功，就允许agv离开 if (lnshLaminatingMachineDeviceDriver.getMode() == 6) { JSONObject json = new JSONObject(); - json.put("device_code",lnshLaminatingMachineDeviceDriver.getDevice_code()); - json.put("vehicle_code",lnshLaminatingMachineDeviceDriver.autoGenericCode(String.valueOf(lnshLaminatingMachineDeviceDriver.getBarcode()))); - json.put("task_code",inst.getTask_code()); - logServer.deviceExecuteLog(lnshLaminatingMachineDeviceDriver.getDevice_code(), "", "", "申请组盘请求lms:"+json); + json.put("device_code", lnshLaminatingMachineDeviceDriver.getDevice_code()); + json.put("vehicle_code", lnshLaminatingMachineDeviceDriver.autoGenericCode(String.valueOf(lnshLaminatingMachineDeviceDriver.getBarcode()))); + json.put("task_code", inst.getTask_code()); + logServer.deviceExecuteLog(lnshLaminatingMachineDeviceDriver.getDevice_code(), "", "", "申请组盘请求lms:" + json); HttpResponse result = acsToWmsService.applyIntoKiln(json); if (ObjectUtil.isNotEmpty(result)) { JSONObject jsonObject = JSONObject.parseObject(result.body()); - if (result.getStatus() == 200 && StrUtil.equals(jsonObject.get("status").toString(),"200")) { - try{ + if (result.getStatus() == 200 && StrUtil.equals(jsonObject.get("status").toString(), "200")) { + try { lnshLaminatingMachineDeviceDriver.writing(6); } catch (Exception e) { e.printStackTrace(); } data = AgvService.sendAgvOneModeInst(phase, index, 0); - }else { - logServer.deviceExecuteLog(lnshLaminatingMachineDeviceDriver.getDevice_code(), "", "", "申请组盘请求lms反馈失败:"+result); + } else { + logServer.deviceExecuteLog(lnshLaminatingMachineDeviceDriver.getDevice_code(), "", "", "申请组盘请求lms反馈失败:" + result); } - logServer.deviceExecuteLog(lnshLaminatingMachineDeviceDriver.getDevice_code(), "", "", "申请组盘请求lms反馈:"+result); + logServer.deviceExecuteLog(lnshLaminatingMachineDeviceDriver.getDevice_code(), "", "", "申请组盘请求lms反馈:" + result); } } } @@ -532,17 +518,11 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { log.info("下发电气信号失败:" + e.getMessage()); e.printStackTrace(); } - if (lnshStationDeviceDriver.getTo_command() == 6) { - inst.setExecute_status("3"); - instructionService.update(inst); - data = AgvService.sendAgvOneModeInst(phase, index, 0); - flag = true; - } else { - logServer.deviceExecuteLog("ndc", "", "", "AGV请求放货设备下发命令不等于6,无法反馈"); - } - + inst.setExecute_status("3"); + instructionService.update(inst); data = AgvService.sendAgvOneModeInst(phase, index, 0); flag = true; + } else { logServer.deviceExecuteLog("ndc", "", "", "AGV请求放货设备{}有货,无法反馈"); } @@ -558,14 +538,11 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { log.info("下发电气信号失败:" + e.getMessage()); e.printStackTrace(); } - if (lnshPalletizingManipulatorSiteDeviceDriver.getTo_command() == 13) { - inst.setExecute_status("3"); - instructionService.update(inst); - data = AgvService.sendAgvOneModeInst(phase, index, 0); - flag = true; - } else { - logServer.deviceExecuteLog("ndc", "", "", "AGV请求放货设备下发命令不等于13,无法反馈"); - } + inst.setExecute_status("3"); + instructionService.update(inst); + data = AgvService.sendAgvOneModeInst(phase, index, 0); + flag = true; + } else { logServer.deviceExecuteLog("ndc", "", "", "AGV请求放货设备{}有货,无法反馈"); } @@ -581,14 +558,11 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { log.info("下发电气信号失败:" + e.getMessage()); e.printStackTrace(); } - if (lnshPalletizingManipulatorDeviceDriver.getTo_command() == 13) { - inst.setExecute_status("3"); - instructionService.update(inst); - data = AgvService.sendAgvOneModeInst(phase, index, 0); - flag = true; - } else { - logServer.deviceExecuteLog("ndc", "", "", "AGV请求放货设备下发命令不等于13,无法反馈"); - } + inst.setExecute_status("3"); + instructionService.update(inst); + data = AgvService.sendAgvOneModeInst(phase, index, 0); + flag = true; + } else { logServer.deviceExecuteLog("ndc", "", "", "AGV请求放货设备{}有货,无法反馈"); } @@ -644,12 +618,11 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { log.info("下发电气信号失败:" + e.getMessage()); e.printStackTrace(); } -// if (lnshStationDeviceDriver.getTo_command() == 3) { - inst.setExecute_status("6"); - instructionService.update(inst); - data = AgvService.sendAgvOneModeInst(phase, index, 0); - flag = true; -// } + inst.setExecute_status("6"); + instructionService.update(inst); + data = AgvService.sendAgvOneModeInst(phase, index, 0); + flag = true; + } else { logServer.deviceExecuteLog("ndc", "", "", "AGV放货完成请求离开设备{}无货,无法反馈"); } @@ -666,14 +639,11 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { log.info("下发电气信号失败:" + e.getMessage()); e.printStackTrace(); } - if (lnshPalletizingManipulatorSiteDeviceDriver.getTo_command() == 11) { - inst.setExecute_status("6"); - instructionService.update(inst); - data = AgvService.sendAgvOneModeInst(phase, index, 0); - flag = true; - } else { - logServer.deviceExecuteLog("ndc", "", "", "AGV放货完成请求离开下发命令不等于11,无法反馈"); - } + inst.setExecute_status("6"); + instructionService.update(inst); + data = AgvService.sendAgvOneModeInst(phase, index, 0); + flag = true; + } else { logServer.deviceExecuteLog("ndc", "", "", "AGV放货完成请求离开设备{}无货,无法反馈"); @@ -691,14 +661,11 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { log.info("下发电气信号失败:" + e.getMessage()); e.printStackTrace(); } - if (lnshPalletizingManipulatorDeviceDriver.getTo_command() == 11) { - inst.setExecute_status("6"); - instructionService.update(inst); - data = AgvService.sendAgvOneModeInst(phase, index, 0); - flag = true; - } else { - logServer.deviceExecuteLog("ndc", "", "", "AGV放货完成请求离开下发命令不等于11,无法反馈"); - } + inst.setExecute_status("6"); + instructionService.update(inst); + data = AgvService.sendAgvOneModeInst(phase, index, 0); + flag = true; + } else { logServer.deviceExecuteLog("ndc", "", "", "AGV放货完成请求离开设备{}无货,无法反馈"); }