diff --git a/.vs/HighWayIot/FileContentIndex/65b49a7c-a0af-436a-aee7-042a73912af1.vsidx b/.vs/HighWayIot/FileContentIndex/65b49a7c-a0af-436a-aee7-042a73912af1.vsidx
new file mode 100644
index 00000000..8537588f
Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/65b49a7c-a0af-436a-aee7-042a73912af1.vsidx differ
diff --git a/.vs/HighWayIot/FileContentIndex/d4561008-11d8-442a-b88b-eb66494f1b0c.vsidx b/.vs/HighWayIot/FileContentIndex/d4561008-11d8-442a-b88b-eb66494f1b0c.vsidx
new file mode 100644
index 00000000..077e777f
Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/d4561008-11d8-442a-b88b-eb66494f1b0c.vsidx differ
diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo
index 672c8970..3c61da41 100644
Binary files a/.vs/HighWayIot/v17/.suo and b/.vs/HighWayIot/v17/.suo differ
diff --git a/Aucma.Scada.Business/AssemblyPlanBusiness.cs b/Aucma.Scada.Business/AssemblyPlanBusiness.cs
index 89b01872..9cd96bb9 100644
--- a/Aucma.Scada.Business/AssemblyPlanBusiness.cs
+++ b/Aucma.Scada.Business/AssemblyPlanBusiness.cs
@@ -278,5 +278,23 @@ namespace Aucma.Scada.Business
}
return planInfo;
}
+
+ ///
+ /// 获取小时产量
+ ///
+ ///
+ public List GetHourAmount()
+ {
+ return _executePlanInfoService.GetStationHourAmount(appConfig.stationCode);
+ }
+
+ ///
+ /// 获取物料型号统计
+ ///
+ ///
+ public List GetMaterialStats()
+ {
+ return _executePlanInfoService.GetStationMaterialStats(appConfig.stationCode);
+ }
}
}
diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll
index ea5a3f2e..add4d681 100644
Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll differ
diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb
index 3c54f213..3d3ef6a5 100644
Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb differ
diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll
index 879c584b..e9615603 100644
Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll differ
diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb
index cbc3ae5d..41545909 100644
Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb differ
diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache
index 4941a76b..1493e5a1 100644
Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache differ
diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll
index ea5a3f2e..add4d681 100644
Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll differ
diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb
index 3c54f213..3d3ef6a5 100644
Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb differ
diff --git a/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache b/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache
index c7b25d59..d63f4912 100644
Binary files a/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache and b/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache differ
diff --git a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache
index dbcd9fbc..75f86db8 100644
Binary files a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache and b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache differ
diff --git a/Aucma.Scada.UI/MainWindow.xaml b/Aucma.Scada.UI/MainWindow.xaml
index e1dd54c7..e5b7c8c0 100644
--- a/Aucma.Scada.UI/MainWindow.xaml
+++ b/Aucma.Scada.UI/MainWindow.xaml
@@ -79,7 +79,7 @@
-
+
diff --git a/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml b/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml
index 97f966e7..e8ee8657 100644
--- a/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml
+++ b/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml
@@ -172,10 +172,10 @@
-
+
-
+
@@ -271,10 +271,10 @@
-
+
-
+
diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll
index ea5a3f2e..add4d681 100644
Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll differ
diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb
index 3c54f213..3d3ef6a5 100644
Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb differ
diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe
index 031ef132..86714b7e 100644
Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe differ
diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb
index 5ea7d513..ba0d7037 100644
Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb differ
diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll
index 879c584b..e9615603 100644
Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll differ
diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb
index cbc3ae5d..41545909 100644
Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb differ
diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache
index f8fe1999..dd4f87dc 100644
Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache differ
diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe
index 031ef132..86714b7e 100644
Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe differ
diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.g.resources b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.g.resources
index 7f011334..0866c954 100644
Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.g.resources and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.g.resources differ
diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb
index 5ea7d513..ba0d7037 100644
Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb differ
diff --git a/Aucma.Scada.UI/obj/Debug/MainWindow.g.i.cs b/Aucma.Scada.UI/obj/Debug/MainWindow.g.i.cs
index 77014b5f..159b1bde 100644
--- a/Aucma.Scada.UI/obj/Debug/MainWindow.g.i.cs
+++ b/Aucma.Scada.UI/obj/Debug/MainWindow.g.i.cs
@@ -1,4 +1,5 @@
-#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "761197E72019FA48DD888520668F10CC0A0310CFF8A6F9336B14C0A351ACC259"
+// Updated by XamlIntelliSenseFileGenerator 2023-10-24 14:33:32
+#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "761197E72019FA48DD888520668F10CC0A0310CFF8A6F9336B14C0A351ACC259"
//------------------------------------------------------------------------------
//
// 此代码由工具生成。
@@ -32,132 +33,129 @@ using System.Windows.Shapes;
using System.Windows.Shell;
-namespace Aucma.Scada.UI {
-
-
+namespace Aucma.Scada.UI
+{
+
+
///
/// MainWindow
///
- public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
-
-
- #line 77 "..\..\MainWindow.xaml"
+ public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector
+ {
+
+
+#line 77 "..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button instoreInfo;
-
- #line default
- #line hidden
-
-
- #line 78 "..\..\MainWindow.xaml"
+
+#line default
+#line hidden
+
+
+#line 78 "..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button outstoreInfo;
-
- #line default
- #line hidden
-
-
- #line 79 "..\..\MainWindow.xaml"
+
+#line default
+#line hidden
+
+
+#line 79 "..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button taskInfo;
-
- #line default
- #line hidden
-
-
- #line 80 "..\..\MainWindow.xaml"
+
+#line default
+#line hidden
+
+
+#line 80 "..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button inventoryInfo;
-
- #line default
- #line hidden
-
-
- #line 81 "..\..\MainWindow.xaml"
+
+#line default
+#line hidden
+
+
+#line 81 "..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button assemblyPlan;
-
- #line default
- #line hidden
-
-
- #line 82 "..\..\MainWindow.xaml"
- [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
- internal System.Windows.Controls.Button logInfo;
-
- #line default
- #line hidden
-
-
- #line 85 "..\..\MainWindow.xaml"
+
+#line default
+#line hidden
+
+
+#line 85 "..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button Minimized;
-
- #line default
- #line hidden
-
-
- #line 86 "..\..\MainWindow.xaml"
+
+#line default
+#line hidden
+
+
+#line 86 "..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button Exit;
-
- #line default
- #line hidden
-
+
+#line default
+#line hidden
+
private bool _contentLoaded;
-
+
///
/// InitializeComponent
///
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
- public void InitializeComponent() {
- if (_contentLoaded) {
+ public void InitializeComponent()
+ {
+ if (_contentLoaded)
+ {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/Aucma.Scada.UI;component/mainwindow.xaml", System.UriKind.Relative);
-
- #line 1 "..\..\MainWindow.xaml"
+
+#line 1 "..\..\MainWindow.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
-
- #line default
- #line hidden
+
+#line default
+#line hidden
}
-
+
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
- void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
+ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target)
+ {
switch (connectionId)
{
- case 1:
- this.instoreInfo = ((System.Windows.Controls.Button)(target));
- return;
- case 2:
- this.outstoreInfo = ((System.Windows.Controls.Button)(target));
- return;
- case 3:
- this.taskInfo = ((System.Windows.Controls.Button)(target));
- return;
- case 4:
- this.inventoryInfo = ((System.Windows.Controls.Button)(target));
- return;
- case 5:
- this.assemblyPlan = ((System.Windows.Controls.Button)(target));
- return;
- case 6:
- this.logInfo = ((System.Windows.Controls.Button)(target));
- return;
- case 7:
- this.Minimized = ((System.Windows.Controls.Button)(target));
- return;
- case 8:
- this.Exit = ((System.Windows.Controls.Button)(target));
- return;
+ case 1:
+ this.instoreInfo = ((System.Windows.Controls.Button)(target));
+ return;
+ case 2:
+ this.outstoreInfo = ((System.Windows.Controls.Button)(target));
+ return;
+ case 3:
+ this.taskInfo = ((System.Windows.Controls.Button)(target));
+ return;
+ case 4:
+ this.inventoryInfo = ((System.Windows.Controls.Button)(target));
+ return;
+ case 5:
+ this.assemblyPlan = ((System.Windows.Controls.Button)(target));
+ return;
+ case 6:
+ this.logInfo = ((System.Windows.Controls.Button)(target));
+ return;
+ case 7:
+ this.Minimized = ((System.Windows.Controls.Button)(target));
+ return;
+ case 8:
+ this.Exit = ((System.Windows.Controls.Button)(target));
+ return;
}
this._contentLoaded = true;
}
diff --git a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.baml b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.baml
index d052a402..d7935065 100644
Binary files a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.baml and b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.baml differ
diff --git a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.g.cs b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.g.cs
index fee74488..c3b3b68b 100644
--- a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.g.cs
+++ b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "D536AE37E611DE63815C8A69BC3CB492E8D312804D0D4C91592629457E2EA8CE"
+#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "5A45D0B6305D139356269F0878B942DF810FB9213B2E1C4F857110595A8D36F5"
//------------------------------------------------------------------------------
//
// 此代码由工具生成。
diff --git a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.g.i.cs b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.g.i.cs
index fee74488..c3b3b68b 100644
--- a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.g.i.cs
+++ b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "D536AE37E611DE63815C8A69BC3CB492E8D312804D0D4C91592629457E2EA8CE"
+#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "5A45D0B6305D139356269F0878B942DF810FB9213B2E1C4F857110595A8D36F5"
//------------------------------------------------------------------------------
//
// 此代码由工具生成。
diff --git a/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs b/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs
index ad734b9f..c4870830 100644
--- a/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs
+++ b/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs
@@ -290,13 +290,13 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
PlanInfoDataGrid = new ObservableCollection();
if (executePlanInfos != null)
{
- RefreshStatisticsGauge(executePlanInfos);
executePlanInfos.ForEach(
arg =>
{
PlanInfoDataGrid.Add(arg);
});
}
+ RefreshStatisticsGauge(executePlanInfos);
}
///
@@ -321,56 +321,6 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
public void Init()
{
RefreshExecutePlan();
-
- App.Current.Dispatcher.Invoke((Action)(() =>
- {
-
- MaterialNameList = new List()
- {
- "SC232",
- "SA124",
- "SC387",
- "SC211",
- "DQ196",
- };
- ChartValues achievement = new ChartValues();
- Random random = new Random();
- for (int i = 0; i < 5; i++)
- {
- achievement.Add(random.Next(60, 100));
- }
- var column = new ColumnSeries();
- column.DataLabels = true;
- column.Title = "型号";
- column.Values = achievement;
-
-
- ModelStatistics.Add(column);
-
- ProductionHourList = new List()
- {
- "12",
- "13",
- "14",
- "15",
- "16",
- };
-
- ChartValues achievement2 = new ChartValues();
- Random random2 = new Random();
- for (int i = 0; i < 5; i++)
- {
- achievement2.Add(random2.Next(60, 100));
- }
- var column2 = new ColumnSeries();
- column2.DataLabels = true;
- column2.Title = "产量";
- column2.Values = achievement2;
-
-
- Achievement.Add(column2);
- }));
-
}
///
@@ -440,6 +390,67 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
CompleRoution = string.Empty;
}
}
+
+ RefreshMaterialStats();
+
+ RefreshHourAmount();
+ }
+
+ ///
+ /// 刷新物料型号统计
+ ///
+ private void RefreshMaterialStats()
+ {
+ App.Current.Dispatcher.Invoke((Action)(() =>
+ {
+
+ //获取物料型号统计
+ List materialStats = assemblyPlanBusiness.GetMaterialStats();
+ if (materialStats != null)
+ {
+ ModelStatistics.Clear();
+ MaterialNameList = new List();
+ ChartValues materialAchievement = new ChartValues();
+ foreach (var item in materialStats)
+ {
+ MaterialNameList.Add(item.MATERIAL_NAME);
+ materialAchievement.Add(Convert.ToDouble(item.PRODUCT_AMOUNT));
+ }
+ var materialColumn = new ColumnSeries();
+ materialColumn.DataLabels = true;
+ materialColumn.Title = "型号";
+ materialColumn.Values = materialAchievement;
+ ModelStatistics.Add(materialColumn);
+ }
+ }));
+ }
+
+ ///
+ /// 刷新小时产量统计
+ ///
+ private void RefreshHourAmount()
+ {
+ App.Current.Dispatcher.Invoke((Action)(() =>
+ {
+ //获取小时产量
+ List hourAmount = assemblyPlanBusiness.GetHourAmount();
+ if (hourAmount != null)
+ {
+ Achievement.Clear();
+ ProductionHourList = new List();
+ ChartValues hourAchievement = new ChartValues();
+ foreach (var item in hourAmount)
+ {
+ ProductionHourList.Add(item.PRODUCT_HOUR);
+ hourAchievement.Add(Convert.ToDouble(item.PRODUCT_AMOUNT));
+ }
+ var houeColumn = new ColumnSeries();
+ houeColumn.DataLabels = true;
+ houeColumn.Title = "小时产量";
+ houeColumn.Values = hourAchievement;
+ Achievement.Add(houeColumn);
+ }
+ }));
}
}
diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache
index e987cb6e..3d734225 100644
Binary files a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache and b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache differ
diff --git a/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache b/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache
index 1a1aa792..73f015ca 100644
Binary files a/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache and b/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache differ
diff --git a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache
index ebb1331d..8e73522c 100644
Binary files a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache and b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache differ
diff --git a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache
index ba09343b..f481fc12 100644
Binary files a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache and b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache differ
diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll
index 879c584b..e9615603 100644
Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll and b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll differ
diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb
index cbc3ae5d..41545909 100644
Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb and b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb differ
diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache
index de71be3c..516de2b7 100644
Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache differ
diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll
index 879c584b..e9615603 100644
Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll differ
diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb
index cbc3ae5d..41545909 100644
Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb differ
diff --git a/HighWayIot.Repository/service/IExecutePlanInfoService.cs b/HighWayIot.Repository/service/IExecutePlanInfoService.cs
index 865348ac..09dd11c6 100644
--- a/HighWayIot.Repository/service/IExecutePlanInfoService.cs
+++ b/HighWayIot.Repository/service/IExecutePlanInfoService.cs
@@ -60,5 +60,19 @@ namespace HighWayIot.Repository.service
///
///
bool DeleteExecutePlanInfoByPlanCode(string executePlanCode);
+
+ ///
+ /// 获取工位小时产量
+ ///
+ ///
+ ///
+ List GetStationHourAmount(string stationCode);
+
+ ///
+ /// 获取物料型号统计
+ ///
+ ///
+ ///
+ List GetStationMaterialStats(string stationCode);
}
}
diff --git a/HighWayIot.Repository/service/Impl/ExecutePlanInfoServiceImpl.cs b/HighWayIot.Repository/service/Impl/ExecutePlanInfoServiceImpl.cs
index b98e6e72..a3c9a794 100644
--- a/HighWayIot.Repository/service/Impl/ExecutePlanInfoServiceImpl.cs
+++ b/HighWayIot.Repository/service/Impl/ExecutePlanInfoServiceImpl.cs
@@ -11,7 +11,9 @@ namespace HighWayIot.Repository.service.Impl
public class ExecutePlanInfoServiceImpl : IExecutePlanInfoService
{
- private Repository _mesRepository = new Repository("scada");
+ private Repository _scadaRepository = new Repository("scada");
+
+ private Repository _mesRepository = new Repository("mes");
private LogHelper logHelper = LogHelper.Instance;
@@ -30,7 +32,7 @@ namespace HighWayIot.Repository.service.Impl
Expression> exp = s1 => true;
exp = exp.And(x => x.productLineCode == productLineCode);
- List planInfos = _mesRepository.GetList(exp);
+ List planInfos = _scadaRepository.GetList(exp);
int order = planInfos.OrderByDescending(x => x.executeOrder).First().executeOrder;
@@ -56,7 +58,7 @@ namespace HighWayIot.Repository.service.Impl
Expression> exp = s1 => true;
exp = exp.And(x => x.executePlanCode == executePlanCode);
- planInfo = _mesRepository.GetFirst(exp);
+ planInfo = _scadaRepository.GetFirst(exp);
logHelper.Info($"根据执行计划编号{executePlanCode};获取到的执行计划信息:{jsonChange.ModeToJson(planInfo)}");
}
@@ -80,7 +82,7 @@ namespace HighWayIot.Repository.service.Impl
Expression> exp = s1 => true;
exp = exp.And(x => x.productLineCode == productLineCode);
- planInfos = _mesRepository.GetList(exp);
+ planInfos = _scadaRepository.GetList(exp);
logHelper.Info($"根据产线工位编号:{productLineCode};获取到的执行计划信息:{jsonChange.ModeToJson(planInfos)}");
}
@@ -104,7 +106,7 @@ namespace HighWayIot.Repository.service.Impl
Expression> exp = s1 => true;
exp = exp.And(x => x.productPlanCode == productPlanCode);
- planInfos = _mesRepository.GetList(exp);
+ planInfos = _scadaRepository.GetList(exp);
logHelper.Info($"根据生产计划编号:{productPlanCode};获取到的执行计划信息:{jsonChange.ModeToJson(planInfos)}");
}
@@ -125,7 +127,7 @@ namespace HighWayIot.Repository.service.Impl
bool result = false;
try
{
- result = _mesRepository.Insert(executePlanInfo);
+ result = _scadaRepository.Insert(executePlanInfo);
}
catch (Exception ex)
{
@@ -144,7 +146,7 @@ namespace HighWayIot.Repository.service.Impl
bool result = false;
try
{
- result = _mesRepository.Update(executePlanInfo);
+ result = _scadaRepository.Update(executePlanInfo);
}
catch (Exception ex)
@@ -164,7 +166,7 @@ namespace HighWayIot.Repository.service.Impl
bool result = false;
try
{
- result = _mesRepository.UpdateRange(executePlanInfos);
+ result = _scadaRepository.UpdateRange(executePlanInfos);
}
catch (Exception ex)
@@ -186,7 +188,7 @@ namespace HighWayIot.Repository.service.Impl
{
ExecutePlanInfo planInfo = this.GetExecutePlanInfoByPlanCode(executePlanCode);
- result = _mesRepository.Delete(planInfo);
+ result = _scadaRepository.Delete(planInfo);
}
catch (Exception ex)
@@ -195,5 +197,39 @@ namespace HighWayIot.Repository.service.Impl
}
return result;
}
+
+ public List GetStationHourAmount(string stationCode)
+ {
+ List result = null;
+ try
+ {
+ var _db = _mesRepository.Context;
+
+
+ result = _db.Queryable().AS("GET_STATION_HOURAMOUNT").Where("PRODUCTLINE_CODE = @stationCode", new { stationCode = stationCode }).ToList();
+
+ }catch(Exception ex)
+ {
+ logHelper.Error("获取小时产量数据异常", ex);
+ }
+ return result;
+ }
+
+ public List GetStationMaterialStats(string stationCode)
+ {
+ List result = null;
+ try
+ {
+ var _db = _mesRepository.Context;
+
+ result = _db.Queryable().AS("GET_STATION_MATERIALSTATS").Where("PRODUCTLINE_CODE = @stationCode", new { stationCode = stationCode }).ToList();
+
+ }
+ catch (Exception ex)
+ {
+ logHelper.Error("获取型号统计数据异常", ex);
+ }
+ return result;
+ }
}
}
diff --git a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache
index 6d01821f..0911ee0a 100644
Binary files a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache and b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache differ
diff --git a/HighWayIot/HighWayIot.csproj b/HighWayIot/HighWayIot.csproj
index a78edb8f..84caf389 100644
--- a/HighWayIot/HighWayIot.csproj
+++ b/HighWayIot/HighWayIot.csproj
@@ -61,6 +61,10 @@
+
+ {75180EE5-13AE-499B-B0F6-C7BFEE1140CC}
+ HighWayIot.Config
+
{DEABC30C-EC6F-472E-BD67-D65702FDAF74}
HighWayIot.Log4net
diff --git a/HighWayIot/Program.cs b/HighWayIot/Program.cs
index 007b5139..146e09c5 100644
--- a/HighWayIot/Program.cs
+++ b/HighWayIot/Program.cs
@@ -1,4 +1,8 @@
-using HighWayIot.Log4net;
+using HighWayIot.Config;
+using HighWayIot.Log4net;
+using HighWayIot.Repository.service;
+using HighWayIot.Repository.service.Impl;
+using System;
namespace HighWayIot
{
@@ -6,11 +10,18 @@ namespace HighWayIot
{
private static LogHelper logger = LogHelper.Instance;
+ private static AppConfig appConfig = AppConfig.Instance;
+
+ private static IExecutePlanInfoService execPlanInfoService = new ExecutePlanInfoServiceImpl();
static void Main(string[] args)
{
logger.Info("初始化启动");
-
+ var info = execPlanInfoService.GetStationHourAmount(appConfig.stationCode);
+ foreach (var item in info)
+ {
+ Console.WriteLine($"productLine_code:{item.productLine_code}");
+ }
}
}
}
diff --git a/HighWayIot/bin/Debug/HighWayIot.Repository.dll b/HighWayIot/bin/Debug/HighWayIot.Repository.dll
index 879c584b..e9615603 100644
Binary files a/HighWayIot/bin/Debug/HighWayIot.Repository.dll and b/HighWayIot/bin/Debug/HighWayIot.Repository.dll differ
diff --git a/HighWayIot/bin/Debug/HighWayIot.Repository.pdb b/HighWayIot/bin/Debug/HighWayIot.Repository.pdb
index cbc3ae5d..41545909 100644
Binary files a/HighWayIot/bin/Debug/HighWayIot.Repository.pdb and b/HighWayIot/bin/Debug/HighWayIot.Repository.pdb differ
diff --git a/HighWayIot/bin/Debug/HighWayIot.exe b/HighWayIot/bin/Debug/HighWayIot.exe
index b89214ff..6159a3be 100644
Binary files a/HighWayIot/bin/Debug/HighWayIot.exe and b/HighWayIot/bin/Debug/HighWayIot.exe differ
diff --git a/HighWayIot/bin/Debug/HighWayIot.pdb b/HighWayIot/bin/Debug/HighWayIot.pdb
index 78060317..8f9ca4bb 100644
Binary files a/HighWayIot/bin/Debug/HighWayIot.pdb and b/HighWayIot/bin/Debug/HighWayIot.pdb differ
diff --git a/HighWayIot/bin/Debug/config/App.Ini b/HighWayIot/bin/Debug/config/App.Ini
index 3720bf86..636da09f 100644
--- a/HighWayIot/bin/Debug/config/App.Ini
+++ b/HighWayIot/bin/Debug/config/App.Ini
@@ -1,3 +1,20 @@
[system]
mesConnStr=Data Source=175.27.215.92/helowin;User ID=aucma_mes;Password=aucma
scadaConnStr=Data Source=175.27.215.92/helowin;User ID=aucma_scada;Password=aucma
+
+stationCode=ZZ-01
+
+shellStoreCode=XKJCK-001
+
+linerStoreCode=NDJCK-001
+
+shellMaterialType=3
+
+linerMaterialType=4
+
+instoreTaskType=1
+
+outstoreTaskType=2
+stationName=ڵװ
+shellHikRobotIp=169.254.100.169
+linerHikRobotIp=127.0.0.1
diff --git a/HighWayIot/bin/Debug/config/Plc.Ini b/HighWayIot/bin/Debug/config/Plc.Ini
new file mode 100644
index 00000000..e5efac98
--- /dev/null
+++ b/HighWayIot/bin/Debug/config/Plc.Ini
@@ -0,0 +1,31 @@
+[plcSystem]
+PLCIP=127.0.0.1
+PLC˿=6000
+ڵPLCIP=127.0.0.1
+ڵPLC˿=6000
+#ַ
+[shell_inStore_address]
+=D101
+Ӧ=D103
+=D104
+=D105
+#ڵַ
+[liner_inStore_address]
+=D201
+Ӧ=D203
+=D204
+=D205
+#dzַ
+[shell_outStore_address]
+=M101
+=M102
+Ӧ=M103
+=M104
+=M105
+#ڵַ
+[liner_outStore_address]
+=M201
+=M202
+Ӧ=M203
+=M204
+=M205
diff --git a/HighWayIot/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 7da19c7b..2184a98f 100644
Binary files a/HighWayIot/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache
index 4f70300a..715b851c 100644
Binary files a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache and b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache differ
diff --git a/HighWayIot/obj/Debug/HighWayIot.csproj.CoreCompileInputs.cache b/HighWayIot/obj/Debug/HighWayIot.csproj.CoreCompileInputs.cache
index 1da73b1f..9580adf1 100644
--- a/HighWayIot/obj/Debug/HighWayIot.csproj.CoreCompileInputs.cache
+++ b/HighWayIot/obj/Debug/HighWayIot.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-a06e08eba04b58b9c288665f37c4b068d1aa4bff
+381efba6ccd19bcf21dcb8312578326d689984a3
diff --git a/HighWayIot/obj/Debug/HighWayIot.exe b/HighWayIot/obj/Debug/HighWayIot.exe
index b89214ff..6159a3be 100644
Binary files a/HighWayIot/obj/Debug/HighWayIot.exe and b/HighWayIot/obj/Debug/HighWayIot.exe differ
diff --git a/HighWayIot/obj/Debug/HighWayIot.pdb b/HighWayIot/obj/Debug/HighWayIot.pdb
index 78060317..8f9ca4bb 100644
Binary files a/HighWayIot/obj/Debug/HighWayIot.pdb and b/HighWayIot/obj/Debug/HighWayIot.pdb differ