From 9b15f6cb76eb9e0caee8eec9ef3aca771b8cf1f5 Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Tue, 24 Sep 2024 19:33:45 +0800 Subject: [PATCH] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0=E6=94=B6=E7=89=87?= =?UTF-8?q?=E6=9C=BA=E5=B7=A5=E4=BD=9C=E6=A8=A1=E5=BC=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baoshijian/BaoshijianSiteDeviceDriver.java | 10 ++++++++++ .../service/impl/InstructionServiceImpl.java | 2 +- .../org/nl/acs/task/service/impl/TaskServiceImpl.java | 1 + .../main/java/org/nl/quartz/task/SyncDeviceStatus.java | 4 ++-- .../wms/cockpit/service/impl/CockpitServiceImpl.java | 3 +-- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/baoshijian/BaoshijianSiteDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/baoshijian/BaoshijianSiteDeviceDriver.java index cece14a..d329365 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/baoshijian/BaoshijianSiteDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/baoshijian/BaoshijianSiteDeviceDriver.java @@ -60,6 +60,8 @@ public class BaoshijianSiteDeviceDriver extends AbstractOpcDeviceDriver implemen private Date time = new Date(); int mode = 0; + int mode1 = 0; + int mode2 = 0; int error = 0; int move = 0; int task = 0; @@ -189,9 +191,13 @@ public class BaoshijianSiteDeviceDriver extends AbstractOpcDeviceDriver implemen if (x1 != last_x1 && x1 == 0) { log.info("设备{}反馈收片任务完成", this.device_code); + //DJW01运行中 + mode1 =0; this.writing("x6", 0); this.writing("x8", 0); } else if (x1 != last_x1 && x1 == 1 &&!in && x6==0 && x8==0) { + //DJW01收片完成 + mode1 =1; in = false; JSONObject jsonObject = new JSONObject(); String device_code = this.device_code + "DJW01"; @@ -209,9 +215,13 @@ public class BaoshijianSiteDeviceDriver extends AbstractOpcDeviceDriver implemen if (x2 != last_x2 && x2 == 0) { log.info("设备{}反馈上空架完成", this.device_code); + //DJW02运行中 + mode2 =0; this.writing("x5", 0); this.writing("x7", 0); } else if (x2 != last_x2 && x2 == 1 && !out && x5==0 && x7==0) { + //DJW02申请空盘 + mode2 =1; out = false; JSONObject jsonObject = new JSONObject(); String device_code = this.device_code + "DJW02"; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index 7e5acd1..2ff887a 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -413,7 +413,7 @@ public class InstructionServiceImpl extends CommonServiceImpl impleme instdto.setNext_point_code2(next_point_code2); instdto.setAgv_system_type(agv_system_type); instdto.setAgv_inst_type("1"); + instdto.setExt_task_id(acsTask.getExt_task_id()); instructionservice.create2(instdto); // acsTask.setTask_status("1"); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java index c8d911d..2d40e8d 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java @@ -100,12 +100,12 @@ public class SyncDeviceStatus { JSONObject json = new JSONObject(); json.put("device_code", baoshijianSiteDeviceDriver.getDeviceCode() + "DJW01"); json.put("move", baoshijianSiteDeviceDriver.getX1()); - json.put("mode", baoshijianSiteDeviceDriver.getX0()); + json.put("mode", baoshijianSiteDeviceDriver.getMode1()== 1 ? "收片完成" : "运行"); baoshijian.add(json); JSONObject json1 = new JSONObject(); json1.put("device_code", baoshijianSiteDeviceDriver.getDeviceCode() + "DJW02"); json1.put("move", baoshijianSiteDeviceDriver.getX2() == 1 ? 0 : 1); - json.put("mode", baoshijianSiteDeviceDriver.getX0()); + json1.put("mode", baoshijianSiteDeviceDriver.getMode2()== 1 ? "申请空盘" : "运行"); baoshijian.add(json1); } else if (device.getDeviceDriver() instanceof GuhuashiSiteDeviceDriver) { GuhuashiSiteDeviceDriver guhuashiSiteDeviceDriver=(GuhuashiSiteDeviceDriver)device.getDeviceDriver(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java index 2a1cb6a..a1b2c01 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java @@ -563,8 +563,7 @@ public class CockpitServiceImpl implements CockpitService { JSONObject jsonObject = (JSONObject) object; if (pointObj.getPoint_code().equals(jsonObject.getString("device_code"))) { one.put("move", jsonObject.getString("move") == null ? "0" : jsonObject.getString("move")); - //todo 模式，信号缺失 - one.put("mode", jsonObject.getString("mode") == null ? "0" : jsonObject.getString("mode")); + one.put("mode", StringUtils.isBlank(jsonObject.getString("mode"))? "运行" : jsonObject.getString("mode")); //todo 错误码(中文），信号缺失 one.put("error", jsonObject.getString("error") == null ? "0" : jsonObject.getString("error")); }