Browse Source

更新

master
loujf 2 years ago
parent
commit
850faa080c
  1. 4
      hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java
  2. 4
      hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site_smart200/StandardInspectSiteSmartDeviceDriver.java

4
hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java

@ -1454,14 +1454,14 @@ public class AgvServiceImpl implements AgvService {
&& standardInspectSiteSmartDeviceDriver.getAction() == 3 && standardInspectSiteSmartDeviceDriver.getAction() == 3
&& standardInspectSiteSmartDeviceDriver.getIo_action() == 3) { && standardInspectSiteSmartDeviceDriver.getIo_action() == 3) {
standardInspectSiteSmartDeviceDriver.writing(2); standardInspectSiteSmartDeviceDriver.writing(3);
flag = true; flag = true;
} }
} else if (standardInspectSiteSmartDeviceDriver.getMode() != 0 } else if (standardInspectSiteSmartDeviceDriver.getMode() != 0
// && standardInspectSiteSmartDeviceDriver.getMove() == 0 // && standardInspectSiteSmartDeviceDriver.getMove() == 0
) { ) {
standardInspectSiteSmartDeviceDriver.writing(2); standardInspectSiteSmartDeviceDriver.writing(3);
flag = true; flag = true;
} }
} }

4
hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site_smart200/StandardInspectSiteSmartDeviceDriver.java

@ -371,11 +371,11 @@ public class StandardInspectSiteSmartDeviceDriver extends AbstractOpcDeviceDrive
switch (flag) { switch (flag) {
//取货完成 //取货完成
case 1: case 1:
writing(2); // writing(2);
return; return;
//放货完成 //放货完成
case 2: case 2:
writing(3); // writing(3);
return; return;
} }

Loading…
Cancel
Save