foamRearStore
liuwf 9 months ago
parent c62669999f
commit b54fb58911

Binary file not shown.

@ -1 +1 @@
583c5b6c645debe49d04428230dc2fe6d47bad28
fc3d09b7d5a7b7e0dc9fb01d4cdd7deca8d1e7c3

@ -132,3 +132,52 @@ E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\TouchSocket.Core.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.TouchSocket.pdb
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\TouchSocket.xml
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Business\bin\Debug\TouchSocket.Core.xml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\Aucma.Scada.Business.dll.config
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\Aucma.Scada.Business.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\Aucma.Scada.Business.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\Aucma.Scada.HikRobot.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\Aucma.Scada.Model.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Common.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Config.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Log4net.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Plc.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Repository.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.TouchSocket.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\Microsoft.Bcl.AsyncInterfaces.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\Microsoft.Extensions.DependencyInjection.Abstractions.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\Microsoft.Extensions.DependencyInjection.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\System.Reactive.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\System.Reactive.Windows.Threading.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\System.Threading.Tasks.Extensions.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\MvCodeReaderSDK.Net.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\SqlSugar.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\Newtonsoft.Json.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\log4net.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\HslCommunication.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\TouchSocket.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\TouchSocket.Core.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\Aucma.Scada.HikRobot.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\Aucma.Scada.Model.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Common.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Config.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Log4net.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Plc.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Repository.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.Repository.dll.config
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\HighWayIot.TouchSocket.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\Microsoft.Bcl.AsyncInterfaces.xml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\Microsoft.Extensions.DependencyInjection.xml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\Microsoft.Extensions.DependencyInjection.Abstractions.xml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\System.Reactive.xml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\System.Reactive.Windows.Threading.xml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\System.Threading.Tasks.Extensions.xml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\Newtonsoft.Json.xml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\TouchSocket.xml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\bin\Debug\TouchSocket.Core.xml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.csproj.AssemblyReference.cache
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.csproj.CoreCompileInputs.cache
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.csproj.CopyComplete
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.pdb

@ -1 +1 @@
62462d30f462e01d406676454f558c2316152f02
3eb32e1004be51a33739d5edaf789c03063b8825

@ -32,3 +32,20 @@ E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.csproj.CopyComplete
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\Aucma.Scada.HikRobot.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\Aucma.Scada.HikRobot.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\HighWayIot.Config.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\HighWayIot.Log4net.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\MvCodeReaderSDK.Net.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\HighWayIot.Common.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\log4net.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\Newtonsoft.Json.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\HighWayIot.Config.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\HighWayIot.Log4net.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\HighWayIot.Common.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\bin\Debug\Newtonsoft.Json.xml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.csproj.AssemblyReference.cache
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.csproj.CoreCompileInputs.cache
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.csproj.CopyComplete
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.HikRobot\obj\Debug\Aucma.Scada.HikRobot.pdb

@ -1 +1 @@
936f1a7acc7fd093726a38678830636b5a490d72
0950971ed41497fad7d277ed90ba33c6b3992ef2

@ -14,3 +14,11 @@ E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.cspro
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.csproj.CopyComplete
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Model\bin\Debug\Aucma.Scada.Model.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Model\bin\Debug\Aucma.Scada.Model.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Model\bin\Debug\SqlSugar.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.csproj.AssemblyReference.cache
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.csproj.CoreCompileInputs.cache
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.csproj.CopyComplete
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.pdb

@ -9,12 +9,15 @@ using HighWayIot.Common;
using HighWayIot.Config;
using HighWayIot.Repository.service;
using LiveCharts;
using LiveCharts.Defaults;
using LiveCharts.Wpf;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Media;
@ -45,6 +48,12 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
outStoreBusiness.RefreshAssemblyPlanInitEvent += RefreshPlanInfoDataGrid;
assemblyPlanBusiness.PrintMessageEvent += PrintMessage;
Init();
Task.Run(() =>
{
Thread.Sleep(10000);
RefreshHourAmount();
});
}
#region 参数定义
@ -504,7 +513,8 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
Achievement.Clear();
ProductionHourList.Clear();
ProductionHourList = new List<string>();
ChartValues<double> hourAchievement = new ChartValues<double>();
ChartValues<ObservablePoint> hourAchievement = new ChartValues<ObservablePoint>();
int i = 0;
foreach (var item in hourAmount)
{
if(DateTime.Now.Hour>=8 && DateTime.Now.Hour <= 20)//白班
@ -512,7 +522,8 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
if (int.Parse(item.PRODUCT_HOUR) >= 8 && int.Parse(item.PRODUCT_HOUR) < 20)
{
ProductionHourList.Add(item.PRODUCT_HOUR);
hourAchievement.Add(Convert.ToDouble(item.PRODUCT_AMOUNT));
hourAchievement.Add(new ObservablePoint(i++, Convert.ToDouble(item.PRODUCT_AMOUNT)));
}
}
else
@ -520,11 +531,10 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
if (int.Parse(item.PRODUCT_HOUR) < 8 || int.Parse(item.PRODUCT_HOUR) >= 20) //夜班
{
ProductionHourList.Add(item.PRODUCT_HOUR);
hourAchievement.Add(Convert.ToDouble(item.PRODUCT_AMOUNT));
hourAchievement.Add(new ObservablePoint(i++, Convert.ToDouble(item.PRODUCT_AMOUNT)));
}
}
}
var houeColumn = new ColumnSeries();
houeColumn.DataLabels = true;

@ -1 +1 @@
cc485710ee7abbf37329b9de5fbe565ab0eced44
ab08d6d9e81661c4a30f788cc7edd459395aab0b

@ -82,3 +82,15 @@ E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Common\obj\Debug\HighWayIot.Common.cspro
E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Common\obj\Debug\HighWayIot.Common.csproj.CopyComplete
E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Common\obj\Debug\HighWayIot.Common.dll
E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Common\obj\Debug\HighWayIot.Common.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Common\bin\Debug\HighWayIot.Common.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Common\bin\Debug\HighWayIot.Common.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Common\bin\Debug\HighWayIot.Log4net.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Common\bin\Debug\Newtonsoft.Json.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Common\bin\Debug\log4net.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Common\bin\Debug\HighWayIot.Log4net.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Common\bin\Debug\Newtonsoft.Json.xml
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Common\obj\Debug\HighWayIot.Common.csproj.AssemblyReference.cache
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Common\obj\Debug\HighWayIot.Common.csproj.CoreCompileInputs.cache
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Common\obj\Debug\HighWayIot.Common.csproj.CopyComplete
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Common\obj\Debug\HighWayIot.Common.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Common\obj\Debug\HighWayIot.Common.pdb

@ -1 +1 @@
071e6bee6b7b08fc187cd293e005ec97edd9a03b
4a736cc23d6374b411d9c1707e05948754591004

@ -54,3 +54,17 @@ E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Config\obj\Debug\HighWayIot.Config.cspro
E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Config\obj\Debug\HighWayIot.Config.csproj.CopyComplete
E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Config\obj\Debug\HighWayIot.Config.dll
E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Config\obj\Debug\HighWayIot.Config.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Config\bin\Debug\HighWayIot.Config.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Config\bin\Debug\HighWayIot.Config.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Config\bin\Debug\HighWayIot.Common.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Config\bin\Debug\HighWayIot.Log4net.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Config\bin\Debug\Newtonsoft.Json.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Config\bin\Debug\log4net.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Config\bin\Debug\HighWayIot.Common.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Config\bin\Debug\HighWayIot.Log4net.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Config\bin\Debug\Newtonsoft.Json.xml
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Config\obj\Debug\HighWayIot.Config.csproj.AssemblyReference.cache
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Config\obj\Debug\HighWayIot.Config.csproj.CoreCompileInputs.cache
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Config\obj\Debug\HighWayIot.Config.csproj.CopyComplete
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Config\obj\Debug\HighWayIot.Config.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Config\obj\Debug\HighWayIot.Config.pdb

@ -1 +1 @@
703e552de3965c09411e20a995cd0166bd015281
a3b47c704bcb402ad4db59cfbb314435fb05a51c

@ -52,3 +52,11 @@ E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csp
E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csproj.CopyComplete
E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.dll
E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Log4net\bin\Debug\HighWayIot.Log4net.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Log4net\bin\Debug\HighWayIot.Log4net.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Log4net\bin\Debug\log4net.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csproj.AssemblyReference.cache
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csproj.CoreCompileInputs.cache
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csproj.CopyComplete
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.pdb

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save