From 738110ca9bc7b6ec8832ebb2ac53084e3ab14252 Mon Sep 17 00:00:00 2001 From: tuqiang <437016993@qq.com> Date: Sat, 28 Feb 2026 13:32:30 +0800 Subject: [PATCH] =?UTF-8?q?OPT=EF=BC=9A=E5=A5=97=E4=BB=B6=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StandardInspectSiteDeviceDriver.java | 59 +++++++++++++------ .../StandardOrdinarySiteDeviceDriver.java | 28 ++++++--- .../wms/service/impl/NDCToAcsServiceImpl.java | 1 - 3 files changed, 61 insertions(+), 27 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java index 13825b0..c61a668 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java @@ -178,7 +178,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp if (ObjectUtils.isEmpty(result) || result.getStatus() != 200) { return; } else { - resetInstTask(); + resetInstTask(agvphase); } } else { Object ext_system = device.getExtraValue().get("ext_system"); @@ -206,7 +206,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) { return; } else { - resetInstTask(); + resetInstTask(agvphase); } } else { log.error("请求wms取货失败参数:{}", response); @@ -257,7 +257,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) { return; } else { - resetInstTask(); + resetInstTask(agvphase); } } else { log.error("请求焊接线失败，申请区货 错误信息{}", response); @@ -280,7 +280,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) { return; } else { - resetInstTask(); + resetInstTask(agvphase); } } } else { @@ -313,7 +313,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp if (ObjectUtils.isEmpty(result) || result.getStatus() != 200) { return; } else { - resetInstTask(); + resetInstTask(agvphase); } } else { Object ext_system = device.getExtraValue().get("ext_system"); @@ -341,7 +341,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) { return; } else { - resetInstTask(); + resetInstTask(agvphase); } } else { log.error("请求wms取货失败参数:{}", response); @@ -385,7 +385,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) { return; } else { - resetInstTask(); + resetInstTask(agvphase); } } else { log.info("请求焊接线失败，申请取货完成 错误信息{}", response2); @@ -415,7 +415,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) { return; } else { - resetInstTask(); + resetInstTask(agvphase); } } } @@ -442,7 +442,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) { return; } else { - resetInstTask(); + resetInstTask(agvphase); } } else { Object ext_system = device.getExtraValue().get("ext_system"); @@ -470,7 +470,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) { return; } else { - resetInstTask(); + resetInstTask(agvphase); } } else { log.error("请求wms请求放货失败参数:{}", response); @@ -503,7 +503,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) { return; } else { - resetInstTask(); + resetInstTask(agvphase); } } else { log.error("请求焊接线放货失败，申请区货 错误信息{}", response); @@ -521,7 +521,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) { return; } else { - resetInstTask(); + resetInstTask(agvphase); } } } else { @@ -547,7 +547,12 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) { return; } else { - resetInstTask(); + try { + instructionService.finish(instruction.getInstruction_id()); + } catch (Exception e) { + e.printStackTrace(); + } + resetInstTask(agvphase); } } else { Object ext_system = device.getExtraValue().get("ext_system"); @@ -575,7 +580,12 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) { return; } else { - resetInstTask(); + try { + instructionService.finish(instruction.getInstruction_id()); + } catch (Exception e) { + e.printStackTrace(); + } + resetInstTask(agvphase); } } else { log.error("请求wms放货失败参数:{}", response); @@ -618,7 +628,12 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) { return; } else { - resetInstTask(); + try { + instructionService.finish(instruction.getInstruction_id()); + } catch (Exception e) { + e.printStackTrace(); + } + resetInstTask(agvphase); } } else { log.info("请求焊接线放货货完成失败 错误信息{}", response2); @@ -650,7 +665,12 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp if (ObjectUtils.isEmpty(result1) || result1.getStatus() != 200) { return; } else { - resetInstTask(); + try { + instructionService.finish(instruction.getInstruction_id()); + } catch (Exception e) { + e.printStackTrace(); + } + resetInstTask(agvphase); } } else { log.info("请求MES放货货完成失败 错误信息{}", responseCode); @@ -870,6 +890,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp // B设置新任务 @Override public void setDeviceInnerParam(String taskId, String agvphase) { + System.out.println("任务号:"+taskId+"-------"+agvphase); synchronized (lock) { // 不允许设置和上次处理相同的taskId if (taskId.equals(lastTakeInstCode)) { @@ -883,11 +904,13 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp } } // B设置新任务 - public void resetInstTask() { + public void resetInstTask(Integer agvphase) { synchronized (lock) { // 设置新任务 // 处理完成，更新状态 - this.lastTakeInstCode = reqTakeInstCode; + if (Integer.valueOf(4).equals(agvphase)){ + this.lastTakeInstCode = reqTakeInstCode; + } this.reqTakeRequireSuccess = false; this.reqTakeInstCode = null; this.agvphase = 0; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java index beeecd8..6e46ad5 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java @@ -161,7 +161,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple if (ObjectUtils.isEmpty(result) || result.getStatus() != 200) { return; } else { - resetInstTask(); + resetInstTask(agvphase); } } if (agvphase == 2) { @@ -181,7 +181,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple if (ObjectUtils.isEmpty(result) || result.getStatus() != 200) { return; } else { - resetInstTask(); + resetInstTask(agvphase); } } else { //MES下发需要上报取货完成 @@ -204,7 +204,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple if (ObjectUtils.isEmpty(result) || result.getStatus() != 200) { return; } else { - resetInstTask(); + resetInstTask(agvphase); } } } @@ -224,7 +224,7 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple if (ObjectUtils.isEmpty(result) || result.getStatus() != 200) { return; } else { - resetInstTask(); + resetInstTask(agvphase); } } if (agvphase == 4) { @@ -244,7 +244,12 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple if (ObjectUtils.isEmpty(result) || result.getStatus() != 200) { return; } else { - resetInstTask(); + try { + instructionService.finish(instruction.getInstruction_id()); + } catch (Exception e) { + e.printStackTrace(); + } + resetInstTask(agvphase); } } else { //mes下发需要上报放货完成 @@ -284,7 +289,12 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple if (ObjectUtils.isEmpty(result) || result.getStatus() != 200) { return; } else { - resetInstTask(); + try { + instructionService.finish(instruction.getInstruction_id()); + } catch (Exception e) { + e.printStackTrace(); + } + resetInstTask(agvphase); } } } @@ -355,11 +365,13 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple } } // B设置新任务 - public void resetInstTask() { + public void resetInstTask(Integer agvphase) { synchronized (lock) { // 设置新任务 // 处理完成，更新状态 - this.lastTakeInstCode = reqTakeInstCode; + if (Integer.valueOf(4).equals(agvphase)){ + this.lastTakeInstCode = reqTakeInstCode; + } this.reqTakeRequireSuccess = false; this.reqTakeInstCode = null; this.agvphase = 0; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/NDCToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/NDCToAcsServiceImpl.java index 9235ed4..5bd924b 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/NDCToAcsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/NDCToAcsServiceImpl.java @@ -117,7 +117,6 @@ public class NDCToAcsServiceImpl implements NDCToAcsService { } //taskPhase 任务完成 if (TaskStateEnum.COMPLETED.getValue().equals(taskState)){ - instructionService.finish(instruction.getInstruction_id()); resp.put("code", "200"); resp.put("message", "完成任务成功"); log.info("---响应kit请求---"+resp.toString());