更新

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

@@ -129,9 +129,13 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                 if (mode == 2) {
                     logServer.deviceExecuteLog(this.device_code, "", "", "信号复位前requireSuccess：" + requireSucess);
                     this.setRequireSucess(false);
-                    this.setNow_steps_type(0);
-                    message = null;
                     logServer.deviceExecuteLog(this.device_code, "", "", "信号复位后requireSuccess：" + requireSucess);
+//                    if (move == 0 && task == 0 && action == 0 && this.getNow_steps_type() != 0){
+//                        logServer.deviceExecuteLog(this.device_code, "", "", "当前执行步骤复位前:" + this.getNow_steps_type());
+//                        this.setNow_steps_type(0);
+//                        logServer.deviceExecuteLog(this.device_code, "", "", "当前执行步骤复位后:" + this.getNow_steps_type());
+//                    }
+                    message = null;
                 }
                 logServer.deviceItemValue(this.device_code, "mode", String.valueOf(mode));
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode);
@@ -201,7 +205,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                                 this.writing("to_command", "2");
                                 this.setNow_steps_type(3);
                             } else {
-                                logServer.deviceExecuteLog(this.device_code, "", "", "未反馈电气信号原因:当前步骤不为下发电气信号（now_steps_type！=2）");
+                                //logServer.deviceExecuteLog(this.device_code, "", "", "未反馈电气信号原因:当前步骤不为下发电气信号（now_steps_type！=2）");
                             }
                         } else {
                             if (this.getNow_steps_type() == 2) {
@@ -228,7 +232,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                             this.writing("to_command", "2");
                             this.setNow_steps_type(3);
                         } else {
-                            logServer.deviceExecuteLog(this.device_code, "", "", "未反馈电气信号原因:当前步骤不为下发电气信号（now_steps_type！=2）\")");
+                            //logServer.deviceExecuteLog(this.device_code, "", "", "未反馈电气信号原因:当前步骤不为下发电气信号（now_steps_type！=2）\")");
                         }
                     }
                 }
@@ -265,7 +269,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                         this.writing("to_command", "3");
                         this.setNow_steps_type(4);
                     } else {
-                        logServer.deviceExecuteLog(this.device_code, "", "", "未反馈电气信号原因:当前步骤不为允许取货（now_steps_type！=3）");
+                        //logServer.deviceExecuteLog(this.device_code, "", "", "未反馈电气信号原因:当前步骤不为允许取货（now_steps_type！=3）");
                     }
                 }
             } else {
@@ -307,7 +311,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                             this.setNow_steps_type(5);
                         } else {
                             feedMessage = "未反馈电气信号原因:当前步骤不为允许放货（now_steps_type！=4）";
-                            logServer.deviceExecuteLog(this.device_code, "", "", "未反馈电气信号原因:当前步骤不为允许放货（now_steps_type！=4）");
+                            //logServer.deviceExecuteLog(this.device_code, "", "", "未反馈电气信号原因:当前步骤不为允许放货（now_steps_type！=4）");
                         }
                     } else {
                         if (this.getNow_steps_type() == 4) {
@@ -334,7 +338,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                         this.writing("to_command", "4");
                         this.setNow_steps_type(5);
                     } else {
-                        logServer.deviceExecuteLog(this.device_code, "", "", "未反馈电气信号原因:当前步骤不为允许放货（now_steps_type！=4）");
+                        //logServer.deviceExecuteLog(this.device_code, "", "", "未反馈电气信号原因:当前步骤不为允许放货（now_steps_type！=4）");
                     }
 
                 }
@@ -395,7 +399,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                             this.setNow_steps_type(0);
                             feedMessage = "";
                         } else {
-                            logServer.deviceExecuteLog(this.device_code, "", "", "未反馈电气信号原因:当前步骤不为放货完成（now_steps_type！=5）");
+                            //logServer.deviceExecuteLog(this.device_code, "", "", "未反馈电气信号原因:当前步骤不为放货完成（now_steps_type！=5）");
                         }
 //                        this.writing("to_onset", "0");
 //                        this.writing("to_target", "0");
@@ -421,6 +425,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
             }
 
         } catch (Exception var17) {
+            var17.printStackTrace();
             feedMessage = var17.getMessage();
             logServer.deviceExecuteLog(this.getDevice_code(), "", "", "读取信号值时出现异常:" + var17.getMessage());
         }

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

@@ -134,6 +134,7 @@ public class PhotoelectricInspectionSiteDeviceDriver extends AbstractOpcDeviceDr
             }
 
         } catch (Exception var17) {
+            var17.printStackTrace();
             return;
         }
 

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java

@@ -226,6 +226,7 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
             }
 
         } catch (Exception var17) {
+            var17.printStackTrace();
             inst_message = var17.getMessage();
             logServer.deviceExecuteLog(this.getDevice_code(), "", "", "读取信号值时出现异常:" + var17.getMessage());
         }

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java

@@ -203,6 +203,7 @@ public class SiemensConveyorCkkDeviceDriver extends AbstractOpcDeviceDriver impl
             }
 
         } catch (Exception var17) {
+            var17.printStackTrace();
             inst_message = var17.getMessage();
             logServer.deviceExecuteLog(this.getDevice_code(), "", "", "读取信号值时出现异常:" + var17.getMessage());
         }

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java

@@ -211,6 +211,7 @@ public class SiemensConveyorLabelingDeviceDriver extends AbstractOpcDeviceDriver
       }
 
     } catch (Exception var17) {
+      var17.printStackTrace();
       inst_message = var17.getMessage();
       logServer.deviceExecuteLog(this.getDevice_code(), "", "", "读取信号值时出现异常:" + var17.getMessage());
       //            return;

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_onefloor_agv_conveyor/SiemensOneFloorAGVConveyorDeviceDriver.java

@@ -146,6 +146,7 @@ public class SiemensOneFloorAGVConveyorDeviceDriver extends AbstractOpcDeviceDri
             to_command = this.itemProtocol.getTo_command();
 
         } catch (Exception var17) {
+            var17.printStackTrace();
             inst_message = var17.getMessage();
             logServer.deviceExecuteLog(this.getDevice_code(), "", "", "读取信号值时出现异常:" + var17.getMessage());
         }

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

@@ -163,10 +163,14 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
                 if (mode == 2) {
                     logServer.deviceExecuteLog(device_code, "", "", "开始请求标记复位`此时请求标记值为:" + requireSucess);
                     requireSucess = false;
-                    this.setNow_steps_type1(0);
-                    this.setNow_steps_type2(0);
-                    this.setNow_steps_type3(0);
                     logServer.deviceExecuteLog(device_code, "", "", "请求标记复位成功`此时请求标记值为:" + requireSucess);
+//                    if (task1 == 0 && task2 == 0 && type == 0) {
+//                        logServer.deviceExecuteLog(device_code, "", "", "开始复位当前执行步骤");
+//                        this.setNow_steps_type1(0);
+//                        this.setNow_steps_type2(0);
+//                        this.setNow_steps_type3(0);
+//                        logServer.deviceExecuteLog(device_code, "", "", "复位当前执行步骤成功");
+//                    }
                 }
                 logServer.deviceItemValue(this.device_code, "mode", String.valueOf(mode));
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode);
@@ -638,6 +642,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
 
 
         } catch (Exception var17) {
+            var17.printStackTrace();
             feedMessage = var17.getMessage();
             logServer.deviceExecuteLog(this.device_code, "", "", "读取信号值时出现异常:" + var17.getMessage());
         }
@@ -682,7 +687,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
                         }
                         //没有生成异常取放货工位的任务 就生成正常关联取放货工位的任务
                         boolean res = instruction_require();
-                        if (res){
+                        if (res) {
                             feedMessage = "";
                             notCreateInstMessage = "";
                             notCreateTaskMessage = "";

acs/nladmin-ui/src/views/acs/history/instRecord/index.vue

@@ -104,6 +104,7 @@
             <span v-if="scope.row.instruction_status=='0' ">就绪</span>
             <span v-if="scope.row.instruction_status=='1' ">执行中</span>
             <span v-if="scope.row.instruction_status=='2' ">完成</span>
+            <span v-if="scope.row.instruction_status=='3' ">取消</span>
           </template>
         </el-table-column>
         <el-table-column prop="start_point_code" label="起点" />

acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue

@@ -237,6 +237,7 @@
             <span v-if="scope.row.task_status=='0' ">就绪</span>
             <span v-if="scope.row.task_status=='1' ">执行中</span>
             <span v-if="scope.row.task_status=='2' ">完成</span>
+            <span v-if="scope.row.task_status=='3' ">取消</span>
           </template>
         </el-table-column>
         <el-table-column prop="priority" label="任务优先级" />