From 92ae1388e5cf8912d3e1e2302c4c94042b8919af Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 24 Mar 2026 09:44:04 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java index 7e98ec4..a833342 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java @@ -312,13 +312,13 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic StandardOrdinarySiteDeviceDriver deviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver(); // 校验是否是需要人工取货 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); log.info("agv进入" + device_code + "取货完成"); flag = true; - deviceDriver.setIs_get_confirm(false); + deviceDriver.setIs_put_confirm(false); } else { log.info("agv进入" + device_code + "等待上位下发取货完成信号"); return; @@ -501,13 +501,13 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic StandardOrdinarySiteDeviceDriver deviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver(); // 校验是否是需要人工取货 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); data = ndcAgvService.sendAgvOneModeInst(phase, index, 0); flag = true; - deviceDriver.setIs_put_confirm(false); + deviceDriver.setIs_get_confirm(false); } else { log.info("{}等待上位下发放货完成信号", device_code); return;