wenjy
/
Aucma.Scada
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change-泡后库统计图表优化

Browse Source
foamRearStore
liuwf 9 months ago
parent 79b19f4345
commit 32524470e1
56 changed files with 258 additions and 42 deletions
Show Stats Download Patch File Download Diff File

BIN
.vs/HighWayIot/FileContentIndex/23b4a506-8802-401e-9819-7609aa1e0e6e.vsidx
View File

Binary file not shown.

BIN
.vs/HighWayIot/FileContentIndex/45a7e535-c04d-45cb-92c1-f37f31932ac1.vsidx
View File

Binary file not shown.

BIN
.vs/HighWayIot/FileContentIndex/79d6e27f-b67c-4bbc-8773-5e8c04c147af.vsidx
View File

Binary file not shown.

BIN
.vs/HighWayIot/FileContentIndex/89e71a55-1ce5-4a51-bb15-73128acef3fd.vsidx
View File

Binary file not shown.

BIN
.vs/HighWayIot/FileContentIndex/9969a781-3aa8-4fc8-826a-069fe256bbcc.vsidx
View File

Binary file not shown.

BIN
.vs/HighWayIot/FileContentIndex/ab98dc33-e1d9-41d7-90d1-4304bee7cd63.vsidx
View File

Binary file not shown.

BIN
.vs/HighWayIot/FileContentIndex/bfa463f5-f833-48c2-91b1-8ae618bfa0b1.vsidx
View File

Binary file not shown.

BIN
.vs/HighWayIot/FileContentIndex/c8d6923f-4003-4220-a331-f142e1e7a2e8.vsidx
View File

Binary file not shown.

BIN
.vs/HighWayIot/v17/.suo
View File

Binary file not shown.

BIN
Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
Aucma.Scada.Business/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
Aucma.Scada.HikRobot/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
Aucma.Scada.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

2
Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml
Unescape Escape View File

@ -250,7 +250,7 @@
<lvc:CartesianChart.AxisY>
<lvc:Axis FontSize="20" MinValue="0">
<lvc:Axis.Separator>
<lvc:Separator Step="50" Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3" Stroke="#404F56" >
<lvc:Separator Step="10" Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3" Stroke="#404F56" >
</lvc:Separator>
</lvc:Axis.Separator>
</lvc:Axis>

2
Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml
Unescape Escape View File

@ -164,7 +164,7 @@
<lvc:CartesianChart.AxisY>
<lvc:Axis FontSize="15" MinValue="0">
<lvc:Axis.Separator>
<lvc:Separator Step="50" Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3" Stroke="#404F56" >
<lvc:Separator Step="10" Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3" Stroke="#404F56" >
</lvc:Separator>
</lvc:Axis.Separator>
</lvc:Axis>

BIN
Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb
View File

Binary file not shown.

2
Aucma.Scada.UI/bin/Debug/config/Plc.Ini
Unescape Escape View File

@ -1,6 +1,6 @@
[plcSystem]
ÅݺóPLCIP=10.10.92.49
ﾅﾝｺ<EFBFBD>LCｶﾋｿﾚ=2015
ﾅﾝｺ<EFBFBD>LCｶﾋｿﾚ=6000
[foam_inStore_address]
Èë¿â»õµÀºÅ=D7000
Èë¿âÓ¦´ð×Ö=D7010

BIN
Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache
View File

Binary file not shown.

2
Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.CoreCompileInputs.cache
Unescape Escape View File

@ -1 +1 @@
66dc833451ad9e0ac999f9d13be269d1f7a6fbe5
03944b5825fa0e59c458aa58e375ee42c7ce2f0f

118
Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.FileListAbsolute.txt
Unescape Escape View File

@ -467,3 +467,121 @@ E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\TouchSocket.Core.dll
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.TouchSocket.pdb
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\TouchSocket.xml
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\bin\Debug\TouchSocket.Core.xml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\log4net.config
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\Aucma.Scada.UI.exe.config
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\Aucma.Scada.UI.exe
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\Aucma.Scada.UI.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\Aucma.Scada.Business.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\Aucma.Scada.HikRobot.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\Aucma.Scada.Model.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\CommonServiceLocator.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.Extras.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.Platform.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.Common.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.Config.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.Log4net.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.Plc.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.Repository.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.TouchSocket.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\Lierda.WPFHelper.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\LiveCharts.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\LiveCharts.Wpf.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\MySql.Data.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\Oracle.ManagedDataAccess.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\SqlSugar.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\System.Data.SQLite.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\System.Windows.Interactivity.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\Microsoft.Extensions.DependencyInjection.Abstractions.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\Microsoft.Extensions.DependencyInjection.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\MvCodeReaderSDK.Net.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\Newtonsoft.Json.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\log4net.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\HslCommunication.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\TouchSocket.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\TouchSocket.Core.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\System.Memory.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\System.Threading.Tasks.Extensions.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\Microsoft.Bcl.AsyncInterfaces.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\System.Numerics.Vectors.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\System.Buffers.dll
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\Aucma.Scada.Business.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\Aucma.Scada.Business.dll.config
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\Aucma.Scada.HikRobot.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\Aucma.Scada.Model.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.Common.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.Config.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.Log4net.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.Plc.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.Repository.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.Repository.dll.config
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\HighWayIot.TouchSocket.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.xml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.Extras.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.Extras.xml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.Platform.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\GalaSoft.MvvmLight.Platform.xml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\LiveCharts.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\LiveCharts.xml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\LiveCharts.Wpf.pdb
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\LiveCharts.Wpf.xml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\Microsoft.Extensions.DependencyInjection.Abstractions.xml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\Microsoft.Extensions.DependencyInjection.xml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\Newtonsoft.Json.xml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\TouchSocket.xml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\TouchSocket.Core.xml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\bin\Debug\Microsoft.Bcl.AsyncInterfaces.xml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.AssemblyReference.cache
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.SuggestedBindingRedirects.cache
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.exe.config
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SelectType.baml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\AssemblyPlanControl.g.cs
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\PlanInfoEditWindow.g.cs
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\QuantityIssuedWindow.g.cs
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\SearchCriteriaWindow.g.cs
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Page\InStoreInfo\InStoreInfoControl.g.cs
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\LogInfoControl.g.cs
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\MainWindow.g.cs
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\BomFoamRearInventory.g.cs
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\InventoryInfoControl.g.cs
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SelectType.g.cs
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\LinerInventory.g.cs
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\MaterialStatisticsWindow.g.cs
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\ShellInventory.g.cs
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SpaceDetailWindow.g.cs
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SpaceInfoControl.g.cs
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Page\OutStoreInfo\OutStoreInfoControl.g.cs
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Page\TaskInfo\TaskInfoControl.g.cs
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\RecordControl.g.cs
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\App.g.cs
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI_Content.g.cs
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.cs
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI_MarkupCompile.cache
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI_MarkupCompile.lref
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\App.baml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\AssemblyPlanControl.baml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\PlanInfoEditWindow.baml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\QuantityIssuedWindow.baml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\SearchCriteriaWindow.baml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Page\InStoreInfo\InStoreInfoControl.baml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\LogInfoControl.baml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\MainWindow.baml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\BomFoamRearInventory.baml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\InventoryInfoControl.baml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\LinerInventory.baml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\MaterialStatisticsWindow.baml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\ShellInventory.baml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SpaceDetailWindow.baml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\SpaceInfoControl.baml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Page\OutStoreInfo\OutStoreInfoControl.baml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Page\TaskInfo\TaskInfoControl.baml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\RecordControl.baml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\templates\style\resourceStyle.baml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.g.resources
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.Properties.Resources.resources
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.GenerateResource.cache
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.CoreCompileInputs.cache
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.CopyComplete
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.exe
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.pdb

BIN
Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe
View File

Binary file not shown.

BIN
Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.g.resources
View File

Binary file not shown.

BIN
Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb
View File

Binary file not shown.

6
Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.cache
Unescape Escape View File

@ -4,16 +4,16 @@
exe
C#
.cs
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\
Aucma.Scada.UI
none
false
DEBUG;TRACE
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\App.xaml
E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\App.xaml
19-2058867325
1-1257182505
46975812225
138-1776864311
138-632958852
Page\AssemblyPlan\AssemblyPlanControl.xaml;Page\AssemblyPlan\PlanInfoEditWindow.xaml;Page\AssemblyPlan\QuantityIssuedWindow.xaml;Page\AssemblyPlan\SearchCriteriaWindow.xaml;Page\InStoreInfo\InStoreInfoControl.xaml;LogInfoControl.xaml;MainWindow.xaml;Page\InventoryInfo\BomFoamRearInventory.xaml;Page\InventoryInfo\InventoryInfoControl.xaml;Page\InventoryInfo\SelectType.xaml;Page\InventoryInfo\LinerInventory.xaml;Page\InventoryInfo\MaterialStatisticsWindow.xaml;Page\InventoryInfo\ShellInventory.xaml;Page\InventoryInfo\SpaceDetailWindow.xaml;Page\InventoryInfo\SpaceInfoControl.xaml;Page\OutStoreInfo\OutStoreInfoControl.xaml;Page\TaskInfo\TaskInfoControl.xaml;RecordControl.xaml;templates\style\resourceStyle.xaml;
False

40
Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref
Unescape Escape View File

@ -1,21 +1,21 @@
E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.cs
FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\App.xaml;;
FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\AssemblyPlan\AssemblyPlanControl.xaml;;
FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\AssemblyPlan\PlanInfoEditWindow.xaml;;
FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\AssemblyPlan\QuantityIssuedWindow.xaml;;
FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\AssemblyPlan\SearchCriteriaWindow.xaml;;
FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\InStoreInfo\InStoreInfoControl.xaml;;
FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\LogInfoControl.xaml;;
FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\MainWindow.xaml;;
FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\InventoryInfo\BomFoamRearInventory.xaml;;
FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\InventoryInfo\InventoryInfoControl.xaml;;
FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\InventoryInfo\LinerInventory.xaml;;
FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\InventoryInfo\MaterialStatisticsWindow.xaml;;
FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\InventoryInfo\ShellInventory.xaml;;
FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\InventoryInfo\SpaceDetailWindow.xaml;;
FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\InventoryInfo\SpaceInfoControl.xaml;;
FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\OutStoreInfo\OutStoreInfoControl.xaml;;
FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\Page\TaskInfo\TaskInfoControl.xaml;;
FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\RecordControl.xaml;;
FE:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\templates\style\resourceStyle.xaml;;

FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\App.xaml;;
FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\Page\AssemblyPlan\AssemblyPlanControl.xaml;;
FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\Page\AssemblyPlan\PlanInfoEditWindow.xaml;;
FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\Page\AssemblyPlan\QuantityIssuedWindow.xaml;;
FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\Page\AssemblyPlan\SearchCriteriaWindow.xaml;;
FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\Page\InStoreInfo\InStoreInfoControl.xaml;;
FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\LogInfoControl.xaml;;
FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\MainWindow.xaml;;
FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\Page\InventoryInfo\BomFoamRearInventory.xaml;;
FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\Page\InventoryInfo\InventoryInfoControl.xaml;;
FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\Page\InventoryInfo\LinerInventory.xaml;;
FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\Page\InventoryInfo\MaterialStatisticsWindow.xaml;;
FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\Page\InventoryInfo\ShellInventory.xaml;;
FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\Page\InventoryInfo\SpaceDetailWindow.xaml;;
FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\Page\InventoryInfo\SpaceInfoControl.xaml;;
FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\Page\OutStoreInfo\OutStoreInfoControl.xaml;;
FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\Page\TaskInfo\TaskInfoControl.xaml;;
FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\RecordControl.xaml;;
FE:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\templates\style\resourceStyle.xaml;;

BIN
Aucma.Scada.UI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

62
Aucma.Scada.UI/obj/Debug/GeneratedInternalTypeHelper.g.cs
Unescape Escape View File

@ -1,2 +1,62 @@

//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本:4.0.30319.42000
//
// 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，这些更改将会丢失。
// </auto-generated>
//------------------------------------------------------------------------------
namespace XamlGeneratedNamespace {
/// <summary>
/// GeneratedInternalTypeHelper
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
/// <summary>
/// CreateInstance
/// </summary>
protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic)
| (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
}
/// <summary>
/// GetPropertyValue
/// </summary>
protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
}
/// <summary>
/// SetPropertyValue
/// </summary>
protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
}
/// <summary>
/// CreateDelegate
/// </summary>
protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod
| (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
delegateType,
handler}, null)));
}
/// <summary>
/// AddEventHandler
/// </summary>
protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
eventInfo.AddEventHandler(target, handler);
}
}
}

BIN
Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.baml
View File

Binary file not shown.

2
Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.g.cs
Unescape Escape View File

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0BEB53D75A4757A671CE4554930B98D074400F812CFB70A553BCCE7B5000EFCB"
#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E2E7683773E9FFF79EEA964FBBD5AA51634F3911355ECB5D54C4500F253BBEB9"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。

2
Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.g.i.cs
Unescape Escape View File

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0BEB53D75A4757A671CE4554930B98D074400F812CFB70A553BCCE7B5000EFCB"
#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E2E7683773E9FFF79EEA964FBBD5AA51634F3911355ECB5D54C4500F253BBEB9"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。

BIN
Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.baml
View File

Binary file not shown.

2
Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.cs
Unescape Escape View File

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "416B2196F600FFAA27F093BCE2AD98352E095479A2F612BD81E3D94D8697A743"
#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "277C4DE1E9831072A1CCE47A35DA0C34171685632AF936017FDDDFFCB1A56CF1"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。

2
Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.i.cs
Unescape Escape View File

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "416B2196F600FFAA27F093BCE2AD98352E095479A2F612BD81E3D94D8697A743"
#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "277C4DE1E9831072A1CCE47A35DA0C34171685632AF936017FDDDFFCB1A56CF1"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。

28
Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs
Unescape Escape View File

@ -495,12 +495,10 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
/// </summary>
private void RefreshHourAmount()
{
//获取小时产量
List<dynamic> hourAmount = assemblyPlanBusiness.GetHourAmount();
App.Current.Dispatcher.Invoke((Action)(() =>
{
//获取小时产量
List<dynamic> hourAmount = assemblyPlanBusiness.GetHourAmount();
{
if (hourAmount != null)
{
Achievement.Clear();
@ -509,8 +507,24 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
ChartValues<double> hourAchievement = new ChartValues<double>();
foreach (var item in hourAmount)
{
ProductionHourList.Add(item.PRODUCT_HOUR);
hourAchievement.Add(Convert.ToDouble(item.PRODUCT_AMOUNT));
if(DateTime.Now.Hour>=8 && DateTime.Now.Hour <= 20)//白班
{
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));
}
}
else
{
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));
}
}
}
var houeColumn = new ColumnSeries();
houeColumn.DataLabels = true;

30
Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs
Unescape Escape View File

@ -291,7 +291,7 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
ChartValues<double> achievement = new ChartValues<double>();
MaterialNameList = new List<string>();
var info = inStoreBusiness.GetFoamStoreStock();
var info = inStoreBusiness.GetFoamStoreStock();
App.Current.Dispatcher.BeginInvoke((Action)(() =>
{
@ -303,12 +303,12 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
if (!string.IsNullOrEmpty(item.materialType))
{
string name = inStoreBusiness.GetMaterialName(item.materialType);
MaterialNameList.Add(name.Substring(0,Math.Min(name.Length,10)));
MaterialNameList.Add(GetTextBetweenCommas(name));
achievement.Add(item.storeStock);
}
}
}
var column = new ColumnSeries();
column.DataLabels = true;
column.Title = "泡后库";
@ -318,6 +318,30 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
}));
}
public static string GetTextBetweenCommas(string input)
{
// 查找第一个逗号的位置
int firstCommaIndex = input.IndexOf(',');
if (firstCommaIndex == -1)
{
return input;
}
// 查找第二个逗号的位置，从第一个逗号的下一个位置开始查找
int secondCommaIndex = input.IndexOf(',', firstCommaIndex + 1);
// 如果找不到第二个逗号，则返回从第一个逗号到字符串末尾的子字符串
if (secondCommaIndex == -1)
{
return input;
}
// 截取两个逗号之间的字符
return input.Substring(firstCommaIndex + 1, secondCommaIndex - firstCommaIndex - 1);
}
/// <summary>
/// 刷新入库任务列表
/// </summary>

BIN
HighWayIot.Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
HighWayIot.Config/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
HighWayIot.Log4net/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
HighWayIot.Mqtt/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
HighWayIot.Plc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
HighWayIot.Repository/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
HighWayIot.Rfid/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
HighWayIot.TouchSocket/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
HighWayIot/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save