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-27 17:18:47 +08:00
parent 5b37012b43
commit c52c8766d8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -311,7 +311,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
StandardOrdinarySiteDeviceDriver deviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver(); 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); deviceDriver.setIs_put_confirm(true);
} }
if (deviceDriver.getIs_put_confirm()) { if (deviceDriver.getIs_put_confirm()) {
@@ -500,7 +500,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
StandardOrdinarySiteDeviceDriver deviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver(); 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); deviceDriver.setIs_get_confirm(true);
} }
if (deviceDriver.getIs_get_confirm()) { if (deviceDriver.getIs_get_confirm()) {

2
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
View File

@@ -540,7 +540,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
StandardOrdinarySiteDeviceDriver deviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver(); 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")) { if (type.equals("1")) {
// 取货完成 // 取货完成
response.setStatus(200); response.setStatus(200);