Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightCentralizedControlManagement

View/MonitorView.xaml.cs

@@ -36,6 +36,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
         private string machine;
         private string workOrder;
         private string dyelot;
+        private int machines_info=0;
         public static string Sys_log;
 
         private void Griddata_SelectionChanged(object sender, SelectionChangedEventArgs e)//设备列表
@@ -60,15 +61,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
 
         private void ListViewItem_DyeingMachine(object sender, MouseButtonEventArgs e)
         {
-
+            machines_info = 0;
         }
         private void ListViewItem_Conveyor(object sender, MouseButtonEventArgs e)
         {
-
+            machines_info = 1;
         }
         private void ListViewItem_Receipt(object sender, MouseButtonEventArgs e)
         {
-
+            machines_info = 2;
         }
 
         private void ListViewItem_Resume(object sender, MouseButtonEventArgs e)
@@ -120,9 +121,14 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                     if ((State_ == 101) || (State_ == 201) || (State_ == 202) || (State_ == 309))//获得细节信息
                     {
                         MainWindowViewModel.MachiensTcpClient[index].SendAsync("SC832" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", index));
-                        log.Text = Sys_log;
+                        if (machines_info == 0) { log.Text = Sys_log; }//信息
+                        else if (machines_info == 1) { }//输送状态
+                        else if (machines_info == 2) { }//单据
+                    }
+                    else 
+                    { 
+                        log.Text = null;
                     }
-                    else { log.Text = null; }
                     if ((State_ == 101) || (State_ == 201) || (State_ == 202) || (State_ == 309))//获得细节信息
                     {
                         MainWindowViewModel.MachiensTcpClient[index].SendAsync("SC831" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", index));