fefactor - 补全代码

SlnMesnac.WPF/ViewModel/IndexPage/ProductionLineViewModel.cs

@@ -240,6 +240,7 @@ namespace SlnMesnac.WPF.ViewModel.IndexPage
                 rfid._Action += RecvIdentifyData_Instance;
                 //rfid._RefreshLogMessageAction += RefreshLogMessage;
             });
+            LoadDeviceInfo();
             StartCheckStatus();
             //GetRFIDHistoryRecords();
             _currentDateTime = DateTime.Now;
@@ -479,6 +480,104 @@ namespace SlnMesnac.WPF.ViewModel.IndexPage
 
 
 
+        private void LoadDeviceInfo()
+        {
+            List<DeviceInfoConfig> DeviceInfos = appConfig.deviceInfoConfig.Where(x => x.Collectid == appConfig.StationCode && x.Deleteflag == 0).ToList();
+            List<Real_DataInfo> real_DataInfos = new List<Real_DataInfo>();
+
+            foreach (var item in DeviceInfos)
+            {
+                Real_DataInfo real_DataInfo = new Real_DataInfo()
+                {
+                    Name = item.Name,
+                    Deviceid = item.Deviceid,
+                    Connectstr = item.Connectstr,
+                    LineName = item.Name,
+                    LineNo = item.Addr,
+                    OrderNo = "",
+                    ProductType = "",
+                    WriteCount = "",
+                    RfidCount = "",
+                    IsOnline = "未连接",
+                    RfidASCII = "",
+                    RfidEPC = "",
+                    ReadTime = "",
+                    WriteTime = "",
+                    ProductStatus = "",
+                    WriteStatus = "",
+                };
+                real_DataInfos.Add(real_DataInfo);
+
+            }
+
+            //Real_DataInfo real_DataInfo = new Real_DataInfo()
+            //{
+            //    Name = "1",
+            //    Deviceid = "10001",
+            //    Connectstr = "192.168.0.1:20108",
+            //    LineNo = "6#",
+            //    OrderNo = "123456",
+            //    ProductType = "整芯带",
+            //    WriteCount = "0",
+            //    RfidCount = "20",
+            //    IsOnline = "未连接",
+            //    RfidASCII = "0",
+            //    RfidEPC = "0",
+            //    ReadTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+            //    WriteTime = DateTime.Now.AddSeconds(10).ToString("yyyy-MM-dd HH:mm:ss"),
+            //    ProductStatus = "生产中",
+            //    WriteStatus = "写入成功",
+            //};
+            //Real_DataInfo real_DataInfo2 = new Real_DataInfo()
+            //{
+            //    Name = "2",
+            //    Deviceid = "10002",
+            //    Connectstr = "127.0.0.1:20108",
+            //    LineNo = "7#",
+            //    OrderNo = "123456",
+            //    ProductType = "整芯带",
+            //    WriteCount = "0",
+            //    RfidCount = "20",
+            //    IsOnline = "未连接",
+            //    RfidASCII = "0",
+            //    RfidEPC = "0",
+            //    ReadTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+            //    WriteTime = DateTime.Now.AddSeconds(10).ToString("yyyy-MM-dd HH:mm:ss"),
+            //    ProductStatus = "生产中",
+            //    WriteStatus = "写入成功",
+            //};
+            //real_DataInfos.Add(real_DataInfo);
+            //real_DataInfos.Add(real_DataInfo2);
+            App.Current.Dispatcher.Invoke(() =>
+            {
+                Deviceinfo.Clear();
+
+                foreach (var item in real_DataInfos)
+                {
+                    Real_DataInfo real_DataInfo = new Real_DataInfo()
+                    {
+                        Name = item.Name,
+                        Deviceid = item.Deviceid,
+                        Connectstr = item.Connectstr,
+                        LineName = item.Name,
+                        LineNo = item.LineNo,
+                        OrderNo = item.OrderNo,
+                        ProductType = item.ProductType,
+                        WriteCount = item.WriteCount,
+                        RfidCount = item.RfidCount,
+                        IsOnline = item.IsOnline,
+                        RfidASCII = item.RfidASCII,
+                        ReadTime = item.ReadTime,
+                        WriteTime = item.WriteTime,
+                        ProductStatus = item.ProductStatus,
+                        WriteStatus = item.WriteStatus,
+                        RfidEPC = item.RfidEPC,
+                    };
+                    Deviceinfo.Add(real_DataInfo);
+                }
+            });
+        }
+
         #region 心跳检测
 
         private void StartCheckStatus()