更新

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

@@ -923,6 +923,24 @@ public class AgvServiceImpl implements AgvService {
                 }
             }
 
+            if (addressdevice.getDeviceDriver() instanceof StandardInspectSiteSmartDeviceDriver) {
+                standardInspectSiteSmartDeviceDriver = (StandardInspectSiteSmartDeviceDriver) addressdevice.getDeviceDriver();
+
+                //请求取货
+                if ("Load".equals(action)) {
+                    if(standardInspectSiteSmartDeviceDriver.getMode()>0
+                            && standardInspectSiteSmartDeviceDriver.getAction() == 3 && standardInspectSiteSmartDeviceDriver.getError()==0){
+                        is_feedback = true;
+                    }
+                    //请求放货
+                } else if ("Unload".equals(action)) {
+                    if(standardInspectSiteSmartDeviceDriver.getMode()>0
+                            && standardInspectSiteSmartDeviceDriver.getAction() == 3 && standardInspectSiteSmartDeviceDriver.getError()==0){
+                        is_feedback = true;
+                    }
+                }
+            }
+
             if (addressdevice.getDeviceDriver() instanceof StandardStorageDeviceDriver) {
                 //请求取货
                 if ("Load".equals(action)) {
@@ -966,7 +984,7 @@ public class AgvServiceImpl implements AgvService {
                     //如果开启呼叫按钮，那么就需要判断进出动作信号
                     if (ObjectUtil.isNotEmpty(apply_task) && apply_task.equals("true")) {
                         if (standardInspectSiteSmartDeviceDriver.getMode() != 0
-                                && standardInspectSiteSmartDeviceDriver.getMove() == 0
+                                //&& standardInspectSiteSmartDeviceDriver.getMove() == 0
                                 && standardInspectSiteSmartDeviceDriver.getAction() == 3
                                 && standardInspectSiteSmartDeviceDriver.getIo_action() == 3) {
                             inst.setExecute_device_code(processingVehicle);
@@ -974,7 +992,9 @@ public class AgvServiceImpl implements AgvService {
                             standardInspectSiteSmartDeviceDriver.writing(2);
                             is_feedback = true;
                         }
-                    } else if (standardInspectSiteSmartDeviceDriver.getMode() != 0 && standardInspectSiteSmartDeviceDriver.getMove() == 0) {
+                    } else if (standardInspectSiteSmartDeviceDriver.getMode() != 0
+                          //  && standardInspectSiteSmartDeviceDriver.getMove() == 0
+                    ) {
                         inst.setExecute_device_code(processingVehicle);
                         inst.setExecute_status("2");
                         standardInspectSiteSmartDeviceDriver.writing(2);
@@ -985,7 +1005,7 @@ public class AgvServiceImpl implements AgvService {
 
                     if (ObjectUtil.isNotEmpty(apply_task) && apply_task.equals("true")) {
                         if (standardInspectSiteSmartDeviceDriver.getMode() != 0
-                                && standardInspectSiteSmartDeviceDriver.getMove() > 0
+                               // && standardInspectSiteSmartDeviceDriver.getMove() > 0
                                 && standardInspectSiteSmartDeviceDriver.getAction() == 3
                                 && standardInspectSiteSmartDeviceDriver.getIo_action() == 3) {
                             inst.setExecute_device_code(address);
@@ -993,7 +1013,9 @@ public class AgvServiceImpl implements AgvService {
                             standardInspectSiteSmartDeviceDriver.writing(3);
                             is_feedback = true;
                         }
-                    } else if (standardInspectSiteSmartDeviceDriver.getMode() != 0 && standardInspectSiteSmartDeviceDriver.getMove() > 0) {
+                    } else if (standardInspectSiteSmartDeviceDriver.getMode() != 0
+                            //&& standardInspectSiteSmartDeviceDriver.getMove() > 0
+                     ) {
                         inst.setExecute_device_code(address);
                         inst.setExecute_status("4");
                         standardInspectSiteSmartDeviceDriver.writing(3);