更新

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java

@@ -329,22 +329,14 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                             }
                         }
                     }
-                } else if (nextDevice.getDeviceDriver() instanceof PhotoelectricInspectionSiteDeviceDriver){
-                    photoelectricInspectionSiteDeviceDriver = (PhotoelectricInspectionSiteDeviceDriver) device.getDeviceDriver();
-                    if (photoelectricInspectionSiteDeviceDriver.getMove() == 0){
+                } else {
                     if (this.getNow_steps_type() == 4) {
                         this.writing("to_command", "4");
                         this.setNow_steps_type(5);
                     } else {
                         logServer.deviceExecuteLog(this.device_code, "", "", "未反馈电气信号原因:当前步骤不为允许放货（now_steps_type！=4）");
                     }
-                    } else {
-                        if (this.getNow_steps_type() == 4) {
-                            if (photoelectricInspectionSiteDeviceDriver.getMove() != 0){
-                                feedMessage = "烘箱对接位有货不允许放货!";
-                            }
-                        }
-                    }
+
                 }
             } else {
                 if (this.getNow_steps_type() == 4) {
@@ -456,10 +448,12 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
 
             //行架机械手申请任务
             if (mode == 2 && move == 0 && task == 0 && !requireSucess) {
-                applyTask();
+                boolean res = applyTask();
+                if (res){
                     notCreateInstMessage = "";
                     notCreateTaskMessage = "";
                     feedMessage = "";
+                }
             } else {
                 if (mode == 2) {
                     //if (!requireSucess) {

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/photoelectric_inspection_site/ItemProtocol.java

@@ -46,7 +46,7 @@ public class ItemProtocol {
 
     public static List<ItemDto> getReadableItemDtos() {
         ArrayList list = new ArrayList();
-        list.add(new ItemDto(item_move, "光电开关信号", "DB600.B2"));
+        list.add(new ItemDto(item_move, "光电开关信号", "DB5.B10"));
         return list;
     }
 

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java

@@ -681,10 +681,12 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
                             }
                         }
                         //没有生成异常取放货工位的任务 就生成正常关联取放货工位的任务
-                        instruction_require();
+                        boolean res = instruction_require();
+                        if (res){
                             feedMessage = "";
                             notCreateInstMessage = "";
                             notCreateTaskMessage = "";
+                        }
                     } else {
 
                         if (!requireSucess) {