liuxy/HuaDongYiYaoACS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev：修改

Browse Source
This commit is contained in:
liuxy
2026-03-24 09:44:04 +08:00
parent e7dddca2eb
commit 92ae1388e5
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -312,13 +312,13 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
StandardOrdinarySiteDeviceDriver deviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver(); StandardOrdinarySiteDeviceDriver deviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver();
// 校验是否是需要人工取货 // 校验是否是需要人工取货
if (!"YPJ01,YPJ02,BYJ01,BYJ02".contains(device_code)) { if (!"YPJ01,YPJ02,BYJ01,BYJ02".contains(device_code)) {
deviceDriver.setIs_get_confirm(true); deviceDriver.setIs_put_confirm(true);
} }
if (deviceDriver.getIs_get_confirm()) { if (deviceDriver.getIs_put_confirm()) {
data = ndcAgvService.sendAgvOneModeInst(phase, index, 0); data = ndcAgvService.sendAgvOneModeInst(phase, index, 0);
log.info("agv进入" + device_code + "取货完成"); log.info("agv进入" + device_code + "取货完成");
flag = true; flag = true;
deviceDriver.setIs_get_confirm(false); deviceDriver.setIs_put_confirm(false);
} else { } else {
log.info("agv进入" + device_code + "等待上位下发取货完成信号"); log.info("agv进入" + device_code + "等待上位下发取货完成信号");
return; return;
@@ -501,13 +501,13 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
StandardOrdinarySiteDeviceDriver deviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver(); StandardOrdinarySiteDeviceDriver deviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver();
// 校验是否是需要人工取货 // 校验是否是需要人工取货
if (!"YPJ01,YPJ02,BYJ01,BYJ02".contains(device_code)) { if (!"YPJ01,YPJ02,BYJ01,BYJ02".contains(device_code)) {
deviceDriver.setIs_put_confirm(true); deviceDriver.setIs_get_confirm(true);
} }
if (deviceDriver.getIs_put_confirm()) { if (deviceDriver.getIs_get_confirm()) {
log.info("{}放货完成", device_code); log.info("{}放货完成", device_code);
data = ndcAgvService.sendAgvOneModeInst(phase, index, 0); data = ndcAgvService.sendAgvOneModeInst(phase, index, 0);
flag = true; flag = true;
deviceDriver.setIs_put_confirm(false); deviceDriver.setIs_get_confirm(false);
} else { } else {
log.info("{}等待上位下发放货完成信号", device_code); log.info("{}等待上位下发放货完成信号", device_code);
return; return;