添加STD批处理非文件接口

GcDevicePc/MDIBase.cs

@@ -355,10 +355,14 @@ namespace GcDevicePc
 
         public void WaitHMIFree()
         {
-            this.backgroundWorker1.RunWorkerAsync();
-            WaitForm form = new WaitForm(this.backgroundWorker1);
-            form.ShowDialog(this);
-            form.Close();
+            if (globaldata.m_hmibuffer.gcinfo.hmistatus != 0)
+            {
+                this.backgroundWorker1.RunWorkerAsync();
+                WaitForm form = new WaitForm(this.backgroundWorker1, "Free");
+                form.ShowDialog(this);
+                form.Close();
+            }
+               
         }
 
         private void backgroundWorker2_DoWork(object sender, DoWorkEventArgs e)
@@ -417,10 +421,14 @@ namespace GcDevicePc
         }
         public void WaitHMIWork()
         {
-            this.backgroundWorker2.RunWorkerAsync();
-            WaitForm form = new WaitForm(this.backgroundWorker2);
-            form.ShowDialog(this);
-            form.Close();
+            if (globaldata.m_hmibuffer.gcinfo.methodstatus < 0 || globaldata.m_hmibuffer.gcinfo.methodstatus > 5)
+            {
+                this.backgroundWorker2.RunWorkerAsync();
+                WaitForm form = new WaitForm(this.backgroundWorker2, "Work");
+                form.ShowDialog(this);
+                form.Close();
+            }
+               
         }
   
         public void SendStopCMD()
@@ -1171,6 +1179,19 @@ namespace GcDevicePc
             }
         }
 
+        /// <summary>
+        /// 直接执行STD批处理
+        /// </summary>
+        /// <param name="count">次数</param>
+        private void RunTableOptWithCount(ushort count)
+        {
+            if (!String.IsNullOrEmpty(globaldata.connection_ip))
+            {
+                hmiopt.SetBatCount(count);
+                SendSTDCMD(); 
+            }
+        }
+
         /// <summary>
         /// 更新所需，关闭HMI
         /// </summary>

GcDevicePc/WaitForm.cs

@@ -21,6 +21,15 @@ namespace GcDevicePc
             this.backgroundWorker1.RunWorkerCompleted += new RunWorkerCompletedEventHandler(backgroundWorker1_RunWorkerCompleted);
         }
 
+        public WaitForm(BackgroundWorker backgroundWorker1,String title)
+        {
+            InitializeComponent();
+            this.backgroundWorker1 = backgroundWorker1;
+            this.backgroundWorker1.ProgressChanged += new ProgressChangedEventHandler(backgroundWorker1_ProgressChanged);
+            this.backgroundWorker1.RunWorkerCompleted += new RunWorkerCompletedEventHandler(backgroundWorker1_RunWorkerCompleted);
+            this.Text = "Wait For " + title;
+        }
+
         void backgroundWorker1_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
         {
             this.Close();//执行完之后，直接关闭页面