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

rev:增加agv取空架，写入确认信号10取货完成。

Browse Source
This commit is contained in:
gongbaoxiong
2024-12-19 15:17:12 +08:00
parent c30b60ed92
commit d1c869bbc5
3 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -217,6 +217,11 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
logServer.deviceExecuteLog(this.device_code, "", "", "对应设备号为空" + device_code); logServer.deviceExecuteLog(this.device_code, "", "", "对应设备号为空" + device_code);
return; return;
} }
if (device.getDeviceDriver() instanceof SiteDeviceDriver) {
SiteDeviceDriver siteDeviceDriver = (SiteDeviceDriver) device.getDeviceDriver();
//输送线对接，增加取货完成写入确认信号10
siteDeviceDriver.writing(10);
}
//校验agv上报站点编号与指令起始点相同 //校验agv上报站点编号与指令起始点相同
if (ObjectUtil.isEmpty(inst)) { if (ObjectUtil.isEmpty(inst)) {
log.info("未找到关联编号{}对应的指令", ikey); log.info("未找到关联编号{}对应的指令", ikey);

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

@@ -216,32 +216,31 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD
case 2: case 2:
break; break;
case 5: case 5:
//申请空盘 //输送线申请空盘
if (move == 0 && !requireSucess) { if (move == 0 && !requireSucess) {
log.info("tofix输送线SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + ",满足请求条件，发出请求空架任务"); log.info("tofix输送线SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + ",满足请求条件，发出请求空架任务");
apply(5); apply(5);
} }
break; break;
case 6: case 6:
//空托盘出库，协议重新约，无此业务 //空托盘出库
// if(move==1 && !requireSucess){ if (move == 1 && !requireSucess) {
// apply(6); apply(6);
// } }
// break; break;
// case 7: case 7:
// //申请空盘，协议重新约定位5 //涂板线申请空盘
// if (move==0 && !requireSucess){ if (move == 0 && !requireSucess) {
// apply(7); apply(7);
// } }
// break; break;
// case 8: case 8:
// //空托盘出库，协议重新约，无此业务 //空托盘出库
// if(move==1 && !requireSucess){ if (move == 1 && !requireSucess) {
// apply(8); apply(8);
// } }
// break; break;
} }
switch (flag) { switch (flag) {
//取货完成 //取货完成
case 1: case 1:
@@ -416,11 +415,15 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD
switch (type) { switch (type) {
case 5: case 5:
if (device_code.startsWith("ZCSSX")) { if (device_code.startsWith("ZCSSX")) {
log.info("tofix输送线SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + ",满足请求条件，发出请求空架任务");
jsonObject.put("request_method_code", "KJQKTask"); jsonObject.put("request_method_code", "KJQKTask");
} else { } else {
jsonObject.put("request_method_code", "TBXQKTask"); jsonObject.put("request_method_code", "TBXQKTask");
} }
break; break;
case 7:
jsonObject.put("request_method_code", "TBXQKTask");
break;
case 8: case 8:
jsonObject.put("request_method_code", "KJSKTask"); jsonObject.put("request_method_code", "KJSKTask");
break; break;

2
acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java
View File

@@ -246,7 +246,7 @@ public class SyncDeviceStatus {
redisUtils.set("agv", agv); redisUtils.set("agv", agv);
// log.trace("自动上报驱动状态，完毕耗时{}", System.currentTimeMillis() - startTime); // log.trace("自动上报驱动状态，完毕耗时{}", System.currentTimeMillis() - startTime);
} catch (Exception e) { } catch (Exception e) {
log.error("自动线程开始查询AGV设备，自动上报驱动状态失败{}{}", e, e.getMessage()); log.error("tofix自动线程开始查询AGV设备，自动上报驱动状态失败{}{}", e, e.getMessage());
} }
} }
} }