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-20 23:56:10 +08:00
parent 3ed4f5fe10
commit 56914e4936
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -224,15 +224,15 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD
break; break;
case 6: case 6:
//空托盘出库 //空托盘出库
log.info("tofix输送线SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + "已无此信号协议，需输送线去掉"); //log.info("tofix输送线SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + "已无此信号协议，需输送线去掉");
break; break;
case 7: case 7:
//涂板线申请空盘 //涂板线申请空盘
log.info("tofix输送线SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + "已无此信号协议，需输送线去掉"); //log.info("tofix输送线SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + "已无此信号协议，需输送线去掉");
break; break;
case 8: case 8:
//空托盘出库 //空托盘出库
log.info("tofix输送线SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + "已无此信号协议，需输送线去掉"); //log.info("tofix输送线SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + "已无此信号协议，需输送线去掉");
break; break;
} }
switch (flag) { switch (flag) {

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

@@ -162,8 +162,8 @@ public class SyncDeviceStatus {
json.put("device_status", agvNdcOneDeviceDriver.getStatus()); json.put("device_status", agvNdcOneDeviceDriver.getStatus());
json.put("energyLevel", agvNdcOneDeviceDriver.getElectric_qty()); json.put("energyLevel", agvNdcOneDeviceDriver.getElectric_qty());
json.put("transportOrder", agvNdcOneDeviceDriver.getTransportOrder()); json.put("transportOrder", agvNdcOneDeviceDriver.getTransportOrder());
json.put("positionX", agvNdcOneDeviceDriver.getX()); json.put("positionX", agvNdcOneDeviceDriver.getX()+"0");
json.put("positionY", agvNdcOneDeviceDriver.getY()); json.put("positionY", agvNdcOneDeviceDriver.getY()+"0");
json.put("positionAngle", agvNdcOneDeviceDriver.getAngle()); json.put("positionAngle", agvNdcOneDeviceDriver.getAngle());
agv.add(json); agv.add(json);
} }