From fb845ecfffb3cbceaed159e02249d581ae16415e Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Sat, 14 Dec 2024 10:55:21 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E9=87=8D=E6=96=B0=E7=BA=A6=E5=AE=9A?= =?UTF-8?q?=E8=BE=93=E9=80=81=E7=BA=BF=E8=A7=A6=E5=8F=91=E9=80=81=E7=A9=BA?= =?UTF-8?q?=E6=9E=B6=E8=AF=B7=E6=B1=82=EF=BC=8C=E5=86=99=E5=85=A5=E4=BF=A1?= =?UTF-8?q?=E5=8F=B75=EF=BC=9B=20=20=20=20=20=E5=A2=9E=E5=8A=A0=E5=AD=90?= =?UTF-8?q?=E6=AF=8D=E8=BD=A6=E5=8F=96=E8=B4=A7=E5=AE=8C=E6=88=90=E5=86=99?= =?UTF-8?q?=E5=85=A5=E8=BE=93=E9=80=81=E7=BA=BF=E4=BF=A1=E5=8F=B7=E6=97=A5?= =?UTF-8?q?=E5=BF=97=EF=BC=8C=E5=BE=85=E8=A7=82=E5=AF=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agv/server/impl/ZheDaAgvServiceImpl.java | 4 +- .../StandardInspectSiteDeviceDriver.java | 3 - .../tianneng/site/SiteDeviceDriver.java | 71 +++++++++---------- .../nl/quartz/task/QueryZDAgvTaskStatus.java | 4 +- 4 files changed, 37 insertions(+), 45 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java index 8e67c36..132f13e 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java @@ -192,9 +192,9 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService { siteDeviceDriver.writing(10); siteDeviceDriver.writing(10); siteDeviceDriver.writing(10); - log.error("子母车取货完成，离开，第1次写入{}输送线信号成功！",siteDeviceDriver.getDeviceCode()); + log.error("tofix子母车取货完成，离开，第1次写入{}输送线信号成功！",siteDeviceDriver.getDeviceCode()); }catch(Exception e){ - log.error("子母车取货完成，离开，第1次写入{}信号失败：{}{}",siteDeviceDriver.getDeviceCode(),e,e.getMessage()); + log.error("tofix子母车取货完成，离开，第1次写入{}信号失败：{}{}",siteDeviceDriver.getDeviceCode(),e,e.getMessage()); } } } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java index a7b4de8..d6b8fbe 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java @@ -19,8 +19,6 @@ import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.domain.Instruction; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.monitor.DeviceStageMonitor; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.opc.DeviceAppServiceImpl; import org.nl.acs.opc.WcsConfig; import org.nl.acs.route.service.RouteLineService; import org.nl.acs.route.service.dto.RouteLineDto; @@ -32,7 +30,6 @@ import org.nl.acs.utils.ConvertUtil; import org.nl.common.utils.CodeUtil; import org.nl.config.SpringContextHolder; import org.openscada.opc.lib.da.Server; -import org.springframework.beans.factory.annotation.Autowired; import java.util.Date; import java.util.HashMap; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java index b8f6728..9eeb9de 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java @@ -10,7 +10,6 @@ import lombok.extern.slf4j.Slf4j; import org.nl.acs.device.domain.Device; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RequestMethodEnum; import org.nl.acs.device_driver.RouteableDeviceDriver; import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; @@ -31,6 +30,7 @@ import org.nl.acs.task.service.mapper.TaskMapper; import org.nl.acs.utils.ConvertUtil; import org.nl.common.utils.CodeUtil; import org.nl.config.SpringContextHolder; + import java.util.Date; import java.util.HashMap; import java.util.List; @@ -216,29 +216,30 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD case 2: break; case 5: - //叫料 - if (move==0 && !requireSucess){ + //申请空盘 + if (move == 0 && !requireSucess) { + log.info("tofix输送线SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + ",满足请求条件，发出请求空架任务"); apply(5); } break; case 6: - //满料出库 - if(move==1 && !requireSucess){ - apply(6); - } - break; - case 7: - //申请空盘 - if (move==0 && !requireSucess){ - apply(7); - } - break; - case 8: - //空托盘出库 - if(move==1 && !requireSucess){ - apply(8); - } - break; + //空托盘出库，协议重新约，无此业务 + // if(move==1 && !requireSucess){ + // apply(6); + // } + // break; + // case 7: + // //申请空盘，协议重新约定位5 + // if (move==0 && !requireSucess){ + // apply(7); + // } + // break; + // case 8: + // //空托盘出库，协议重新约，无此业务 + // if(move==1 && !requireSucess){ + // apply(8); + // } + // break; } switch (flag) { @@ -345,12 +346,6 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD dto.setNext_point_code(next_device_codecode); dto.setUpdate_time(now); dto.setCreate_time(now); - -// WQLObject wo = WQLObject.getWQLObject("acs_task"); -// JSONObject json = (JSONObject) JSONObject.toJSON(dto); -// -// wo.insert(json); - Task entity = ConvertUtil.convert(dto, Task.class); taskMapper.insert(entity); requireSucess = false; @@ -416,13 +411,13 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD String device_code = this.device_code; jsonObject.put("device_code", device_code); jsonObject.put("requestDate", new Date()); - jsonObject.put("vehicle_type",this.pallet_type); + jsonObject.put("vehicle_type", this.pallet_type); jsonObject.put("requestNo", IdUtil.simpleUUID()); switch (type) { - case 7: - if(device_code.startsWith("ZCSSX")) { + case 5: + if (device_code.startsWith("ZCSSX")) { jsonObject.put("request_method_code", "KJQKTask"); - }else{ + } else { jsonObject.put("request_method_code", "TBXQKTask"); } break; @@ -430,15 +425,15 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD jsonObject.put("request_method_code", "KJSKTask"); break; } - String result=acsToWmsService.applyTaskToWms(jsonObject); + String result = acsToWmsService.applyTaskToWms(jsonObject); JSONObject res_jo = JSONObject.parseObject(result); -// if (StrUtil.equals(res_jo.getString("code"), "200")) { - this.writing(type); - this.setRequireSucess(true); - log.info("acs申请任务", this.device_code, "任务申请成功!"); -// }else{ -// this.writing(99); -// } + // if (StrUtil.equals(res_jo.getString("code"), "200")) { + this.writing(type); + this.setRequireSucess(true); + log.info("acs申请任务", this.device_code, "任务申请成功!"); + // }else{ + // this.writing(99); + // } return true; } } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/QueryZDAgvTaskStatus.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/QueryZDAgvTaskStatus.java index c2582bf..0851198 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/QueryZDAgvTaskStatus.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/QueryZDAgvTaskStatus.java @@ -84,9 +84,9 @@ public class QueryZDAgvTaskStatus { siteDeviceDriver.writing(10); siteDeviceDriver.writing(10); siteDeviceDriver.writing(10); - log.error("子母车反馈任务完成，第2次写入{}输送线信号成功！",siteDeviceDriver.getDeviceCode()); + log.error("tofix子母车反馈任务完成，第2次写入{}输送线信号成功！",siteDeviceDriver.getDeviceCode()); }catch(Exception e){ - log.error("子母车反馈任务完成，第2次写入检测站点驱动信号失败：{}{}",e,e.getMessage()); + log.error("tofix子母车反馈任务完成，第2次写入检测站点驱动信号失败：{}{}",e,e.getMessage()); } } }