提交

DHSoftware/MainWindow.cs

@@ -512,7 +512,8 @@ namespace DHSoftware
                 {
                     camera.CameraDisConnect();
                 }
-                PLC.PLCDisConnect();
+                if (PLC != null)
+                    PLC.PLCDisConnect();
                 CloseWindow.Instance.Close();// 关闭提示窗口
                                              //Application.Exit();
                 System.Environment.Exit(0);
@@ -570,7 +571,7 @@ namespace DHSoftware
         private List<SimboStationMLEngineSet> SimboStationMLEngineList = new List<SimboStationMLEngineSet>();
         private Dictionary<string, HDevEngineTool> HalconToolDict = new Dictionary<string, HDevEngineTool>();
         public List<RecongnitionLabel> RecongnitionLabelList { get; set; } = new List<RecongnitionLabel>();
-        public DateTime startTime;
+        public DateTime ProcessstartTime;
 
         private void HandleStartButton()
         {
@@ -581,7 +582,8 @@ namespace DHSoftware
 
         private void StartProcess()
         {
-            startTime= DateTime.Now;
+            ProcessstartTime= DateTime.Now;
+            lblstarttime.Text = ProcessstartTime.ToString("yyyy-MM-dd HH:mm:ss")
             //计数清零
             PieceCount = 0;
 
@@ -1017,12 +1019,16 @@ namespace DHSoftware
 
         public void CalculateOEE()
         {
-            TimeSpan timeSpan = DateTime.Now - startTime;
+            TimeSpan timeSpan = DateTime.Now - ProcessstartTime;
 
             UPH = (int)(ProductNum_Total / timeSpan.TotalHours) + 100;
             //UPM = (int)UPH / 60;
             this.BeginInvoke(new MethodInvoker(delegate ()
             {
+                lblNowtime.Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                label1.Text = UPH.ToString();
+                lblUPH.Text =  UPH.ToString();
+                lblNum.Text = ProductNum_Total.ToString();
                 labuph.Text = UPH.ToString();
             }));
         }
@@ -1050,5 +1056,10 @@ namespace DHSoftware
         private void splitter1_SplitterMoved(object sender, SplitterEventArgs e)
         {
         }
+
+        private void richTextBox1_TextChanged(object sender, EventArgs e)
+        {
+
+        }
     }
 }