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

ViewModel/MainWindowViewModel.cs

@@ -72,6 +72,7 @@ namespace DyeingComputer.ViewModel
             SQL_data();   //读数据库
             UPort();    //启动串口
             CountDown();   //启动循环任务
+            AsyncTcpServer.Main();
         }
         DataTable dt_con = new DataTable();
         DataTable dt_sys = new DataTable();
@@ -114,8 +115,11 @@ namespace DyeingComputer.ViewModel
         private int MT40;//低水位
         private int MT41;//安全水位
         private static int MU01;//呼叫操作员
-        private string S01;//机台号
-        private int S16;//机型
+        public static string S01;//机台号
+        public static string S03;//设备组
+        public static string S05;//管控模式
+        public static string S06;//通讯编码
+        public static int S16;//机型
         public static int SM01;//副缸
         public static int SM02;//副缸
         public static int SM03;//副缸
@@ -160,6 +164,9 @@ namespace DyeingComputer.ViewModel
             MS19 = Convert.ToInt16(Selet_con("MS19"));
 
             S01 = Selet_sys("S01");//
+            S03 = Selet_sys("S03");//
+            S05 = Selet_sys("S05");//
+            S06 = Selet_sys("S06");//
             S16 = Convert.ToInt16(Selet_sys("S16"));//工作信息
             SM01 = Convert.ToInt16(Selet_sys("SM01"));//FG
             SM02 = Convert.ToInt16(Selet_sys("SM02"));//FG