@ -39,6 +39,7 @@ using Admin.Core.Model.ViewModels;
using ChartsByTime = Admin . Core . Model . ViewModels . ChartsByTime ;
using LiveCharts.Defaults ;
using System.Windows.Documents ;
using Aucma.Core.ProductOffLineCX1.Config ;
/ *
@ -54,11 +55,11 @@ namespace Aucma.Core.ProductOffLineCX1.ViewModels
// 成品下线操作mes数据
private readonly IOffLineInfoServices ? _offLineInfoServices = App . ServiceProvider . GetService < IOffLineInfoServices > ( ) ;
private AppConfig appConfig = AppConfig . Instance ;
// System.Timers.Timer timer = new System.Timers.Timer(500);//界面刷新定时器
private readonly IBaseBomInfoServices ? _baseBomInfoServices ;
private OffLineBusiness offLineBusiness = OffLineBusiness . Instance ;
//
public IndexPageViewModel ( )
{
@ -67,8 +68,10 @@ namespace Aucma.Core.ProductOffLineCX1.ViewModels
OffLineBusiness . RefreshScanMateriaCodeEvent + = ModelToPage ;
OffLineBusiness . RefreshChartsEvent + = RefreshCharts ;
MainWindowViewModel. RefreshFirstPage ChartsEvent + = RefreshCharts ;
LoginPageViewModel. Refresh ChartsEvent + = RefreshCharts ;
MainWindowViewModel . RefreshFirstPageChartsEvent + = RefreshCharts ;
OffLineQty = "0" ;
InitializeAsync ( ) ;
}
@ -77,10 +80,10 @@ namespace Aucma.Core.ProductOffLineCX1.ViewModels
{
await Task . Run ( ( ) = >
{
RefreshCharts ( ) ;
RefreshCharts ( ) ;
listTime = _baseBomInfoServices . getWorkTime ( ) . Result ;
// listTime = _baseBomInfoServices.getWorkTime().Result;
} ) ;
@ -92,8 +95,8 @@ namespace Aucma.Core.ProductOffLineCX1.ViewModels
/// </summary>
public void RefreshCharts ( )
{
//
//
List < OffLineInfo > list = LoadData ( ) ;
// Console.WriteLine("刷新台数："+list.Count);
@ -337,9 +340,19 @@ namespace Aucma.Core.ProductOffLineCX1.ViewModels
{
try
{
if ( list = = null ) return ;
// 当日下线记录
List < OffLineInfo > offList = _offLineInfoServices . QueryAsync ( x = > x . ProductScanTime > = listTime [ 0 ] . startTime & & x . ProductScanTime < = listTime [ 11 ] . startTime & & x . ProductLineCode = = "CX_01" ) . Result ;
// y轴
if ( list = = null | | list . Count < = 0 )
{
Application . Current . Dispatcher . Invoke ( ( ) = >
{
ProductionHourList . Clear ( ) ;
Achievement . Clear ( ) ;
return ;
} ) ;
}
// List<OffLineInfo> offList = _offLineInfoServices.QueryAsync(x => x.ProductScanTime >= listTime[0].startTime && x.ProductScanTime <= listTime[11].startTime && x.ProductLineCode == "CX_02").Result;
Application . Current . Dispatcher . Invoke ( ( ) = >
{
@ -347,43 +360,39 @@ namespace Aucma.Core.ProductOffLineCX1.ViewModels
Achievement . Clear ( ) ;
#region 小时产量统计
//if (listTime == null)
//{
// listTime = _baseBomInfoServices.getWorkTime().Result;
// if (listTime == null) return;
//}
// List<string> xList = new List<string>();
foreach ( WorkTime workTime in listTime )
{
// xList.Add(workTime.startTime.Hour.ToString());
ProductionHourList . Add ( workTime . startTime . Hour . ToString ( ) ) ;
}
// ProductionHourList = xList;
// y轴
if ( list = = null | | list . Count < = 0 ) return ;
var result = list . GroupBy ( x = > x . ProductScanTime . Hour ) // 按照小时进行分组
. Select ( g = > new
{
Hour = g . Key . ToString ( ) , // 小时
Count = g . Count ( ) // 统计每个小时的个数
} ) . ToList ( ) ;
. Select ( g = > new
{
Hour = g . Key . ToString ( ) , // 小时
Count = g . Count ( ) // 统计每个小时的个数
} ) . ToList ( ) ;
ChartValues < ObservablePoint > achievement2 = new ChartValues < ObservablePoint > ( ) ;
int i = 0 ;
foreach ( string item in ProductionHourLis t)
foreach ( var workTime in result )
{
var target = result . Where ( x = > x . Hour = = item ) . FirstOrDefault ( ) ;
if ( target ! = null )
{
achievement2 . Add ( new ObservablePoint ( i , target . Count ) ) ;
}
else
{
achievement2 . Add ( new ObservablePoint ( i , 0 ) ) ;
}
i + + ;
ProductionHourList . Add ( $"{workTime.Hour}:00" ) ;
achievement2 . Add ( new ObservablePoint ( i + + , workTime . Count ) ) ;
}
//foreach (string item in result)
//{
// var target = result.Where(x => x.Hour == item).FirstOrDefault();
// if (target != null)
// {
// achievement2.Add(new ObservablePoint(i, target.Count));
// }
// else
// {
// achievement2.Add(new ObservablePoint(i, 0));
// }
// i++;
//}
var column2 = new ColumnSeries ( ) ;
column2 . DataLabels = true ;
column2 . Title = "产量" ;
@ -393,12 +402,12 @@ namespace Aucma.Core.ProductOffLineCX1.ViewModels
# endregion
#region 型号统计
// List<string> nameList = new List<string>();
// List<string> nameList = new List<string>();
ChartValues < int > achievement = new ChartValues < int > ( ) ;
var column = new ColumnSeries ( ) ;
MaterialNameList . Clear ( ) ;
// List<OffLineInfo> offList = _offLineInfoServices.QueryAsync(x => x.ProductScanTime >= listTime[0].startTime && x.ProductScanTime <= listTime[11].startTime).Result;
var modelList = offL ist. GroupBy ( x = > x . ProductModel ) ;
var modelList = l ist. GroupBy ( x = > x . ProductModel ) ;
foreach ( var item in modelList )
{
@ -412,8 +421,8 @@ namespace Aucma.Core.ProductOffLineCX1.ViewModels
column . Foreground = Brushes . White ;
// x轴
// MaterialNameList = null;
// MaterialNameList = nameList;
// MaterialNameList = null;
// MaterialNameList = nameList;
// y轴
//if (ModelStatistics.Count > 0)
//{
@ -585,14 +594,23 @@ namespace Aucma.Core.ProductOffLineCX1.ViewModels
{
// List<WorkTime> listTime = _baseBomInfoServices.getWorkTime().Result;
List < OffLineInfo > list = _offLineInfoServices . Query ( x = > x . ProductScanTime > = listTime [ 0 ] . startTime & & x . ProductScanTime < = listTime [ 11 ] . endTime & & x . ProductLineCode = = "CX_01" ) ;
// 当日下线记录
List < OffLineInfo > list = _offLineInfoServices . getTeamOffData ( appConfig . ProductlineCode , appConfig . TeamName ) ;
// List<OffLineInfo> list = _offLineInfoServices.Query(x => x.ProductScanTime >= listTime[0].startTime && x.ProductScanTime <= listTime[11].endTime && x.ProductLineCode == "CX_02");
if ( list = = null | | list . Count = = 0 )
{
Application . Current . Dispatcher . Invoke ( ( ) = >
{
ListItems . Clear ( ) ;
OffLineQty = "0" ;
} ) ;
return null ;
}
OffLineQty = list . Count . ToString ( ) ;
if ( list = = null | | list . Count < = 0 ) return null ;
list = list . OrderBy ( x = > x . ProductScanTime ) . ToList ( ) ;
// OffLineInfo record = _offLineInfoServices.FirstAsync().Result;
Application . Current . Dispatcher . Invoke ( ( ) = >
{
ListItems . Clear ( ) ;
liuwf
11 months ago