diff --git a/.vs/HighWayIot/FileContentIndex/14abecce-00b9-4d72-a895-7ad8110ba989.vsidx b/.vs/HighWayIot/FileContentIndex/14abecce-00b9-4d72-a895-7ad8110ba989.vsidx new file mode 100644 index 00000000..33fc4d9e Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/14abecce-00b9-4d72-a895-7ad8110ba989.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/283c94db-983b-475c-97c2-1d6855a51764.vsidx b/.vs/HighWayIot/FileContentIndex/283c94db-983b-475c-97c2-1d6855a51764.vsidx deleted file mode 100644 index b7e2989f..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/283c94db-983b-475c-97c2-1d6855a51764.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/49169215-7537-4a7b-918f-e188ab72b0c8.vsidx b/.vs/HighWayIot/FileContentIndex/49169215-7537-4a7b-918f-e188ab72b0c8.vsidx deleted file mode 100644 index 36544e10..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/49169215-7537-4a7b-918f-e188ab72b0c8.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/83bf3b03-a97f-47df-857a-d0f14900eba0.vsidx b/.vs/HighWayIot/FileContentIndex/83bf3b03-a97f-47df-857a-d0f14900eba0.vsidx deleted file mode 100644 index 138cd1c8..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/83bf3b03-a97f-47df-857a-d0f14900eba0.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/e3284d0f-3199-485f-b814-25228ce4cb26.vsidx b/.vs/HighWayIot/FileContentIndex/e3284d0f-3199-485f-b814-25228ce4cb26.vsidx new file mode 100644 index 00000000..6d6819f9 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/e3284d0f-3199-485f-b814-25228ce4cb26.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/f2e873d3-5c46-4aae-aee6-18d95dd3e289.vsidx b/.vs/HighWayIot/FileContentIndex/f2e873d3-5c46-4aae-aee6-18d95dd3e289.vsidx new file mode 100644 index 00000000..b0aa13a5 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/f2e873d3-5c46-4aae-aee6-18d95dd3e289.vsidx differ diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo index 71d8b147..d37db6ec 100644 Binary files a/.vs/HighWayIot/v17/.suo and b/.vs/HighWayIot/v17/.suo differ diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.dll b/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.dll index 58977a0d..0f43b000 100644 Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.dll and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.dll differ diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.pdb b/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.pdb index 29876860..b37254eb 100644 Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.pdb and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.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 145028a6..514c1562 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.HikRobot/bin/Debug/HighWayIot.Config.dll b/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Config.dll index 58977a0d..0f43b000 100644 Binary files a/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Config.dll and b/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Config.dll differ diff --git a/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Config.pdb b/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Config.pdb index 29876860..b37254eb 100644 Binary files a/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Config.pdb and b/Aucma.Scada.HikRobot/bin/Debug/HighWayIot.Config.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 e105a392..e1d25412 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 561fa9ab..3df133e3 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/Aucma.Scada.UI.csproj b/Aucma.Scada.UI/Aucma.Scada.UI.csproj index 24554f8a..a109d686 100644 --- a/Aucma.Scada.UI/Aucma.Scada.UI.csproj +++ b/Aucma.Scada.UI/Aucma.Scada.UI.csproj @@ -105,6 +105,12 @@ PlanInfoEditWindow.xaml + + QuantityIssuedWindow.xaml + + + SearchCriteriaWindow.xaml + InStoreInfoControl.xaml @@ -120,6 +126,9 @@ LinerInventory.xaml + + MaterialStatisticsWindow.xaml + ShellInventory.xaml @@ -140,10 +149,13 @@ + + + @@ -159,6 +171,14 @@ Designer MSBuild:Compile + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + Designer MSBuild:Compile @@ -191,6 +211,10 @@ Designer MSBuild:Compile + + MSBuild:Compile + Designer + Designer MSBuild:Compile @@ -283,6 +307,8 @@ - + + + \ No newline at end of file diff --git a/Aucma.Scada.UI/MainWindow.xaml b/Aucma.Scada.UI/MainWindow.xaml index 9956d178..cc9da097 100644 --- a/Aucma.Scada.UI/MainWindow.xaml +++ b/Aucma.Scada.UI/MainWindow.xaml @@ -6,31 +6,35 @@ xmlns:local="clr-namespace:Aucma.Scada.UI" mc:Ignorable="d" Title="SCADA" Height="1080" Width="1920" Icon="Icon.png" - WindowState="Maximized" ResizeMode="NoResize" Topmost="False" - > - + WindowState="Maximized" WindowStyle="None" ResizeMode="NoResize" Topmost="True"> + + + + - + - + - + - - + + + @@ -61,13 +66,15 @@ - + - + - - + + + + @@ -78,7 +85,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + - - + + + + - - - + \ No newline at end of file diff --git a/Aucma.Scada.UI/Page/InventoryInfo/LinerInventory.xaml b/Aucma.Scada.UI/Page/InventoryInfo/LinerInventory.xaml index dd67439c..a59179de 100644 --- a/Aucma.Scada.UI/Page/InventoryInfo/LinerInventory.xaml +++ b/Aucma.Scada.UI/Page/InventoryInfo/LinerInventory.xaml @@ -18,141 +18,187 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + - - - - - - + + + - - - - - - - - - - - - - - - + + + + + + - - + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Aucma.Scada.UI/Page/InventoryInfo/MaterialStatisticsWindow.xaml b/Aucma.Scada.UI/Page/InventoryInfo/MaterialStatisticsWindow.xaml new file mode 100644 index 00000000..00bd9a70 --- /dev/null +++ b/Aucma.Scada.UI/Page/InventoryInfo/MaterialStatisticsWindow.xaml @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - diff --git a/Aucma.Scada.UI/Page/OutStoreInfo/OutStoreInfoControl.xaml b/Aucma.Scada.UI/Page/OutStoreInfo/OutStoreInfoControl.xaml index 7c92c4b1..623e5a58 100644 --- a/Aucma.Scada.UI/Page/OutStoreInfo/OutStoreInfoControl.xaml +++ b/Aucma.Scada.UI/Page/OutStoreInfo/OutStoreInfoControl.xaml @@ -23,14 +23,17 @@ - + + + + - + @@ -54,18 +57,18 @@ - - + + - - + + - - + + @@ -81,18 +84,18 @@ - - + + - - + + - - + + @@ -107,23 +110,29 @@ - + + + + - - + + - + - + + + + @@ -132,21 +141,21 @@ - + - - + + - - + + - - + + - diff --git a/Aucma.Scada.UI/Page/TaskInfo/TaskInfoControl.xaml b/Aucma.Scada.UI/Page/TaskInfo/TaskInfoControl.xaml index a019f2a5..c25c9323 100644 --- a/Aucma.Scada.UI/Page/TaskInfo/TaskInfoControl.xaml +++ b/Aucma.Scada.UI/Page/TaskInfo/TaskInfoControl.xaml @@ -22,19 +22,23 @@ + - + + + + + Foreground= "#FFFFFF" > @@ -51,13 +55,16 @@ - + + + + + Foreground= "#FFFFFF" > diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe index 3499a398..59ddb376 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 88d7fb3e..75991ebd 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.Config.dll b/Aucma.Scada.UI/bin/Debug/HighWayIot.Config.dll index 58977a0d..0f43b000 100644 Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Config.dll and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Config.dll differ diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Config.pdb b/Aucma.Scada.UI/bin/Debug/HighWayIot.Config.pdb index 29876860..b37254eb 100644 Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Config.pdb and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Config.pdb differ diff --git a/Aucma.Scada.UI/bin/Debug/config/App.Ini b/Aucma.Scada.UI/bin/Debug/config/App.Ini index e429ccec..52eb9d99 100644 --- a/Aucma.Scada.UI/bin/Debug/config/App.Ini +++ b/Aucma.Scada.UI/bin/Debug/config/App.Ini @@ -25,3 +25,4 @@ outstoreTaskType=2 #ݺɨIP foamHikRobotIp=169.254.100.169 +searchItems=SC232%SC233%SC234% 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 8d974176..1d16c7a4 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.csproj.CoreCompileInputs.cache b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.CoreCompileInputs.cache index e81eb5ab..53c35001 100644 --- a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.CoreCompileInputs.cache +++ b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -fc926eeaeea35c14edd45595745868a66135b141 +248466b6128f7caab048ae557a982f4b6936c03c diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.FileListAbsolute.txt b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.FileListAbsolute.txt index 44dab894..c1e2eea8 100644 --- a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.FileListAbsolute.txt +++ b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.FileListAbsolute.txt @@ -343,3 +343,9 @@ E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\A E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.CopyComplete E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.exe E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.pdb +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\MaterialStatisticsWindow.g.cs +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\MaterialStatisticsWindow.baml +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\QuantityIssuedWindow.g.cs +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\SearchCriteriaWindow.g.cs +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\QuantityIssuedWindow.baml +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Page\AssemblyPlan\SearchCriteriaWindow.baml diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe index 3499a398..59ddb376 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 62147513..a79c80ef 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 88d7fb3e..75991ebd 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/Aucma.Scada.UI_Content.g.i.cs b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_Content.g.i.cs index 713d3ff0..66bf8799 100644 --- a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_Content.g.i.cs +++ b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_Content.g.i.cs @@ -1,13 +1,13 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ -[assembly: System.Windows.Resources.AssemblyAssociatedContentFileAttribute("icon.png")] +[assembly: System.Windows.Resources.AssemblyAssociatedContentFileAttribute("templates/image/background.jpg")] diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.cache b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.cache index 8634e0c1..db99a765 100644 --- a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.cache +++ b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.cache @@ -10,11 +10,11 @@ none false DEBUG;TRACE E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\App.xaml -151723297010 +18-1415767702 -36-1922910726 +42-446346919 1361464425805 -Page\AssemblyPlan\AssemblyPlanControl.xaml;Page\AssemblyPlan\PlanInfoEditWindow.xaml;Page\InStoreInfo\InStoreInfoControl.xaml;LogInfoControl.xaml;MainWindow.xaml;Page\InventoryInfo\BomFoamRearInventory.xaml;Page\InventoryInfo\InventoryInfoControl.xaml;Page\InventoryInfo\LinerInventory.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; +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\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 diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.i.cache b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.i.cache index 57724627..0725bc1b 100644 --- a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.i.cache +++ b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.i.cache @@ -10,11 +10,11 @@ none false DEBUG;TRACE E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\App.xaml -151723297010 +18-1415767702 -37-1132605 +431475431202 1361464425805 -Page\AssemblyPlan\AssemblyPlanControl.xaml;Page\AssemblyPlan\PlanInfoEditWindow.xaml;Page\InStoreInfo\InStoreInfoControl.xaml;LogInfoControl.xaml;MainWindow.xaml;Page\InventoryInfo\BomFoamRearInventory.xaml;Page\InventoryInfo\InventoryInfoControl.xaml;Page\InventoryInfo\LinerInventory.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; +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\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; True diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.i.lref b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.i.lref index f65f4fa2..d8277981 100644 --- a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.i.lref +++ b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.i.lref @@ -2,12 +2,15 @@ FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\App.xaml;; FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\AssemblyPlanControl.xaml;; FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\PlanInfoEditWindow.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\QuantityIssuedWindow.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\SearchCriteriaWindow.xaml;; FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InStoreInfo\InStoreInfoControl.xaml;; FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\LogInfoControl.xaml;; FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\MainWindow.xaml;; FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\BomFoamRearInventory.xaml;; FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\InventoryInfoControl.xaml;; FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\LinerInventory.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\MaterialStatisticsWindow.xaml;; FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\ShellInventory.xaml;; FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceDetailWindow.xaml;; FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceInfoControl.xaml;; diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref index 46f22ffa..d033a2a2 100644 --- a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref +++ b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref @@ -2,12 +2,15 @@ FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\App.xaml;; FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\AssemblyPlanControl.xaml;; FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\PlanInfoEditWindow.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\QuantityIssuedWindow.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\SearchCriteriaWindow.xaml;; FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InStoreInfo\InStoreInfoControl.xaml;; FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\LogInfoControl.xaml;; FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\MainWindow.xaml;; FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\BomFoamRearInventory.xaml;; FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\InventoryInfoControl.xaml;; FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\LinerInventory.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\MaterialStatisticsWindow.xaml;; FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\ShellInventory.xaml;; FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceDetailWindow.xaml;; FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceInfoControl.xaml;; diff --git a/Aucma.Scada.UI/obj/Debug/MainWindow.baml b/Aucma.Scada.UI/obj/Debug/MainWindow.baml index 9678fb42..c3bb62cb 100644 Binary files a/Aucma.Scada.UI/obj/Debug/MainWindow.baml and b/Aucma.Scada.UI/obj/Debug/MainWindow.baml differ diff --git a/Aucma.Scada.UI/obj/Debug/MainWindow.g.cs b/Aucma.Scada.UI/obj/Debug/MainWindow.g.cs index bd7f1ab6..343bad3f 100644 --- a/Aucma.Scada.UI/obj/Debug/MainWindow.g.cs +++ b/Aucma.Scada.UI/obj/Debug/MainWindow.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "ABE42667B526D4F2B0598785A37321B62458FBBD8BF44BD41D21D42410859ADD" +#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B15C169F20DE2B98A91F96AC06368EF3202682E27AE6BEFD75FE5C9339CA885E" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -41,7 +41,7 @@ namespace Aucma.Scada.UI { public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector { - #line 77 "..\..\MainWindow.xaml" + #line 84 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button instoreInfo; @@ -49,7 +49,7 @@ namespace Aucma.Scada.UI { #line hidden - #line 78 "..\..\MainWindow.xaml" + #line 85 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button outstoreInfo; @@ -57,7 +57,7 @@ namespace Aucma.Scada.UI { #line hidden - #line 79 "..\..\MainWindow.xaml" + #line 86 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button taskInfo; @@ -65,7 +65,7 @@ namespace Aucma.Scada.UI { #line hidden - #line 80 "..\..\MainWindow.xaml" + #line 87 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button inventoryInfo; @@ -73,7 +73,7 @@ namespace Aucma.Scada.UI { #line hidden - #line 81 "..\..\MainWindow.xaml" + #line 88 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button assemblyPlan; @@ -81,7 +81,7 @@ namespace Aucma.Scada.UI { #line hidden - #line 85 "..\..\MainWindow.xaml" + #line 92 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button Minimized; @@ -89,7 +89,7 @@ namespace Aucma.Scada.UI { #line hidden - #line 86 "..\..\MainWindow.xaml" + #line 93 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button Exit; diff --git a/Aucma.Scada.UI/obj/Debug/MainWindow.g.i.cs b/Aucma.Scada.UI/obj/Debug/MainWindow.g.i.cs index bd7f1ab6..343bad3f 100644 --- a/Aucma.Scada.UI/obj/Debug/MainWindow.g.i.cs +++ b/Aucma.Scada.UI/obj/Debug/MainWindow.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "ABE42667B526D4F2B0598785A37321B62458FBBD8BF44BD41D21D42410859ADD" +#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B15C169F20DE2B98A91F96AC06368EF3202682E27AE6BEFD75FE5C9339CA885E" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -41,7 +41,7 @@ namespace Aucma.Scada.UI { public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector { - #line 77 "..\..\MainWindow.xaml" + #line 84 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button instoreInfo; @@ -49,7 +49,7 @@ namespace Aucma.Scada.UI { #line hidden - #line 78 "..\..\MainWindow.xaml" + #line 85 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button outstoreInfo; @@ -57,7 +57,7 @@ namespace Aucma.Scada.UI { #line hidden - #line 79 "..\..\MainWindow.xaml" + #line 86 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button taskInfo; @@ -65,7 +65,7 @@ namespace Aucma.Scada.UI { #line hidden - #line 80 "..\..\MainWindow.xaml" + #line 87 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button inventoryInfo; @@ -73,7 +73,7 @@ namespace Aucma.Scada.UI { #line hidden - #line 81 "..\..\MainWindow.xaml" + #line 88 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button assemblyPlan; @@ -81,7 +81,7 @@ namespace Aucma.Scada.UI { #line hidden - #line 85 "..\..\MainWindow.xaml" + #line 92 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button Minimized; @@ -89,7 +89,7 @@ namespace Aucma.Scada.UI { #line hidden - #line 86 "..\..\MainWindow.xaml" + #line 93 "..\..\MainWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button Exit; diff --git a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.baml b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.baml index d052a402..5b2a9a1e 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..aead13b8 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}" "EF52C2BEBFAECDBC3118250032BAA8D00BC32174A8141D2A4D308EA94598D555" //------------------------------------------------------------------------------ // // 此代码由工具生成。 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..aead13b8 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}" "EF52C2BEBFAECDBC3118250032BAA8D00BC32174A8141D2A4D308EA94598D555" //------------------------------------------------------------------------------ // // 此代码由工具生成。 diff --git a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.baml b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.baml index 9a701d1b..12c31e0e 100644 Binary files a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.baml and b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.baml differ diff --git a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.g.cs b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.g.cs index 7efed3dd..f572c971 100644 --- a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.g.cs +++ b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E14629875FB628F7D746EDF2F700170786DE8BBCE34B9BA27F9EDF260682AFAA" +#pragma checksum "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F286707ECA061A6BE81F11AB8F9B0A6620B1A029AA8EC1E46A74CCAC5DA304B8" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -9,6 +9,7 @@ // //------------------------------------------------------------------------------ +using Aucma.Scada.UI.Converter.AssemblyPlan; using Aucma.Scada.UI.Page.AssemblyPlan; using System; using System.Diagnostics; @@ -41,7 +42,7 @@ namespace Aucma.Scada.UI.Page.AssemblyPlan { public partial class PlanInfoEditWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector { - #line 8 "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml" + #line 9 "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal Aucma.Scada.UI.Page.AssemblyPlan.PlanInfoEditWindow window; @@ -49,7 +50,7 @@ namespace Aucma.Scada.UI.Page.AssemblyPlan { #line hidden - #line 38 "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml" + #line 76 "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.DataGrid dataGrid; @@ -92,7 +93,7 @@ namespace Aucma.Scada.UI.Page.AssemblyPlan { case 2: this.dataGrid = ((System.Windows.Controls.DataGrid)(target)); - #line 43 "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml" + #line 81 "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml" this.dataGrid.MouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.dataGrid_MouseLeftButtonDown); #line default diff --git a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.g.i.cs b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.g.i.cs index 7efed3dd..f572c971 100644 --- a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.g.i.cs +++ b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/PlanInfoEditWindow.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E14629875FB628F7D746EDF2F700170786DE8BBCE34B9BA27F9EDF260682AFAA" +#pragma checksum "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "F286707ECA061A6BE81F11AB8F9B0A6620B1A029AA8EC1E46A74CCAC5DA304B8" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -9,6 +9,7 @@ // //------------------------------------------------------------------------------ +using Aucma.Scada.UI.Converter.AssemblyPlan; using Aucma.Scada.UI.Page.AssemblyPlan; using System; using System.Diagnostics; @@ -41,7 +42,7 @@ namespace Aucma.Scada.UI.Page.AssemblyPlan { public partial class PlanInfoEditWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector { - #line 8 "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml" + #line 9 "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal Aucma.Scada.UI.Page.AssemblyPlan.PlanInfoEditWindow window; @@ -49,7 +50,7 @@ namespace Aucma.Scada.UI.Page.AssemblyPlan { #line hidden - #line 38 "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml" + #line 76 "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.DataGrid dataGrid; @@ -92,7 +93,7 @@ namespace Aucma.Scada.UI.Page.AssemblyPlan { case 2: this.dataGrid = ((System.Windows.Controls.DataGrid)(target)); - #line 43 "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml" + #line 81 "..\..\..\..\Page\AssemblyPlan\PlanInfoEditWindow.xaml" this.dataGrid.MouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.dataGrid_MouseLeftButtonDown); #line default diff --git a/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.baml b/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.baml index f808581b..8124131c 100644 Binary files a/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.baml and b/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.baml differ diff --git a/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.cs b/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.cs index 21cf7beb..466f9335 100644 --- a/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.cs +++ b/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "BC24A1F20A67FD0EDFFAEE4607BA434052DADE4FF94D21C5A849EFFE3DB35D6A" +#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "799341851DF4A31059EBF44128122192259D792DA974B31DABB90BE7E2701C88" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -43,7 +43,7 @@ namespace Aucma.Scada.UI.Page.InStoreInfo { public partial class InStoreInfoControl : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { - #line 124 "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" + #line 133 "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.DataGrid DG; @@ -51,7 +51,7 @@ namespace Aucma.Scada.UI.Page.InStoreInfo { #line hidden - #line 158 "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" + #line 170 "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ListBox listBox; diff --git a/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.i.cs b/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.i.cs index 21cf7beb..466f9335 100644 --- a/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.i.cs +++ b/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "BC24A1F20A67FD0EDFFAEE4607BA434052DADE4FF94D21C5A849EFFE3DB35D6A" +#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "799341851DF4A31059EBF44128122192259D792DA974B31DABB90BE7E2701C88" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -43,7 +43,7 @@ namespace Aucma.Scada.UI.Page.InStoreInfo { public partial class InStoreInfoControl : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { - #line 124 "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" + #line 133 "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.DataGrid DG; @@ -51,7 +51,7 @@ namespace Aucma.Scada.UI.Page.InStoreInfo { #line hidden - #line 158 "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" + #line 170 "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ListBox listBox; diff --git a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/BomFoamRearInventory.baml b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/BomFoamRearInventory.baml index 105b595c..974b6e75 100644 Binary files a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/BomFoamRearInventory.baml and b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/BomFoamRearInventory.baml differ diff --git a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/BomFoamRearInventory.g.cs b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/BomFoamRearInventory.g.cs index 27200e91..29197c1c 100644 --- a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/BomFoamRearInventory.g.cs +++ b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/BomFoamRearInventory.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Page\InventoryInfo\BomFoamRearInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "5A0A7247B4571E3DD7415542333B852B36087FEC3BE794D74968C156CAEE5A44" +#pragma checksum "..\..\..\..\Page\InventoryInfo\BomFoamRearInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A6B67F89C1C00153963276EA3F53AF7B22CBBC64511937421C72A9EA7FA1C2EF" //------------------------------------------------------------------------------ // // 此代码由工具生成。 diff --git a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/BomFoamRearInventory.g.i.cs b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/BomFoamRearInventory.g.i.cs index 27200e91..29197c1c 100644 --- a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/BomFoamRearInventory.g.i.cs +++ b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/BomFoamRearInventory.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Page\InventoryInfo\BomFoamRearInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "5A0A7247B4571E3DD7415542333B852B36087FEC3BE794D74968C156CAEE5A44" +#pragma checksum "..\..\..\..\Page\InventoryInfo\BomFoamRearInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A6B67F89C1C00153963276EA3F53AF7B22CBBC64511937421C72A9EA7FA1C2EF" //------------------------------------------------------------------------------ // // 此代码由工具生成。 diff --git a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/LinerInventory.baml b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/LinerInventory.baml index c7b15cc3..c805a9fe 100644 Binary files a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/LinerInventory.baml and b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/LinerInventory.baml differ diff --git a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/LinerInventory.g.cs b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/LinerInventory.g.cs index e5b518b0..d4539708 100644 --- a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/LinerInventory.g.cs +++ b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/LinerInventory.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Page\InventoryInfo\LinerInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "06507D825DC145C5CF86ED02B33B33F7683F5F7C917F456664BC2E5A5A3D8920" +#pragma checksum "..\..\..\..\Page\InventoryInfo\LinerInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "52F1FA50576B9312BB0D40AAF43F4F0EA42BA2B7976D208C439BF6DDE6A1A035" //------------------------------------------------------------------------------ // // 此代码由工具生成。 diff --git a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/LinerInventory.g.i.cs b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/LinerInventory.g.i.cs index e5b518b0..d4539708 100644 --- a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/LinerInventory.g.i.cs +++ b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/LinerInventory.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Page\InventoryInfo\LinerInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "06507D825DC145C5CF86ED02B33B33F7683F5F7C917F456664BC2E5A5A3D8920" +#pragma checksum "..\..\..\..\Page\InventoryInfo\LinerInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "52F1FA50576B9312BB0D40AAF43F4F0EA42BA2B7976D208C439BF6DDE6A1A035" //------------------------------------------------------------------------------ // // 此代码由工具生成。 diff --git a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/ShellInventory.baml b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/ShellInventory.baml index da8a170c..0ee1cf8a 100644 Binary files a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/ShellInventory.baml and b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/ShellInventory.baml differ diff --git a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/ShellInventory.g.cs b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/ShellInventory.g.cs index 488aa3d3..0eae4562 100644 --- a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/ShellInventory.g.cs +++ b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/ShellInventory.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Page\InventoryInfo\ShellInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A66EF30E1A2BFFAC6417419793D545694E00FD8782EB560AF243A3F0FC412825" +#pragma checksum "..\..\..\..\Page\InventoryInfo\ShellInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "1E70D2F62B23FA702C1CCB710B21A0169710AE3363B9F085A058C1DCA4C3F5DE" //------------------------------------------------------------------------------ // // 此代码由工具生成。 diff --git a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/ShellInventory.g.i.cs b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/ShellInventory.g.i.cs index 488aa3d3..0eae4562 100644 --- a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/ShellInventory.g.i.cs +++ b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/ShellInventory.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Page\InventoryInfo\ShellInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A66EF30E1A2BFFAC6417419793D545694E00FD8782EB560AF243A3F0FC412825" +#pragma checksum "..\..\..\..\Page\InventoryInfo\ShellInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "1E70D2F62B23FA702C1CCB710B21A0169710AE3363B9F085A058C1DCA4C3F5DE" //------------------------------------------------------------------------------ // // 此代码由工具生成。 diff --git a/Aucma.Scada.UI/obj/Debug/Page/OutStoreInfo/OutStoreInfoControl.baml b/Aucma.Scada.UI/obj/Debug/Page/OutStoreInfo/OutStoreInfoControl.baml index ac76f3fe..4902bb64 100644 Binary files a/Aucma.Scada.UI/obj/Debug/Page/OutStoreInfo/OutStoreInfoControl.baml and b/Aucma.Scada.UI/obj/Debug/Page/OutStoreInfo/OutStoreInfoControl.baml differ diff --git a/Aucma.Scada.UI/obj/Debug/Page/OutStoreInfo/OutStoreInfoControl.g.cs b/Aucma.Scada.UI/obj/Debug/Page/OutStoreInfo/OutStoreInfoControl.g.cs index c815f172..b261ac81 100644 --- a/Aucma.Scada.UI/obj/Debug/Page/OutStoreInfo/OutStoreInfoControl.g.cs +++ b/Aucma.Scada.UI/obj/Debug/Page/OutStoreInfo/OutStoreInfoControl.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A11D46661093D23F5122F1DFB5391D463977D15F73CD586D4907C4F6C447E7B2" +#pragma checksum "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "92BE1A0063A804A68D5909EE90F2A9BF449D90516828AB384E8E40ED6580691A" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -42,7 +42,7 @@ namespace Aucma.Scada.UI.Page.OutStoreInfo { public partial class OutStoreInfoControl : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { - #line 120 "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml" + #line 126 "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ListBox listBox; @@ -50,7 +50,7 @@ namespace Aucma.Scada.UI.Page.OutStoreInfo { #line hidden - #line 160 "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml" + #line 169 "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.DataGrid DG; diff --git a/Aucma.Scada.UI/obj/Debug/Page/OutStoreInfo/OutStoreInfoControl.g.i.cs b/Aucma.Scada.UI/obj/Debug/Page/OutStoreInfo/OutStoreInfoControl.g.i.cs index c815f172..b261ac81 100644 --- a/Aucma.Scada.UI/obj/Debug/Page/OutStoreInfo/OutStoreInfoControl.g.i.cs +++ b/Aucma.Scada.UI/obj/Debug/Page/OutStoreInfo/OutStoreInfoControl.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A11D46661093D23F5122F1DFB5391D463977D15F73CD586D4907C4F6C447E7B2" +#pragma checksum "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "92BE1A0063A804A68D5909EE90F2A9BF449D90516828AB384E8E40ED6580691A" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -42,7 +42,7 @@ namespace Aucma.Scada.UI.Page.OutStoreInfo { public partial class OutStoreInfoControl : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { - #line 120 "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml" + #line 126 "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ListBox listBox; @@ -50,7 +50,7 @@ namespace Aucma.Scada.UI.Page.OutStoreInfo { #line hidden - #line 160 "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml" + #line 169 "..\..\..\..\Page\OutStoreInfo\OutStoreInfoControl.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.DataGrid DG; diff --git a/Aucma.Scada.UI/obj/Debug/Page/TaskInfo/TaskInfoControl.baml b/Aucma.Scada.UI/obj/Debug/Page/TaskInfo/TaskInfoControl.baml index 3a091c0c..83d543a9 100644 Binary files a/Aucma.Scada.UI/obj/Debug/Page/TaskInfo/TaskInfoControl.baml and b/Aucma.Scada.UI/obj/Debug/Page/TaskInfo/TaskInfoControl.baml differ diff --git a/Aucma.Scada.UI/obj/Debug/Page/TaskInfo/TaskInfoControl.g.cs b/Aucma.Scada.UI/obj/Debug/Page/TaskInfo/TaskInfoControl.g.cs index 1465e53d..6d9516b7 100644 --- a/Aucma.Scada.UI/obj/Debug/Page/TaskInfo/TaskInfoControl.g.cs +++ b/Aucma.Scada.UI/obj/Debug/Page/TaskInfo/TaskInfoControl.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "097BADF71625FDAC4AC578C441B5AD8F90E7BAF0B1CF5582C87D447BBDE5F135" +#pragma checksum "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "478CF6BCD99092E5CB5464E722BEA3029C03566C37DA32D94252741B6BC61907" //------------------------------------------------------------------------------ // // 此代码由工具生成。 diff --git a/Aucma.Scada.UI/obj/Debug/Page/TaskInfo/TaskInfoControl.g.i.cs b/Aucma.Scada.UI/obj/Debug/Page/TaskInfo/TaskInfoControl.g.i.cs index 1465e53d..6d9516b7 100644 --- a/Aucma.Scada.UI/obj/Debug/Page/TaskInfo/TaskInfoControl.g.i.cs +++ b/Aucma.Scada.UI/obj/Debug/Page/TaskInfo/TaskInfoControl.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "097BADF71625FDAC4AC578C441B5AD8F90E7BAF0B1CF5582C87D447BBDE5F135" +#pragma checksum "..\..\..\..\Page\TaskInfo\TaskInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "478CF6BCD99092E5CB5464E722BEA3029C03566C37DA32D94252741B6BC61907" //------------------------------------------------------------------------------ // // 此代码由工具生成。 diff --git a/Aucma.Scada.UI/templates/image/background.jpg b/Aucma.Scada.UI/templates/image/background.jpg new file mode 100644 index 00000000..860c0b06 Binary files /dev/null and b/Aucma.Scada.UI/templates/image/background.jpg differ diff --git a/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs b/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs index 94266236..1148d094 100644 --- a/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs +++ b/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs @@ -1,6 +1,7 @@ using Aucma.Scada.Business; using Aucma.Scada.Model.domain; using Aucma.Scada.UI.Page.AssemblyPlan; +using Aucma.Scada.UI.Page.InventoryInfo; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; using HighWayIot.Common; @@ -34,6 +35,8 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan PlanInfoEditCommand = new RelayCommand(PlanInfoEdit); + MaterialStatisticsCommand = new RelayCommand(MaterialStatistics); + assemblyPlanBusiness.RefreshExecutePlanInfoEvent += RefreshDataGrid; outStoreBusiness.RefreshAssemblyPlanInitEvent += RefreshPlanInfoDataGrid; @@ -210,6 +213,8 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan public RelayCommand NextPassCommand { get; set; } public RelayCommand PlanInfoEditCommand { get; set; } + + public RelayCommand MaterialStatisticsCommand { get; set; } #endregion /// @@ -264,6 +269,7 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan ProductModel = string.Empty; BeginTime = string.Empty; MessageBox.Show("执行计划删除成功"); + } else { @@ -329,6 +335,12 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan planInfoEditWindow.ShowDialog(); } + private void MaterialStatistics() + { + MaterialStatisticsWindow materialStatisticsWindow = new MaterialStatisticsWindow(); + materialStatisticsWindow.ShowDialog(); + } + /// /// 刷新计划执行 /// diff --git a/Aucma.Scada.UI/viewModel/AssemblyPlan/PlanInfoEditViewModel.cs b/Aucma.Scada.UI/viewModel/AssemblyPlan/PlanInfoEditViewModel.cs index 37c8fa5d..2af60eef 100644 --- a/Aucma.Scada.UI/viewModel/AssemblyPlan/PlanInfoEditViewModel.cs +++ b/Aucma.Scada.UI/viewModel/AssemblyPlan/PlanInfoEditViewModel.cs @@ -1,25 +1,41 @@ using Aucma.Scada.Business; using Aucma.Scada.Model.domain; +using Aucma.Scada.UI.Page.AssemblyPlan; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using HighWayIot.Config; +using System.Collections.Generic; using System.Collections.ObjectModel; using System.Windows; +using System.Windows.Input; namespace Aucma.Scada.UI.viewModel.AssemblyPlan { public class PlanInfoEditViewModel : ViewModelBase { private AssemblyPlanBusiness assemblyPlanBusiness = AssemblyPlanBusiness.Instance; - + private AppConfig appConfig = AppConfig.Instance; public PlanInfoEditViewModel() { PlanInfoTransmitCommand = new RelayCommand(PlanInfoTransmit); MouseClickCommand = new RelayCommand(MouseClick); CloseWindowCommand = new RelayCommand(t => CloseWindow(t)); + SearchCriteriaSetCommand = new RelayCommand(SearchCriteriaSet); + QueryCommand = new RelayCommand(Query); + ResetCommand = new RelayCommand(Reset); + + Search = "12"; Query(); } #region 参数定义 + private string _search = string.Empty; + public string Search + { + get { return _search; } + set { _search = value; RaisePropertyChanged(nameof(Search)); } + } + /// /// 生产计划编号 /// @@ -72,6 +88,35 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan set { planInfoDataGrid = value; RaisePropertyChanged(() => PlanInfoDataGrid); } } + + private ObservableCollection _configurations = new ObservableCollection(); + public ObservableCollection Configurations + { + get { return _configurations; } + set + { + _configurations = value; + RaisePropertyChanged(nameof(Configurations)); + } + } + + private ICommand _radioButtonCommand; + public ICommand RadioButtonCommand + { + get + { + if (_radioButtonCommand == null) + { + _radioButtonCommand = new RelayCommand( + (selectedOption) => + { + RadioButtonClicked(selectedOption); + } + ); + } + return _radioButtonCommand; + } + } #endregion #region 事件定义 @@ -84,8 +129,53 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan public RelayCommand MouseClickCommand { get; set; } public RelayCommand CloseWindowCommand { get; set; } + + public RelayCommand QueryCommand { get; set; } + + public RelayCommand ResetCommand { get; set; } + + + public RelayCommand SearchCriteriaSetCommand { get; set; } #endregion + private void init() + { + Configurations = new ObservableCollection(); + + var searchItems = appConfig.searchItems; + + var split = searchItems.Trim().Split('%'); + + foreach (var item in split) + { + if (string.IsNullOrEmpty(item.Trim())) continue; + Configurations.Add(item); + } + } + + public void RadioButtonClicked(string selectedOption) + { + + List planInfos = assemblyPlanBusiness.GetProductPlanInfosByProductLineCode(); + if (planInfos != null) + { + PlanInfoDataGrid = new ObservableCollection(); + + if (planInfos.Count > 0) + { + + planInfos.ForEach( + arg => + { + if (arg.materialName.Contains(selectedOption)) + { + PlanInfoDataGrid.Add(arg); + } + + }); + } + } + } /// /// 箱壳入库任务列表查询 @@ -93,6 +183,7 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan public void Query() { + init(); var models = assemblyPlanBusiness.GetProductPlanInfosByProductLineCode(); PlanInfoDataGrid = new ObservableCollection(); @@ -106,6 +197,17 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan } } + /// + /// 重置 + /// + public void Reset() + { + init(); + + Search = string.Empty; + this.Query(); + } + private void PlanInfoTransmit() { bool result = assemblyPlanBusiness.PlanTransmitByProductPlan(_ProductPlanCode, _TransmitAmount); @@ -117,10 +219,28 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan public void MouseClick(object obj) { - TransmitAmount = 0; var info = SelectedDataItem as ProductPlanInfo; - ProductPlanCode = info.planCode; - MaterialCode = info.materialName; + if (info != null) + { + //ProductPlanCode = info.planCode; + //MaterialCode = info.materialName; + + QuantityIssuedWindow quantityIssuedWindow = new QuantityIssuedWindow(info); + quantityIssuedWindow.ShowDialog(); + } + } + + /// + /// 搜索条件设置 + /// + public void SearchCriteriaSet() + { + SearchCriteriaWindow searchCriteriaWindow = new SearchCriteriaWindow(); + bool? dialogResult = searchCriteriaWindow.ShowDialog(); + if (dialogResult == false) // 用户点击了“取消”按钮或关闭窗口 + { + init(); + } } private void CloseWindow(object parameter) diff --git a/Aucma.Scada.UI/viewModel/AssemblyPlan/QuantityIssuedViewModel.cs b/Aucma.Scada.UI/viewModel/AssemblyPlan/QuantityIssuedViewModel.cs new file mode 100644 index 00000000..4a2efcac --- /dev/null +++ b/Aucma.Scada.UI/viewModel/AssemblyPlan/QuantityIssuedViewModel.cs @@ -0,0 +1,93 @@ +using Aucma.Scada.Business; +using Aucma.Scada.Model.domain; +using GalaSoft.MvvmLight; +using GalaSoft.MvvmLight.Command; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Input; + +namespace Aucma.Scada.UI.viewModel.AssemblyPlan +{ + public class QuantityIssuedViewModel : ViewModelBase + { + private AssemblyPlanBusiness assemblyPlanBusiness = AssemblyPlanBusiness.Instance; + + public QuantityIssuedViewModel(ProductPlanInfo productPlanInfo) + { + PlanInfoTransmitCommand = new RelayCommand(PlanInfoTransmit); + + ClearTransmitAmountCommand = new RelayCommand(ClearTransmitAmount); + + KeypadButtonCommand = new RelayCommand(obj => KeypadButton(obj)); + + CloseWindowCommand = new RelayCommand(t => CloseWindow(t)); + + + PlanInfo = productPlanInfo; + + } + + private ProductPlanInfo _PlanInfo = new ProductPlanInfo(); + public ProductPlanInfo PlanInfo + { + get { return _PlanInfo; } + set { _PlanInfo = value; RaisePropertyChanged(nameof(PlanInfo)); } + } + + private string _TransmitAmount = string.Empty; + public string TransmitAmount + { + get { return _TransmitAmount; } + set { _TransmitAmount = value; RaisePropertyChanged(nameof(TransmitAmount)); } + } + + public RelayCommand PlanInfoTransmitCommand { get; set; } + + public RelayCommand ClearTransmitAmountCommand { get; set; } + + public RelayCommand KeypadButtonCommand { get;set; } + + public RelayCommand CloseWindowCommand { get; set; } + + private void PlanInfoTransmit() + { + bool result = assemblyPlanBusiness.PlanTransmitByProductPlan(_PlanInfo.planCode, Convert.ToInt32(_TransmitAmount)); + if (result) + { + MessageBox.Show("执行计划维护成功"); + } + } + + private void ClearTransmitAmount() + { + string amount = _TransmitAmount.ToString(); + if(amount.Length > 0) + { + TransmitAmount = amount.Substring(0, amount.Length - 1); + } + } + + private void KeypadButton(object obj) + { + var info = obj as string; + + TransmitAmount += info; + } + + private void CloseWindow(object parameter) + { + var window = parameter as Window; + if (window != null) + { + window.Close(); + } + + } + + } +} diff --git a/Aucma.Scada.UI/viewModel/AssemblyPlan/SearchCriteriaViewModel.cs b/Aucma.Scada.UI/viewModel/AssemblyPlan/SearchCriteriaViewModel.cs new file mode 100644 index 00000000..1aac97b9 --- /dev/null +++ b/Aucma.Scada.UI/viewModel/AssemblyPlan/SearchCriteriaViewModel.cs @@ -0,0 +1,82 @@ +using GalaSoft.MvvmLight; +using GalaSoft.MvvmLight.Command; +using HighWayIot.Config; +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Collections.Specialized; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Input; + +namespace Aucma.Scada.UI.viewModel.AssemblyPlan +{ + public class SearchCriteriaViewModel : ViewModelBase + { + private AppConfig appConfig = AppConfig.Instance; + public SearchCriteriaViewModel() + { + SaveSearchCriteriaCommand = new RelayCommand(SaveSearchCriteria); + CloseWindowCommand = new RelayCommand(t => CloseWindow(t)); + + init(); + } + + private ObservableCollection _configurations = new ObservableCollection(); + public ObservableCollection Configurations + { + get { return _configurations; } + set + { + _configurations = value; + RaisePropertyChanged(nameof(Configurations)); + } + } + + public RelayCommand SaveSearchCriteriaCommand { get; set; } + public RelayCommand CloseWindowCommand { get; set; } + + private void SaveSearchCriteria() + { + var info = _configurations.ToList(); + string items = string.Empty; + foreach (var configuration in info) + { + items += configuration.ToString() + "%"; + } + appConfig.searchItems = string.Empty; + appConfig.searchItems = items; + + init(); + } + + private void CloseWindow(object parameter) + { + var window = parameter as Window; + if (window != null) + { + window.Close(); + } + + } + + private void init() + { + Configurations = new ObservableCollection(); + + var searchItems = appConfig.searchItems; + + var split = searchItems.Split('%'); + + foreach (var item in split) + { + Configurations.Add(item); + } + } + + } +} diff --git a/Aucma.Scada.UI/viewModel/InventoryInfo/BoxFoamRearInventoryViewModel.cs b/Aucma.Scada.UI/viewModel/InventoryInfo/BoxFoamRearInventoryViewModel.cs index 489c8e9a..4b577888 100644 --- a/Aucma.Scada.UI/viewModel/InventoryInfo/BoxFoamRearInventoryViewModel.cs +++ b/Aucma.Scada.UI/viewModel/InventoryInfo/BoxFoamRearInventoryViewModel.cs @@ -63,6 +63,15 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo get { return _shapes; } set { _shapes = value; RaisePropertyChanged(nameof(Shapes)); } } + + private ObservableCollection spaceDetailDataGrid; + + public ObservableCollection SpaceDetailDataGrid + { + get { return spaceDetailDataGrid; } + set { spaceDetailDataGrid = value; RaisePropertyChanged(() => SpaceDetailDataGrid); } + + } #endregion #region 事件定义 @@ -213,10 +222,31 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo private void SpaceDetail(object obj) { string info = obj as string; - SpaceDetailWindow spaceDetailWindow = new SpaceDetailWindow(appConfig.foamStoreCode, info); - spaceDetailWindow.Show(); + //SpaceDetailWindow spaceDetailWindow = new SpaceDetailWindow(appConfig.shellStoreCode, info); + //spaceDetailWindow.Show(); + + //inventoryInfoBusiness.RefreshBaseSpaceDetails(appConfig.shellStoreCode, info); - inventoryInfoBusiness.RefreshBaseSpaceDetails(appConfig.foamStoreCode, info); + var list = inventoryInfoBusiness.GetBaseSpaceDetails(appConfig.foamStoreCode, info); + + RefreshSpaceDetails(list); + } + + /// + /// 刷新货道明细列表 + /// + /// + private void RefreshSpaceDetails(List spaceDetails) + { + SpaceDetailDataGrid = new ObservableCollection(); + if (spaceDetails != null) + { + spaceDetails.ForEach( + arg => + { + SpaceDetailDataGrid.Add(arg); + }); + } } /// diff --git a/Aucma.Scada.UI/viewModel/InventoryInfo/LinerInventoryViewModel.cs b/Aucma.Scada.UI/viewModel/InventoryInfo/LinerInventoryViewModel.cs index 513634d1..003e8679 100644 --- a/Aucma.Scada.UI/viewModel/InventoryInfo/LinerInventoryViewModel.cs +++ b/Aucma.Scada.UI/viewModel/InventoryInfo/LinerInventoryViewModel.cs @@ -5,6 +5,7 @@ using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; using HighWayIot.Config; using System; +using System.Collections.Generic; using System.Collections.ObjectModel; using System.Runtime.InteropServices; using System.Windows; @@ -53,6 +54,15 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo get { return _shapes; } set { _shapes = value; RaisePropertyChanged(nameof(Shapes)); } } + + private ObservableCollection spaceDetailDataGrid; + + public ObservableCollection SpaceDetailDataGrid + { + get { return spaceDetailDataGrid; } + set { spaceDetailDataGrid = value; RaisePropertyChanged(() => SpaceDetailDataGrid); } + + } #endregion #region 事件定义 @@ -188,10 +198,31 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo private void SpaceDetail(object obj) { string info = obj as string; - SpaceDetailWindow spaceDetailWindow = new SpaceDetailWindow(appConfig.linerStoreCode, info); - spaceDetailWindow.Show(); + //SpaceDetailWindow spaceDetailWindow = new SpaceDetailWindow(appConfig.shellStoreCode, info); + //spaceDetailWindow.Show(); + + //inventoryInfoBusiness.RefreshBaseSpaceDetails(appConfig.shellStoreCode, info); - inventoryInfoBusiness.RefreshBaseSpaceDetails(appConfig.linerStoreCode, info); + var list = inventoryInfoBusiness.GetBaseSpaceDetails(appConfig.linerStoreCode, info); + + RefreshSpaceDetails(list); + } + + /// + /// 刷新货道明细列表 + /// + /// + private void RefreshSpaceDetails(List spaceDetails) + { + SpaceDetailDataGrid = new ObservableCollection(); + if (spaceDetails != null) + { + spaceDetails.ForEach( + arg => + { + SpaceDetailDataGrid.Add(arg); + }); + } } /// diff --git a/Aucma.Scada.UI/viewModel/InventoryInfo/MaterialStatisticsViewModel.cs b/Aucma.Scada.UI/viewModel/InventoryInfo/MaterialStatisticsViewModel.cs new file mode 100644 index 00000000..d95d9c02 --- /dev/null +++ b/Aucma.Scada.UI/viewModel/InventoryInfo/MaterialStatisticsViewModel.cs @@ -0,0 +1,134 @@ +using Aucma.Scada.Business; +using Aucma.Scada.Model.domain; +using GalaSoft.MvvmLight; +using GalaSoft.MvvmLight.Command; +using HighWayIot.Config; +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; + +namespace Aucma.Scada.UI.viewModel.InventoryInfo +{ + public class MaterialStatisticsViewModel:ViewModelBase + { + private AppConfig appConfig = AppConfig.Instance; + private InventoryInfoBusiness _inventoryInfoBusiness = InventoryInfoBusiness.Instance; + + public MaterialStatisticsViewModel() + { + CloseWindowCommand = new RelayCommand(t => CloseWindow(t)); + RefreshCommand = new RelayCommand(init); + init(); + } + + #region 参数定义 + /// + /// 箱壳物料库存DataGrid + /// + private ObservableCollection shellMaterialStockDataGrid; + + public ObservableCollection ShellMaterialStockDataGrid + { + get { return shellMaterialStockDataGrid; } + set { shellMaterialStockDataGrid = value; RaisePropertyChanged(() => ShellMaterialStockDataGrid); } + + } + + /// + /// 内胆物料库存DataGrid + /// + private ObservableCollection linerMaterialStockDataGrid; + + public ObservableCollection LinerMaterialStockDataGrid + { + get { return linerMaterialStockDataGrid; } + set { linerMaterialStockDataGrid = value; RaisePropertyChanged(() => LinerMaterialStockDataGrid); } + + } + + /// + /// 泡前库物料库存DataGrid + /// + private ObservableCollection foamBeforeMaterialStockDataGrid; + + public ObservableCollection FoamBeforeMaterialStockDataGrid + { + get { return foamBeforeMaterialStockDataGrid; } + set { foamBeforeMaterialStockDataGrid = value; RaisePropertyChanged(() => FoamBeforeMaterialStockDataGrid); } + + } + #endregion + + #region 事件定义 + public RelayCommand RefreshCommand { get; set; } + + public RelayCommand CloseWindowCommand { get; set; } + + #endregion + + private void init() + { + //箱壳物料库存 + ShellMaterialStockDataGrid = new ObservableCollection(); + List shellList = _inventoryInfoBusiness.GetSpaceInfos(appConfig.shellStoreCode); + var shellResult = from m in shellList + group m by m.materialType into g + select new BaseSpaceInfo() + { + materialType = g.Key, + spaceStock = g.Sum(m => m.spaceStock) + }; + foreach( var item in shellResult) + { + if (string.IsNullOrEmpty(item.materialType)) continue; + ShellMaterialStockDataGrid.Add(new BaseSpaceInfo() { materialType = item.materialType, spaceStock = item.spaceStock }); + } + + //内胆物料库存 + LinerMaterialStockDataGrid = new ObservableCollection(); + List linerList = _inventoryInfoBusiness.GetSpaceInfos(appConfig.linerStoreCode); + var linerResult = from m in linerList + group m by m.materialType into g + select new BaseSpaceInfo() + { + materialType = g.Key, + spaceStock = g.Sum(m => m.spaceStock) + }; + foreach (var item in linerResult) + { + if (string.IsNullOrEmpty(item.materialType)) continue; + LinerMaterialStockDataGrid.Add(new BaseSpaceInfo() { materialType = item.materialType, spaceStock = item.spaceStock }); + } + + //泡前库物料库存 + FoamBeforeMaterialStockDataGrid = new ObservableCollection(); + List foamBeforeList = _inventoryInfoBusiness.GetSpaceInfos(appConfig.foamStoreCode); + var foamBeforeResult = from m in foamBeforeList + group m by m.materialType into g + select new BaseSpaceInfo() + { + materialType = g.Key, + spaceStock = g.Sum(m => m.spaceStock) + }; + foreach (var item in foamBeforeResult) + { + if (string.IsNullOrEmpty(item.materialType)) continue; + FoamBeforeMaterialStockDataGrid.Add(new BaseSpaceInfo() { materialType = item.materialType, spaceStock = item.spaceStock }); + } + } + + private void CloseWindow(object parameter) + { + var window = parameter as Window; + if (window != null) + { + window.Close(); + } + + } + } +} diff --git a/Aucma.Scada.UI/viewModel/InventoryInfo/ShellInventoryViewModel.cs b/Aucma.Scada.UI/viewModel/InventoryInfo/ShellInventoryViewModel.cs index ce9287ba..10f6d242 100644 --- a/Aucma.Scada.UI/viewModel/InventoryInfo/ShellInventoryViewModel.cs +++ b/Aucma.Scada.UI/viewModel/InventoryInfo/ShellInventoryViewModel.cs @@ -5,6 +5,7 @@ using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; using HighWayIot.Config; using System; +using System.Collections.Generic; using System.Collections.ObjectModel; using System.Runtime.InteropServices; using System.Windows; @@ -52,6 +53,15 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo get { return _shapes; } set { _shapes = value; RaisePropertyChanged(nameof(Shapes)); } } + + private ObservableCollection spaceDetailDataGrid; + + public ObservableCollection SpaceDetailDataGrid + { + get { return spaceDetailDataGrid; } + set { spaceDetailDataGrid = value; RaisePropertyChanged(() => SpaceDetailDataGrid); } + + } #endregion #region 事件定义 @@ -188,10 +198,31 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo private void SpaceDetail(object obj) { string info = obj as string; - SpaceDetailWindow spaceDetailWindow = new SpaceDetailWindow(appConfig.shellStoreCode, info); - spaceDetailWindow.Show(); + //SpaceDetailWindow spaceDetailWindow = new SpaceDetailWindow(appConfig.shellStoreCode, info); + //spaceDetailWindow.Show(); + + //inventoryInfoBusiness.RefreshBaseSpaceDetails(appConfig.shellStoreCode, info); - inventoryInfoBusiness.RefreshBaseSpaceDetails(appConfig.shellStoreCode, info); + var list = inventoryInfoBusiness.GetBaseSpaceDetails(appConfig.shellStoreCode, info); + + RefreshSpaceDetails(list); + } + + /// + /// 刷新货道明细列表 + /// + /// + private void RefreshSpaceDetails(List spaceDetails) + { + SpaceDetailDataGrid = new ObservableCollection(); + if (spaceDetails != null) + { + spaceDetails.ForEach( + arg => + { + SpaceDetailDataGrid.Add(arg); + }); + } } /// diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache index 3827cd3f..114047c8 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/AppConfig.cs b/HighWayIot.Config/AppConfig.cs index 7a0325f0..3dd908cf 100644 --- a/HighWayIot.Config/AppConfig.cs +++ b/HighWayIot.Config/AppConfig.cs @@ -114,5 +114,11 @@ namespace HighWayIot.Config get { return iniHelper.IniReadValue("system", "foamHikRobotIp"); } set { iniHelper.IniWriteValue("system", "foamHikRobotIp", value); } } + + public string searchItems + { + get { return iniHelper.IniReadValue("system", "searchItems"); } + set { iniHelper.IniWriteValue("system", "searchItems", value); } + } } } diff --git a/HighWayIot.Config/bin/Debug/HighWayIot.Config.dll b/HighWayIot.Config/bin/Debug/HighWayIot.Config.dll index 58977a0d..0f43b000 100644 Binary files a/HighWayIot.Config/bin/Debug/HighWayIot.Config.dll and b/HighWayIot.Config/bin/Debug/HighWayIot.Config.dll differ diff --git a/HighWayIot.Config/bin/Debug/HighWayIot.Config.pdb b/HighWayIot.Config/bin/Debug/HighWayIot.Config.pdb index 29876860..b37254eb 100644 Binary files a/HighWayIot.Config/bin/Debug/HighWayIot.Config.pdb and b/HighWayIot.Config/bin/Debug/HighWayIot.Config.pdb differ diff --git a/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache b/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache index a6f5da63..f4d4d110 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.Config/obj/Debug/HighWayIot.Config.dll b/HighWayIot.Config/obj/Debug/HighWayIot.Config.dll index 58977a0d..0f43b000 100644 Binary files a/HighWayIot.Config/obj/Debug/HighWayIot.Config.dll and b/HighWayIot.Config/obj/Debug/HighWayIot.Config.dll differ diff --git a/HighWayIot.Config/obj/Debug/HighWayIot.Config.pdb b/HighWayIot.Config/obj/Debug/HighWayIot.Config.pdb index 29876860..b37254eb 100644 Binary files a/HighWayIot.Config/obj/Debug/HighWayIot.Config.pdb and b/HighWayIot.Config/obj/Debug/HighWayIot.Config.pdb differ diff --git a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache index 0a5d05f3..c896892e 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.Config.dll b/HighWayIot.Repository/bin/Debug/HighWayIot.Config.dll index 58977a0d..0f43b000 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Config.dll and b/HighWayIot.Repository/bin/Debug/HighWayIot.Config.dll differ diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Config.pdb b/HighWayIot.Repository/bin/Debug/HighWayIot.Config.pdb index 29876860..b37254eb 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Config.pdb and b/HighWayIot.Repository/bin/Debug/HighWayIot.Config.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 f7033f7e..a1b3903b 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.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache index 28b7fd05..ced96fc9 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.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache index 7b7a3524..a597074f 100644 Binary files a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache and b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache differ diff --git a/HighWayIot/bin/Debug/HighWayIot.Config.dll b/HighWayIot/bin/Debug/HighWayIot.Config.dll index 58977a0d..0f43b000 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.Config.dll and b/HighWayIot/bin/Debug/HighWayIot.Config.dll differ diff --git a/HighWayIot/bin/Debug/HighWayIot.Config.pdb b/HighWayIot/bin/Debug/HighWayIot.Config.pdb index 29876860..b37254eb 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.Config.pdb and b/HighWayIot/bin/Debug/HighWayIot.Config.pdb differ diff --git a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache index 6cd2e108..65bfe565 100644 Binary files a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache and b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache differ