修改校准

GcDevicePc/MDIBase.cs

@@ -1819,14 +1819,19 @@ namespace GcDevicePc
                 {
                     SharedSpace.MControl.errstr = null;
                     SharedSpace.MControl.zhouqi = globaldata.m_dpbuffer.ShowList.showtime.alltime;
-                    Trace.WriteLine(string.Format("开始校准{0},{1}", SharedSpace.MControl.zhouqi, SharedSpace.MControl.runcount), "sys");
+                  
                     if(SharedSpace.MControl.zhouqi*SharedSpace.MControl.runcount<=SharedSpace.MControl.dateend)
                     {
                      //   RunTableOpt(SharedSpace.MControl.path, SharedSpace.MControl.Name);
-                        RunTableOptWithCount(SharedSpace.MControl.path, SharedSpace.MControl.Name,100);
-                   // Thread.Sleep(60 * 1000);
+                      //  RunTableOptWithCount(SharedSpace.MControl.path, SharedSpace.MControl.Name,100);
+                        if (RunTableOpt(SharedSpace.MControl.path, SharedSpace.MControl.Name)==1)
+                        {
+                            Trace.WriteLine(string.Format("开始校准{0},{1}", SharedSpace.MControl.zhouqi, SharedSpace.MControl.runcount), "sys");
                             SharedSpace.MControl.SetRun = true;//仪器进入校准环境
                             AutoAdjust = DateTime.Now.AddSeconds(SharedSpace.MControl.dateend);
+                        }
+                   // Thread.Sleep(60 * 1000);
+                  
                   
                     }else
                     {
@@ -1839,24 +1844,33 @@ namespace GcDevicePc
                 {
                     SharedSpace.MControl.IsEnd = true;
                                 
-                   // RunTableOpt(SharedSpace.MControl.defaultPath, SharedSpace.MControl.defaultName);
-                    RunTableOptWithCount(SharedSpace.MControl.defaultPath, SharedSpace.MControl.defaultName, 1000);
-                   // Thread.Sleep(30 * 1000);
-                   // RunTableOptWithCount(65534);
+
+                    if(RunTableOpt(SharedSpace.MControl.defaultPath, SharedSpace.MControl.defaultName)==1)
+                    {
                         SharedSpace.MControl.SetOut = false;
                         SharedSpace.MControl.SetRun = false;
                         Trace.WriteLine("校准结束", "sys");
                     }
+
+                }
                 if (SharedSpace.MControl.forceEnd && SharedSpace.MControl.SetOut && SharedSpace.MControl.SetRun)
                 {
                     SharedSpace.MControl.IsEnd = false;
                    
                     //RunTableOpt(SharedSpace.MControl.defaultPath, SharedSpace.MControl.defaultName);
-                    RunTableOptWithCount(SharedSpace.MControl.defaultName, SharedSpace.MControl.defaultName, 1000);
+                    //RunTableOptWithCount(SharedSpace.MControl.defaultName, SharedSpace.MControl.defaultName, 1000);
                    // Thread.Sleep(30 * 1000);
+                    //SharedSpace.MControl.SetOut = false;
+                    //SharedSpace.MControl.SetRun = false;
+                    //Trace.WriteLine("强制校准结束", "sys");
+
+
+                    if (RunTableOpt(SharedSpace.MControl.defaultPath, SharedSpace.MControl.defaultName) == 1)
+                    {
                         SharedSpace.MControl.SetOut = false;
                         SharedSpace.MControl.SetRun = false;
                         Trace.WriteLine("强制校准结束", "sys");
+                    }
 
                 }