diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo
index 62c3af3..6bcb8ff 100644
Binary files a/shangjian/.vs/BL/v17/.suo and b/shangjian/.vs/BL/v17/.suo differ
diff --git a/shangjian/XGL/FormItem/Main.xaml.cs b/shangjian/XGL/FormItem/Main.xaml.cs
index a980fc2..4b0da96 100644
--- a/shangjian/XGL/FormItem/Main.xaml.cs
+++ b/shangjian/XGL/FormItem/Main.xaml.cs
@@ -222,9 +222,10 @@ namespace XGL.FormItem
             {
                 FormingMachineService formingMachineService = new FormingMachineService();
                 DataTable dt = formingMachineService.GetFormingMachineState(deviceCode);
-                if (dt == null && time == 0)
+                if (dt == null)
                 {
-                    time = time + 1;
+                    LogHelper.instance.log.Warn("没有找到对应的设备，很有可能是断网了，请检查。");
+                    //time = time + 1;
                     //报警
                     serialHelper.ComOn();
                     serialHelper.redLightOn();
@@ -239,19 +240,21 @@ namespace XGL.FormItem
                System.Windows.Threading.DispatcherPriority.Render);
                 if (dt.Rows[0][0].ToString() == "1" )
                 {
-                    if (time == 6)
-                    {
+                    //if (time == 6)
+                    //{
                         //取消报警
                         serialHelper.ComOn();
                         serialHelper.redLightOff();
                         serialHelper.buzzerOff();
                         serialHelper.ComOff();
-                    }
+                    //}
                   
                 }
                 else
                 {
-                    time = 6;
+                    LogHelper.instance.log.Warn("设备状态异常，开启报警。");
+
+                    // time = 6;
                     //报警
                     serialHelper.ComOn();
                     serialHelper.redLightOn();
@@ -281,6 +284,15 @@ namespace XGL.FormItem
 
             //}
         }
+
+        private void Window_Closing(object sender, CancelEventArgs e)
+        {
+            //取消报警
+            serialHelper.ComOn();
+            serialHelper.redLightOff();
+            serialHelper.buzzerOff();
+            serialHelper.ComOff();
+        }
     }
   
 }