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 4b02cfd..d0ba57f 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 @@ -311,7 +311,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { StandardOrdinarySiteDeviceDriver deviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver(); // 校验是否是需要人工取货 - if (!"YPJ01,YPJ02,BYJ01,BYJ02".contains(device_code)) { + if (!"YPJ01,YPJ02,BYJ01,BYJ02,NBZS01,NBZS02".contains(device_code)) { deviceDriver.setIs_put_confirm(true); } if (deviceDriver.getIs_put_confirm()) { @@ -500,7 +500,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { StandardOrdinarySiteDeviceDriver deviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver(); // 校验是否是需要人工取货 - if (!"YPJ01,YPJ02,BYJ01,BYJ02".contains(device_code)) { + if (!"YPJ01,YPJ02,BYJ01,BYJ02,NBZS01,NBZS02".contains(device_code)) { deviceDriver.setIs_get_confirm(true); } if (deviceDriver.getIs_get_confirm()) { diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index dc2e9c3..b3db880 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -540,7 +540,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { StandardOrdinarySiteDeviceDriver deviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver(); - if ("YPJ01,YPJ02,BYJ01,BYJ02".contains(device_code)) { + if ("YPJ01,YPJ02,BYJ01,BYJ02,NBZS01,NBZS02".contains(device_code)) { if (type.equals("1")) { // 取货完成 response.setStatus(200);