change-图表

Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs

@@ -89,8 +89,15 @@ namespace Aucma.Core.SheetMetal.ViewModels
             });
             
             AddSelectData();//添加下拉菜单
-            RefreshHourAmount();//小时产量
-            RefreshMaterialStats();//型号产量
+            Task.Run(() =>
+            {
+                while (true)
+                {
+                    RefreshHourAmount();//小时产量
+                    RefreshMaterialStats();//型号产量
+                    Thread.Sleep(20000);
+                }
+            });
             //——测试——
             //InitEveryDayMethod();//小时产量 
             //InitExecMethod();//执行列表
@@ -109,8 +116,7 @@ namespace Aucma.Core.SheetMetal.ViewModels
         {
             RefreshHourAmount();//小时产量
             RefreshMaterialStats();//型号产量
-            // RefreshHourAmountChart();//小时产量
-            // RefreshMaterialChart();//型号产量
+           
             return Task.CompletedTask;
         } 
         #endregion
@@ -774,7 +780,7 @@ namespace Aucma.Core.SheetMetal.ViewModels
         /// <summary>
         /// 日产量柱状图X轴日期
         /// </summary>
-        private List<string> productionHourList;
+        private List<string> productionHourList = new List<string>();
 
         public List<string> ProductionHourList
         {
@@ -802,7 +808,7 @@ namespace Aucma.Core.SheetMetal.ViewModels
         /// <summary>
         /// 型号统计柱状图x轴物料类型
         /// </summary>
-        private List<string> materialNameList;
+        private List<string> materialNameList = new List<string>();
 
         public List<string> MaterialNameList
         {
@@ -959,14 +965,12 @@ namespace Aucma.Core.SheetMetal.ViewModels
             string stationCode = Appsettings.app("StationInfo", "StationCode");
             var hourAmount = _sysUserInfoServices.GetSheetMetaHourData(stationCode).Result;
             App.Current.Dispatcher.Invoke((Action)(() =>
-            {
-               
-               
+            {  
                 if (hourAmount != null)
-                {
-                    if (Achievement.Count != 0) Achievement.Clear();
+                { 
+                   Achievement.Clear();
+                   ProductionHourList.Clear();
 
-                    ProductionHourList = new List<string>();
                     ChartValues<ObservablePoint> hourAchievement1 = new ChartValues<ObservablePoint>();
                     ChartValues<ObservablePoint> hourAchievement2 = new ChartValues<ObservablePoint>();
                     int hour = 0;
@@ -1008,36 +1012,6 @@ namespace Aucma.Core.SheetMetal.ViewModels
         }
         #endregion
 
-        #region 更新小时产量统计
-        /// <summary>
-        /// 更新小时产量统计
-        /// </summary>
-        private void RefreshHourAmountChart()
-        {
-            //获取小时产量
-            string stationCode = Appsettings.app("StationInfo", "StationCode");
-            var hourAmount = _sysUserInfoServices.GetSheetMetaHourData(stationCode).Result;
-            App.Current.Dispatcher.Invoke((Action)(() =>
-            {
-               
-                if (hourAmount != null)
-                {
-                    int hour = 0;
-
-                    for (int i = 0; i < hourAmount.Count; i++)
-                    {
-                        Achievement[0].Values[i]  =
-                        new ObservablePoint(hour, Convert.ToDouble(hourAmount[i].FrontPlateAmount));
-
-                        Achievement[1].Values[i] =
-                       new ObservablePoint(hour, Convert.ToDouble(hourAmount[i].RearPanelAmount));
-                        hour++;
-                    }
-                }
-            }));
-        }
-        #endregion
-
         #region 刷新物料型号统计
         /// <summary>
         /// 刷新物料型号统计
@@ -1052,15 +1026,15 @@ namespace Aucma.Core.SheetMetal.ViewModels
                
                 if (sheetMetalTypeList != null)
                 {
+
                     #region 按类型统计
                     ChartValues<double> achievement1 = new ChartValues<double>();
                     ChartValues<double> achievement2 = new ChartValues<double>();
-                    if (ModelStatistics.Count != 0)
-                    {
-                        ModelStatistics.Clear();
-                    }
+                    
+                    ModelStatistics.Clear();
+                    MaterialNameList.Clear();
 
-                        MaterialNameList = new List<string>();
+                   
                     foreach (var item in sheetMetalTypeList)
                     {
                         achievement1.Add(Convert.ToInt32(item.FrontPlateAmount));
@@ -1093,6 +1067,38 @@ namespace Aucma.Core.SheetMetal.ViewModels
         }
         #endregion
 
+
+        #region 弃用--更新小时产量统计
+        /// <summary>
+        /// 更新小时产量统计
+        /// </summary>
+        //private void RefreshHourAmountChart()
+        //{
+        //    //获取小时产量
+        //    string stationCode = Appsettings.app("StationInfo", "StationCode");
+        //    var hourAmount = _sysUserInfoServices.GetSheetMetaHourData(stationCode).Result;
+        //    App.Current.Dispatcher.Invoke((Action)(() =>
+        //    {
+
+        //        if (hourAmount != null)
+        //        {
+        //            int hour = 0;
+
+        //            for (int i = 0; i < hourAmount.Count; i++)
+        //            {
+        //                Achievement[0].Values[i]  =
+        //                new ObservablePoint(hour, Convert.ToDouble(hourAmount[i].FrontPlateAmount));
+
+        //                Achievement[1].Values[i] =
+        //               new ObservablePoint(hour, Convert.ToDouble(hourAmount[i].RearPanelAmount));
+        //                hour++;
+        //            }
+        //        }
+        //    }));
+        //}
+        #endregion
+
+
         #region 刷新物料型号统计
         /// <summary>
         /// 刷新物料型号统计

Aucma.Core.SheetMetal/config/App.Ini

@@ -1,3 +1,14 @@
 [system]
 ExecState=1
 searchItems=101%102%103%104%12133%%%%%%%%%%%%%%
+ProductlineCode=CX_02
+#工位编号
+StationCode=1000
+#班组代码
+TeamCode=
+#班组名称
+TeamName=
+#用户名
+Account=
+#用于配置登录界面可见班组信息，查询展示当前产线并且班组编号包含该配置的班组
+TeamConfig=XKBJ