diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java index d728390..0385f7c 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java @@ -224,7 +224,7 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable { log.info("agv车号为"+carno+",进入自动门:"+device_code+"区域,请求开门中"); // 状态不为0且门开到位 - if (driver.getMode() != 0 && driver.getAction() == 1) { + if (driver.getMode() != 0) { flag = true; } else { String message = "自动门未联机或未开到位,无法开门。"; diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/log/AgvNdcOneDeviceDriver.xml b/acs/nladmin-system/nlsso-server/src/main/resources/log/AgvNdcOneDeviceDriver.xml index 5ea9f1d..96e6c0a 100644 --- a/acs/nladmin-system/nlsso-server/src/main/resources/log/AgvNdcOneDeviceDriver.xml +++ b/acs/nladmin-system/nlsso-server/src/main/resources/log/AgvNdcOneDeviceDriver.xml @@ -26,7 +26,7 @@ 512 - + diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/log/AutoCreateInst.xml b/acs/nladmin-system/nlsso-server/src/main/resources/log/AutoCreateInst.xml index 46daf98..4fb769b 100644 --- a/acs/nladmin-system/nlsso-server/src/main/resources/log/AutoCreateInst.xml +++ b/acs/nladmin-system/nlsso-server/src/main/resources/log/AutoCreateInst.xml @@ -26,7 +26,7 @@ 512 - + diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/log/NDCSocketConnectionAutoRun.xml b/acs/nladmin-system/nlsso-server/src/main/resources/log/NDCSocketConnectionAutoRun.xml index 9cf9b38..de1d31c 100644 --- a/acs/nladmin-system/nlsso-server/src/main/resources/log/NDCSocketConnectionAutoRun.xml +++ b/acs/nladmin-system/nlsso-server/src/main/resources/log/NDCSocketConnectionAutoRun.xml @@ -26,7 +26,7 @@ 512 - +