From 1c60718e8c8f0af6ad18bb822c1e2e8430a7fbf3 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Tue, 20 Jun 2023 16:44:00 +0800 Subject: [PATCH] =?UTF-8?q?REV=20=E5=8D=95=E5=B7=A5NDC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auto/run/NDCSocketConnectionAutoRun.java | 10 ++-- .../run/OneNDCSocketConnectionAutoRun.java | 11 ++--- .../HailiangAutoCacheLineDeviceDriver.java | 1 - .../StandardOrdinarySiteDeviceDriver.java | 49 ++++++------------- .../service/InstructionService.java | 1 + 5 files changed, 25 insertions(+), 47 deletions(-) diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/auto/run/NDCSocketConnectionAutoRun.java b/wcs/nladmin-system/src/main/java/org/nl/acs/auto/run/NDCSocketConnectionAutoRun.java index 8e594e87..92d6a46a 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/auto/run/NDCSocketConnectionAutoRun.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/auto/run/NDCSocketConnectionAutoRun.java @@ -148,17 +148,17 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { } } } - } else if (phase == 0x1A) { - instructionService.finishByLinkNum(String.valueOf(ikey)); - data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); - } else if (phase == 0x30) { + }else if (phase == 0x30) { //请求删除任务 data = ndcAgvService.sendAgvTwoModeInst(143, index, 0); } else if (phase == 0xFF) { //任务删除确认 instructionService.forceCancelByLinkNum(String.valueOf(ikey)); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); - } else { + } else if (phase == 0x1A) { + instructionService.finishByLinkNum(String.valueOf(ikey)); + data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); + } else { if (phase == 0x67) { //agv上报异常 device = deviceAppService.findDeviceByCode(Integer.toString(arr[27])); diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java b/wcs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java index 85f50117..53d8bfb6 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java @@ -115,16 +115,13 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable { } data = ndcAgvService.sendAgvOneModeInst(phase, index, 0); } - } else if (phase == 0x0A) { - - instructionService.finishByLinkNum(String.valueOf(ikey)); - data = ndcAgvService.sendAgvOneModeInst(phase, index, 0); - } else if (phase == 0x30) { data = ndcAgvService.sendAgvOneModeInst(143, index, 0); - } else if (phase == 0xFF) { - instructionService.cancelByLinkNum(String.valueOf(ikey)); + instructionService.forceCancelByLinkNum(String.valueOf(ikey)); + data = ndcAgvService.sendAgvOneModeInst(phase, index, 0); + } else if (phase == 0x0A) { + instructionService.finishByLinkNum(String.valueOf(ikey)); data = ndcAgvService.sendAgvOneModeInst(phase, index, 0); } else if (phase == 0x50) { //离开区域 diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_auto_cache_line/HailiangAutoCacheLineDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_auto_cache_line/HailiangAutoCacheLineDeviceDriver.java index 95c1dd7d..9619de75 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_auto_cache_line/HailiangAutoCacheLineDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_auto_cache_line/HailiangAutoCacheLineDeviceDriver.java @@ -163,7 +163,6 @@ public class HailiangAutoCacheLineDeviceDriver extends AbstractOpcDeviceDriver i this.index = index; this.inst = inst; logServer.deviceExecuteLog(device_code, "", "", "设置phase值--->" + agvphase + ",index值--->" + index + ",指令信息关联编号--->" + (inst == null ? "" : inst.getLink_num())); - } @Override diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java index 2b57252c..c91dc494 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java @@ -6,8 +6,10 @@ import com.alibaba.fastjson.JSONObject; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.acs.acsEnum.InstActionEnum; import org.nl.acs.agv.server.AgvService; import org.nl.acs.agv.server.NDCAgvService; +import org.nl.acs.auto.run.OneNDCSocketConnectionAutoRun; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device_driver.DeviceDriver; import org.nl.acs.device_driver.RouteableDeviceDriver; @@ -122,6 +124,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple this.agvphase = agvphase; this.index = index; this.inst = inst; + logServer.deviceExecuteLog(device_code, "", "", "设置phase值--->" + agvphase + ",index值--->" + index + ",指令信息关联编号--->" + (inst == null ? "" : inst.getLink_num())); } int mode = 2; @@ -136,63 +139,41 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple if (agvphase == 0x03) { if (ObjectUtil.isNotEmpty(inst)) { - inst.setExecute_status("1"); + inst.setExecute_status(InstActionEnum.EXECUTE_TO_GET.getCode()); instructionService.update(inst); byte[] data = agvService.sendAgvOneModeInst(agvphase, index, 0); - agvphase = 0; - index = 0; - inst = null; - logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + agvphase + "反馈成功"); - } else { - logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + agvphase + "等待反馈"); - + OneNDCSocketConnectionAutoRun.write(data); + this.set(0, 0, null); } } if (agvphase == 0x05) { if (ObjectUtil.isNotEmpty(inst)) { - inst.setExecute_status("2"); + inst.setExecute_status(InstActionEnum.EXECUTE_GET_FINISH.getCode()); instructionService.update(inst); byte[] data = agvService.sendAgvOneModeInst(agvphase, index, 0); -// OneNDCSocketConnectionAutoRun.write(data); - agvphase = 0; - index = 0; - inst = null; - logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + agvphase + "反馈成功"); - } else { - logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + agvphase + "等待反馈"); - + OneNDCSocketConnectionAutoRun.write(data); + this.set(0, 0, null); } } if (agvphase == 0x07) { if (ObjectUtil.isNotEmpty(inst)) { - inst.setExecute_status("5"); + inst.setExecute_status(InstActionEnum.EXECUTE_TO_PUT_FALL_SEND_FULL.getCode()); instructionService.update(inst); byte[] data = agvService.sendAgvOneModeInst(agvphase, index, 0); -// OneNDCSocketConnectionAutoRun.write(data); - agvphase = 0; - index = 0; - inst = null; - logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + agvphase + "反馈成功"); - } else { - logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + agvphase + "等待反馈"); + OneNDCSocketConnectionAutoRun.write(data); + this.set(0, 0, null); } } if (agvphase == 0x09) { if (ObjectUtil.isNotEmpty(inst)) { - inst.setExecute_status("6"); + inst.setExecute_status(InstActionEnum.EXECUTE_PUT_FALL_SEND_FULL_FINISH.getCode()); instructionService.update(inst); byte[] data = agvService.sendAgvOneModeInst(agvphase, index, 0); -// OneNDCSocketConnectionAutoRun.write(data); - agvphase = 0; - index = 0; - inst = null; - logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + agvphase + "反馈成功"); - } else { - logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + agvphase + "等待反馈"); - + OneNDCSocketConnectionAutoRun.write(data); + this.set(0, 0, null); } } diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java b/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java index b0622e69..b976164b 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java +++ b/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java @@ -199,6 +199,7 @@ public interface InstructionService { */ void cancelByLinkNum(String linkNum) throws Exception; + /** * 根据指令Id强制取消指令 *