root/xinFengTianNeng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:增加输送线写入次数

Browse Source
This commit is contained in:
gongbaoxiong
2024-12-26 22:30:44 +08:00
parent 570386e093
commit eaca1e8a12
3 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
View File

@@ -1,10 +1,7 @@
package org.nl.acs.device_driver.basedriver.agv.ndcone;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpResponse;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.Data;
import lombok.RequiredArgsConstructor;
@@ -12,16 +9,12 @@ import lombok.extern.slf4j.Slf4j;
import org.nl.acs.AcsConfig;
import org.nl.acs.agv.server.NDCAgvService;
import org.nl.acs.auto.run.OneNDCSocketConnectionAutoRun;
import org.nl.acs.common.StandardOrdinarySiteDevice;
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.basedriver.siemens_conveyor.SiemensConveyorDeviceDriver;
import org.nl.acs.device_driver.basedriver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
import org.nl.acs.device_driver.basedriver.standard_storage.StandardStorageDeviceDriver;
import org.nl.acs.device_driver.driver.AbstractDeviceDriver;
import org.nl.acs.device_driver.tianneng.site.SiteDeviceDriver;
import org.nl.acs.ext.wms.data.BaseRequest;
import org.nl.acs.ext.wms.data.feedBackTaskStatus.FeedBackTaskStatusRequest;
import org.nl.acs.ext.wms.service.AcsToWmsService;
import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl;
@@ -32,12 +25,11 @@ import org.nl.acs.log.LokiLog;
import org.nl.acs.log.LokiLogType;
import org.nl.acs.log.service.DeviceExecuteLogService;
import org.nl.acs.opc.DeviceAppService;
import org.nl.acs.task.domain.Task;
import org.nl.acs.task.service.TaskService;
import org.nl.acs.task.service.dto.TaskDto;
import org.nl.acs.task.service.impl.TaskServiceImpl;
import org.nl.system.service.param.ISysParamService;
import org.nl.config.SpringContextHolder;
import org.nl.system.service.param.ISysParamService;
import org.nl.system.service.param.impl.SysParamServiceImpl;
import java.util.List;
@@ -210,21 +202,29 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
device = deviceAppService.findDeviceByCode(device_code);
if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
log.info("起点设备名称是{}",device_code);
// acsToWmsService.ghsmlqhfinish(task);
// acsToWmsService.ghsmlqhfinish(task);
}
if (ObjectUtil.isEmpty(device_code)) {
log.info(agvaddr + "对应设备号为空!");
logServer.deviceExecuteLog(this.device_code, "", "", "对应设备号为空" + device_code);
return;
}
//输送线对接
if (device.getDeviceDriver() instanceof SiteDeviceDriver) {
SiteDeviceDriver siteDeviceDriver = (SiteDeviceDriver) device.getDeviceDriver();
//输送线对接，增加取货完成写入确认信号10
siteDeviceDriver.writing(10);
siteDeviceDriver.writing(10);
siteDeviceDriver.writing(10);
siteDeviceDriver.writing(10);
siteDeviceDriver.writing(10);
try {
siteDeviceDriver.writing(10);
} catch (Exception e) {
for (int i = 0; i < 15; i++) {
try {
siteDeviceDriver.writing(10);
return;
} catch (Exception e1) {
log.error("tofix子母车取货完成，离开，写入{}输送线信号:10失败：{}{}", siteDeviceDriver.getDeviceCode(), e, e.getMessage());
}
}
}
}
//校验agv上报站点编号与指令起始点相同
if (ObjectUtil.isEmpty(inst)) {
@@ -303,7 +303,18 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
}
if (device.getDeviceDriver() instanceof SiteDeviceDriver) {
SiteDeviceDriver siteDeviceDriver = (SiteDeviceDriver) device.getDeviceDriver();
siteDeviceDriver.writing(12);
try {
siteDeviceDriver.writing(12);
} catch (Exception e) {
for (int i = 0; i < 15; i++) {
try {
siteDeviceDriver.writing(12);
return;
} catch (Exception e1) {
log.error("tofix子母车放货完成，离开，写入{}输送线信号:12失败：{}{}", siteDeviceDriver.getDeviceCode(), e, e.getMessage());
}
}
}
}
//校验agv上报站点编号与指令起始点相同
if (ObjectUtil.isEmpty(inst)) {

2
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/baoshijian/BaoshijianSiteDeviceDriver.java
View File

@@ -236,7 +236,7 @@ public class BaoshijianSiteDeviceDriver extends AbstractOpcDeviceDriver implemen
this.writing("x5", 1);
out = true;
} else {
log.error("tofix涂板线呼叫空架BaoshijianSiteDeviceDriver：" + device_code + "信号为" + mode + ":" + "x2" + ":" + x2 + ",请求空架任务失败！");
log.error("tofix涂板线呼叫空架BaoshijianSiteDeviceDriver：" + device_code + "mode信号为:" + mode + "last_mode信号为:" + last_mode + "," + "x2" + ":" + x2 + ",请求空架任务失败！失败原因:"+res_jo.getString("message"));
}
}

8
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java
View File

@@ -412,11 +412,15 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD
String result = acsToWmsService.applyTaskToWms(jsonObject);
JSONObject res_jo = JSONObject.parseObject(result);
if (StrUtil.equals(res_jo.getString("code"), "200")) {
this.writing(type);
this.writing(type);
this.writing(type);
this.setRequireSucess(true);
//log.info("tofix输送线呼叫空架SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + ",申请空架任务成功！");
log.info("tofix输送线呼叫空架SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + ",申请空架任务成功！");
log.info("tofix输送线呼叫空架SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + ",写入值："+type+"成功！");
} else {
//log.info("tofix输送线呼叫空架SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + ",申请空架任务失败！" + res_jo.getString("message"));
log.info("tofix输送线呼叫空架SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + ",申请空架任务失败！失败原因:" + res_jo.getString("message"));
log.info("tofix输送线呼叫空架SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + ",写入值："+type+"失败！");
}
return true;
}