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

UserClass/AsyncTcpClient.cs

@@ -117,6 +117,11 @@ namespace SunlightCentralizedControlManagement_SCCM_.UserClass
                     MonitorView.Sys_log = DAT.Substring(DAT.IndexOf("]") + 1);
                        
                 }//当前细节信息
+                else if (SYSAPI == "SC833")
+                {
+                    MonitorView.Sys_log = DAT.Substring(DAT.IndexOf("]") + 1);
+
+                }//当前领料单信息
                 else if (SYSAPI == "SC851")
                 {
                     DAT = DAT.Substring(DAT.IndexOf("]") + 1);

View/MonitorView.xaml.cs

@@ -124,10 +124,18 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                     int index = Convert.ToInt16(drEmployee.Field<object>("ID"));
                     if ((State_ == 101) || (State_ == 201) || (State_ == 202) || (State_ == 309))//获得细节信息
                     {                            
-                        MainWindowViewModel.MachiensTcpClient[index].SendAsync("SC832" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", index));
+                        if (machines_info == 0)
-                        if (machines_info == 0) { log.Text = Sys_log; }//信息
+                        {
-                        else if (machines_info == 1) { }//输送状态
+                            MainWindowViewModel.MachiensTcpClient[index].SendAsync("SC832" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", index));
-                        else if (machines_info == 2) { }//单据
+                        }//信息
+                        else if (machines_info == 1)
+                        {
+                        }//输送状态
+                        else if (machines_info == 2)
+                        {
+                            MainWindowViewModel.MachiensTcpClient[index].SendAsync("SC833" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", index));
+                        }//单据
+                        log.Text = Sys_log;
                     }
                     else 
                     {