diff --git a/.vs/HighWayIot/FileContentIndex/1aeb4033-bbbc-4aae-ba44-219fb0cddb38.vsidx b/.vs/HighWayIot/FileContentIndex/1aeb4033-bbbc-4aae-ba44-219fb0cddb38.vsidx new file mode 100644 index 00000000..86f4bf5c Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/1aeb4033-bbbc-4aae-ba44-219fb0cddb38.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/2c132abb-f556-445f-81bc-a397e756e853.vsidx b/.vs/HighWayIot/FileContentIndex/2c132abb-f556-445f-81bc-a397e756e853.vsidx deleted file mode 100644 index 9dc9f508..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/2c132abb-f556-445f-81bc-a397e756e853.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/2e86d294-d806-4438-aaec-2717ff4b692c.vsidx b/.vs/HighWayIot/FileContentIndex/2e86d294-d806-4438-aaec-2717ff4b692c.vsidx new file mode 100644 index 00000000..0bb3998a Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/2e86d294-d806-4438-aaec-2717ff4b692c.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/6e38f4e0-7d30-4f99-a237-472e9bf4f513.vsidx b/.vs/HighWayIot/FileContentIndex/6e38f4e0-7d30-4f99-a237-472e9bf4f513.vsidx new file mode 100644 index 00000000..c08ad90b Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/6e38f4e0-7d30-4f99-a237-472e9bf4f513.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/6eec2662-2583-4287-81ae-13778bed8731.vsidx b/.vs/HighWayIot/FileContentIndex/6eec2662-2583-4287-81ae-13778bed8731.vsidx new file mode 100644 index 00000000..1707c91b Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/6eec2662-2583-4287-81ae-13778bed8731.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/befd8b2e-df46-4b56-bb21-2adcd7fcd205.vsidx b/.vs/HighWayIot/FileContentIndex/befd8b2e-df46-4b56-bb21-2adcd7fcd205.vsidx deleted file mode 100644 index 9a0b7abe..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/befd8b2e-df46-4b56-bb21-2adcd7fcd205.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/c673cd01-00c1-4143-a837-9c89bad8e3b2.vsidx b/.vs/HighWayIot/FileContentIndex/c673cd01-00c1-4143-a837-9c89bad8e3b2.vsidx deleted file mode 100644 index 6bd147fc..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/c673cd01-00c1-4143-a837-9c89bad8e3b2.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/fd63cde4-7b1e-4431-bc47-6ea790c3d676.vsidx b/.vs/HighWayIot/FileContentIndex/fd63cde4-7b1e-4431-bc47-6ea790c3d676.vsidx deleted file mode 100644 index 07cfb312..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/fd63cde4-7b1e-4431-bc47-6ea790c3d676.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo index 83df6099..6563537f 100644 Binary files a/.vs/HighWayIot/v17/.suo and b/.vs/HighWayIot/v17/.suo differ diff --git a/Aucma.Scada.Business/AssemblyPlanBusiness.cs b/Aucma.Scada.Business/AssemblyPlanBusiness.cs index 06cc21d2..52b54e13 100644 --- a/Aucma.Scada.Business/AssemblyPlanBusiness.cs +++ b/Aucma.Scada.Business/AssemblyPlanBusiness.cs @@ -144,6 +144,21 @@ namespace Aucma.Scada.Business bool result = false; try { + + // 先删除多余未完成的组装执行计划 + List exePlans = _executePlanInfoService.GetExecutePlanInfosByProductLineCode(appConfig.stationCode,true); + if(exePlans != null && exePlans.Count>5) + { + + exePlans = exePlans.OrderBy(x => x.createdTime).ToList(); + List tempList = exePlans.Take(exePlans.Count-5).ToList(); + foreach (var exePlan in tempList) + { + _executePlanInfoService.DeleteExecutePlanInfoByPlanCode(exePlan.executePlanCode); + } + + } + var productPlanInfo = _productPlanInfoService.GetProductPlanByPlanCode(productPlanCode); if (productPlanInfo != null) { diff --git a/Aucma.Scada.Business/InStoreBusiness.cs b/Aucma.Scada.Business/InStoreBusiness.cs index 04aa61d7..1784ed26 100644 --- a/Aucma.Scada.Business/InStoreBusiness.cs +++ b/Aucma.Scada.Business/InStoreBusiness.cs @@ -462,6 +462,7 @@ namespace Aucma.Scada.Business completion.StationName = appConfig.stationCode; completion.CompleteDate = DateTime.Now; completion.planCode = planCode; + completion.ProductLineCode = "CX_02"; _iMaterialCompletionServices.Add(completion); } } @@ -679,5 +680,11 @@ namespace Aucma.Scada.Business #endregion + + public BaseSpaceInfo GetSpaceInfo(string spaceCode) + { + return _spaceInfoService.GetSpaceInfoBySpaceCode(appConfig.foamStoreCode,spaceCode); + + } } } diff --git a/Aucma.Scada.Business/OutStoreBusiness.cs b/Aucma.Scada.Business/OutStoreBusiness.cs index ce2a2004..5df5ba12 100644 --- a/Aucma.Scada.Business/OutStoreBusiness.cs +++ b/Aucma.Scada.Business/OutStoreBusiness.cs @@ -549,6 +549,7 @@ namespace Aucma.Scada.Business completion.MaterialName = print.MaterialName; completion.StationName = appConfig.outstationCode; completion.CompleteDate = DateTime.Now; + completion.ProductLineCode = "CX_02"; // completion.planCode = planCode; _iMaterialCompletionServices.Add(completion); } @@ -758,6 +759,8 @@ namespace Aucma.Scada.Business bool result = false; try { + + BaseSpaceInfo spaceInfo = _spaceInfoService.GetSpaceInfoBySpaceCode(storeCode, spaceCode); if (spaceInfo.spaceStock > 0) { diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll index e98ddc2e..f8bb199b 100644 Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll differ diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb index 2614c25e..489b10a7 100644 Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb differ diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll index b608ae61..26e9a2ef 100644 Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll differ diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb index 14d571d1..ea246dad 100644 Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb differ diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache index 6d5fa655..af399790 100644 Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache differ diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll index e98ddc2e..f8bb199b 100644 Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll differ diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb index 2614c25e..489b10a7 100644 Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb differ diff --git a/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache b/Aucma.Scada.HikRobot/obj/Debug/Aucma.Scada.HikRobot.csproj.AssemblyReference.cache index 25e46a2f..52e7063a 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/domain/MaterialCompletion.cs b/Aucma.Scada.Model/domain/MaterialCompletion.cs index 0d1bef39..4e659e1e 100644 --- a/Aucma.Scada.Model/domain/MaterialCompletion.cs +++ b/Aucma.Scada.Model/domain/MaterialCompletion.cs @@ -45,6 +45,12 @@ namespace Aucma.Scada.Model.domain [SugarColumn(ColumnName = "STATION_NAME")] public string StationName { get; set; } + /// + /// 所属产线 + /// + [SugarColumn(ColumnName = "PRODUCT_LINE_CODE")] + public string ProductLineCode { get; set; } + /// /// 完成时间 /// 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 091978bd..6ecc96d3 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 a986c19d..99adb563 100644 --- a/Aucma.Scada.UI/Aucma.Scada.UI.csproj +++ b/Aucma.Scada.UI/Aucma.Scada.UI.csproj @@ -5,7 +5,7 @@ Debug AnyCPU {43123E0B-B3B0-4FB4-A508-007D644B3E7C} - Exe + WinExe Aucma.Scada.UI Aucma.Scada.UI v4.8 diff --git a/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml b/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml index 5a346736..c7d82bef 100644 --- a/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml +++ b/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml @@ -231,7 +231,7 @@ - + @@ -250,7 +250,7 @@ - + @@ -358,7 +358,7 @@ - + @@ -366,7 +366,7 @@ - + diff --git a/Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml b/Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml index 14d3c994..1ccdc7b5 100644 --- a/Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml +++ b/Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml @@ -156,7 +156,7 @@ - + diff --git a/Aucma.Scada.UI/Page/InventoryInfo/BomFoamRearInventory.xaml b/Aucma.Scada.UI/Page/InventoryInfo/BomFoamRearInventory.xaml index bcb75544..2dd198ea 100644 --- a/Aucma.Scada.UI/Page/InventoryInfo/BomFoamRearInventory.xaml +++ b/Aucma.Scada.UI/Page/InventoryInfo/BomFoamRearInventory.xaml @@ -85,7 +85,7 @@ - + @@ -207,9 +207,9 @@ - - - + + + diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll index e98ddc2e..f8bb199b 100644 Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll differ diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb index 2614c25e..489b10a7 100644 Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb differ diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe index 620530c7..a0ed1549 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 52110933..6a05e932 100644 Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb differ diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll index b608ae61..26e9a2ef 100644 Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll differ diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb index 14d571d1..ea246dad 100644 Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb differ diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache index 02e93231..07e62048 100644 Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache differ diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe index 620530c7..a0ed1549 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 95d14577..cb9f146a 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 52110933..6a05e932 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_MarkupCompile.cache b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.cache index 3471f70f..d06718fc 100644 --- a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.cache +++ b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.cache @@ -1,7 +1,7 @@ Aucma.Scada.UI -exe +winexe C# .cs E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\ 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 239900d2..15ea55f0 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 @@ -1,19 +1,19 @@ Aucma.Scada.UI -exe +winexe 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 47-1397376950 -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; 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 7bb884c6..94761ed7 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 @@ -1,21 +1,21 @@ -E:\c#\AUCMA\aucma.scada\foam\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.i.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;; +E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.i.cs +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;; 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 ab938eb4..3a10709b 100644 --- a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref +++ b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref @@ -1,4 +1,4 @@ - +E:\c#\AUCMA\最新代码整合\泡后库\foam\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.cs 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;; diff --git a/Aucma.Scada.UI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Aucma.Scada.UI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 6bbe88d6..98b3d733 100644 Binary files a/Aucma.Scada.UI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Aucma.Scada.UI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Aucma.Scada.UI/obj/Debug/GeneratedInternalTypeHelper.g.cs b/Aucma.Scada.UI/obj/Debug/GeneratedInternalTypeHelper.g.cs index ffa4e1ed..c65238fb 100644 --- a/Aucma.Scada.UI/obj/Debug/GeneratedInternalTypeHelper.g.cs +++ b/Aucma.Scada.UI/obj/Debug/GeneratedInternalTypeHelper.g.cs @@ -1,62 +1,2 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// 运行时版本:4.0.30319.42000 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - -namespace XamlGeneratedNamespace { - - - /// - /// GeneratedInternalTypeHelper - /// - [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 { - - /// - /// CreateInstance - /// - 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); - } - - /// - /// GetPropertyValue - /// - 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); - } - - /// - /// SetPropertyValue - /// - 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); - } - - /// - /// CreateDelegate - /// - 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))); - } - - /// - /// AddEventHandler - /// - protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) { - eventInfo.AddEventHandler(target, handler); - } - } -} + diff --git a/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.baml b/Aucma.Scada.UI/obj/Debug/Page/AssemblyPlan/AssemblyPlanControl.baml index 737e295e..a019deff 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 865f5f3a..1a447764 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}" "E2E7683773E9FFF79EEA964FBBD5AA51634F3911355ECB5D54C4500F253BBEB9" +#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "49DCEC69E90C1CE67E335FAD727D9A0EA5BDB91C5A28872F972C85125424550F" //------------------------------------------------------------------------------ // // 此代码由工具生成。 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 865f5f3a..1a447764 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}" "E2E7683773E9FFF79EEA964FBBD5AA51634F3911355ECB5D54C4500F253BBEB9" +#pragma checksum "..\..\..\..\Page\AssemblyPlan\AssemblyPlanControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "49DCEC69E90C1CE67E335FAD727D9A0EA5BDB91C5A28872F972C85125424550F" //------------------------------------------------------------------------------ // // 此代码由工具生成。 diff --git a/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.baml b/Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.baml index a74e563f..bb187ce9 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 915aa5fd..e1249276 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}" "277C4DE1E9831072A1CCE47A35DA0C34171685632AF936017FDDDFFCB1A56CF1" +#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0525566B2108EF31BCE3AE0AE4825852465F7167B256C2FF88A40A2E86814F5F" //------------------------------------------------------------------------------ // // 此代码由工具生成。 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 915aa5fd..e1249276 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}" "277C4DE1E9831072A1CCE47A35DA0C34171685632AF936017FDDDFFCB1A56CF1" +#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0525566B2108EF31BCE3AE0AE4825852465F7167B256C2FF88A40A2E86814F5F" //------------------------------------------------------------------------------ // // 此代码由工具生成。 diff --git a/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/BomFoamRearInventory.baml b/Aucma.Scada.UI/obj/Debug/Page/InventoryInfo/BomFoamRearInventory.baml index 54c0798d..479c96d5 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 93cf0276..c12de4ef 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}" "06E986B5DF67B38EB8833E582BEA3126482F553B2211106F1D88FC931F916321" +#pragma checksum "..\..\..\..\Page\InventoryInfo\BomFoamRearInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "499D17A36FA3974B82EDA748E47589FBA03A90DC50E1D4961F25DC669C0324B0" //------------------------------------------------------------------------------ // // 此代码由工具生成。 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 93cf0276..c12de4ef 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}" "06E986B5DF67B38EB8833E582BEA3126482F553B2211106F1D88FC931F916321" +#pragma checksum "..\..\..\..\Page\InventoryInfo\BomFoamRearInventory.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "499D17A36FA3974B82EDA748E47589FBA03A90DC50E1D4961F25DC669C0324B0" //------------------------------------------------------------------------------ // // 此代码由工具生成。 diff --git a/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs b/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs index 779720c8..33f36c9d 100644 --- a/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs +++ b/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs @@ -151,7 +151,7 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan /// /// 型号统计柱状图x轴物料类型 /// - private List materialNameList; + private List materialNameList =new List(); public List MaterialNameList { @@ -457,7 +457,7 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan if (materialStats != null) { ModelStatistics.Clear(); - MaterialNameList = new List(); + MaterialNameList.Clear(); ChartValues materialAchievement = new ChartValues(); foreach (var item in materialStats) { @@ -508,7 +508,7 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan { Achievement.Clear(); ProductionHourList.Clear(); - ProductionHourList = new List(); + ProductionHourList.Clear(); ChartValues hourAchievement = new ChartValues(); int i = 0; foreach (var item in hourAmount) diff --git a/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs b/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs index bc663ea2..4e5a488b 100644 --- a/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs +++ b/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs @@ -182,7 +182,7 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo /// /// 库存统计柱状图X轴物料信息 /// - private List materialNameList; + private List materialNameList = new List(); public List MaterialNameList { @@ -289,7 +289,7 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo Query(); ChartValues achievement = new ChartValues(); - MaterialNameList = new List(); + // MaterialNameList = new List(); var info = inStoreBusiness.GetFoamStoreStock(); @@ -298,6 +298,7 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo if (info != null) { Achievement.Clear(); + MaterialNameList.Clear(); foreach (var item in info) { if (!string.IsNullOrEmpty(item.materialType)) diff --git a/Aucma.Scada.UI/viewModel/InventoryInfo/BoxFoamRearInventoryViewModel.cs b/Aucma.Scada.UI/viewModel/InventoryInfo/BoxFoamRearInventoryViewModel.cs index aec10212..5051f38a 100644 --- a/Aucma.Scada.UI/viewModel/InventoryInfo/BoxFoamRearInventoryViewModel.cs +++ b/Aucma.Scada.UI/viewModel/InventoryInfo/BoxFoamRearInventoryViewModel.cs @@ -6,6 +6,7 @@ using GalaSoft.MvvmLight.Command; using HighWayIot.Config; using HighWayIot.Log4net; using HighWayIot.Plc; +using HighWayIot.Repository.service; using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -27,7 +28,8 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo private InventoryInfoBusiness inventoryInfoBusiness = InventoryInfoBusiness.Instance; private OutStoreBusiness outStoreBusiness = OutStoreBusiness.Instance; - + + private InStoreBusiness inStoreBusiness = InStoreBusiness.Instance; private InStoreTaskHandle taskHandle = InStoreTaskHandle.Instance; @@ -184,6 +186,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo foreach (var item in info) { + // item.typeNameA = GetSubstringAfterFirstDelimiter(item); spaceItems.Add(item); } @@ -199,6 +202,28 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo } } + /// + /// 截取第一个逗号以后的内容 + /// + /// + /// + //public static string GetSubstringAfterFirstDelimiter(BaseSpaceInfo space) + //{ + // if (string.IsNullOrEmpty(space.typeNameA)) + // { + // return ""; + // } + // int index = space.typeNameA.IndexOf(","); + // if (index != -1 && index < space.typeNameA.Length - 1) + // { + // return space.typeNameA.Substring(index + 1); + // } + // else + // { + // return space.typeNameA; + // } + //} + /// /// 货道入库标识设置 @@ -207,16 +232,21 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo private void UpdateInStoreFlag(object obj) { string info = obj as string; - bool result = inventoryInfoBusiness.UpdateInStoreFlag(appConfig.foamStoreCode, info); - if (result) + MessageBoxResult result1 = MessageBox.Show("确认修改入库状态吗", "确认", MessageBoxButton.YesNo, MessageBoxImage.Question); + if (result1 == MessageBoxResult.Yes) { - Query(); - MessageBoxTimeoutA((IntPtr)0, $"货道入库状态修改成功，3秒后关闭提示", "提示", 0, 0, 3000); - } - else - { - MessageBox.Show("货道入库状态修改失败"); + bool result = inventoryInfoBusiness.UpdateInStoreFlag(appConfig.foamStoreCode, info); + if (result) + { + Query(); + MessageBoxTimeoutA((IntPtr)0, $"货道入库状态修改成功，3秒后关闭提示", "提示", 0, 0, 3000); + } + else + { + MessageBox.Show("货道入库状态修改失败"); + } } + } /// @@ -226,16 +256,21 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo private void UpdateOutStoreFlag(object obj) { string info = obj as string; - bool result = inventoryInfoBusiness.UpdateOutStoreFlag(appConfig.foamStoreCode, info); - if (result) + MessageBoxResult result1 = MessageBox.Show("确认修改出库状态吗", "确认", MessageBoxButton.YesNo, MessageBoxImage.Question); + if (result1 == MessageBoxResult.Yes) { - Query(); - MessageBoxTimeoutA((IntPtr)0, $"货道出库状态修改成功，3秒后关闭提示", "提示", 0, 0, 3000); - } - else - { - MessageBox.Show("货道出库状态修改失败"); + bool result = inventoryInfoBusiness.UpdateOutStoreFlag(appConfig.foamStoreCode, info); + if (result) + { + Query(); + MessageBoxTimeoutA((IntPtr)0, $"货道出库状态修改成功，3秒后关闭提示", "提示", 0, 0, 3000); + } + else + { + MessageBox.Show("货道出库状态修改失败"); + } } + } /// @@ -245,16 +280,21 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo private void UpdateUnusualFlag(object obj) { string info = obj as string; - bool result = inventoryInfoBusiness.UpdateUnusualFlag(appConfig.foamStoreCode, info); - if (result) + MessageBoxResult result1 = MessageBox.Show("确认修改货道状态吗", "确认", MessageBoxButton.YesNo, MessageBoxImage.Question); + if (result1 == MessageBoxResult.Yes) { - Query(); - MessageBoxTimeoutA((IntPtr)0, $"货道异常标识修改成功，3秒后关闭提示", "提示", 0, 0, 3000); - } - else - { - MessageBox.Show("货道异常标识修改失败"); + bool result = inventoryInfoBusiness.UpdateUnusualFlag(appConfig.foamStoreCode, info); + if (result) + { + Query(); + MessageBoxTimeoutA((IntPtr)0, $"货道异常标识修改成功，3秒后关闭提示", "提示", 0, 0, 3000); + } + else + { + MessageBox.Show("货道异常标识修改失败"); + } } + } /// @@ -264,16 +304,21 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo private void UpdateSpaceStatus(object obj) { string info = obj as string; - bool result = inventoryInfoBusiness.UpdateSpaceStatus(appConfig.foamStoreCode, info); - if (result) - { - Query(); - MessageBoxTimeoutA((IntPtr)0, $"货道状态修改成功，3秒后关闭提示", "提示", 0, 0, 3000); - } - else + MessageBoxResult result1 = MessageBox.Show("确认修改货道状态吗", "确认", MessageBoxButton.YesNo, MessageBoxImage.Question); + if (result1 == MessageBoxResult.Yes) { - MessageBox.Show("货道状态修改失败"); + bool result = inventoryInfoBusiness.UpdateSpaceStatus(appConfig.foamStoreCode, info); + if (result) + { + Query(); + MessageBoxTimeoutA((IntPtr)0, $"货道状态修改成功，3秒后关闭提示", "提示", 0, 0, 3000); + } + else + { + MessageBox.Show("货道状态修改失败"); + } } + } /// @@ -282,14 +327,20 @@ 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(); //inventoryInfoBusiness.RefreshBaseSpaceDetails(appConfig.shellStoreCode, info); - - var list = inventoryInfoBusiness.GetBaseSpaceDetails(appConfig.foamStoreCode, info); - + BaseSpaceInfo space = inStoreBusiness.GetSpaceInfo(info); + + List list = inventoryInfoBusiness.GetBaseSpaceDetails(appConfig.foamStoreCode, info); + if(list!=null && list.Count > 0) + { + list =list.OrderByDescending(x => x.createTime).Take(Math.Min(list.Count,space.spaceStock)).ToList(); + + } RefreshSpaceDetails(list); } @@ -305,8 +356,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo spaceDetails.ForEach( arg => { - arg.materialName = GetSubstringBetweenCommas(arg.materialName); - + arg.materialName = GetSubstringBetweenCommas(arg.materialName); SpaceDetailDataGrid.Add(arg); }); } @@ -314,6 +364,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo static string GetSubstringBetweenCommas(string input) { + if(string.IsNullOrEmpty(input)) return input; // 找到第一个逗号的位置 int firstCommaIndex = input.IndexOf(','); if (firstCommaIndex != -1) @@ -343,18 +394,22 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo private void OutOnlyOne(object obj) { string info = obj as string; - - - bool result = outStoreBusiness.OutOnlyOneBySpaceCode(appConfig.foamStoreCode, info); - if (result) - { - Query(); - MessageBoxTimeoutA((IntPtr)0, $"出库任务创建成功，3秒后关闭提示", "提示", 0, 0, 3000); - } - else + MessageBoxResult result1 = MessageBox.Show("确认出一个吗", "确认", MessageBoxButton.YesNo, MessageBoxImage.Question); + if (result1 == MessageBoxResult.Yes) { - MessageBox.Show("出库任务创建失败"); + bool result = outStoreBusiness.OutOnlyOneBySpaceCode(appConfig.foamStoreCode, info); + if (result) + { + Query(); + MessageBoxTimeoutA((IntPtr)0, $"出库任务创建成功，3秒后关闭提示", "提示", 0, 0, 3000); + } + else + { + MessageBox.Show("出库任务创建失败"); + } } + + } /// @@ -363,18 +418,24 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo /// private void OutAll(object obj) { - - string info = obj as string; - bool result = outStoreBusiness.OutAllBySpaceCode(appConfig.foamStoreCode, info); - if (result) + + MessageBoxResult result1 = MessageBox.Show("确认整道出吗", "确认", MessageBoxButton.YesNo, MessageBoxImage.Question); + if (result1 == MessageBoxResult.Yes) { - Query(); - MessageBoxTimeoutA((IntPtr)0, $"出库任务创建成功，3秒后关闭提示", "提示", 0, 0, 3000); - } - else - { - MessageBox.Show("出库任务创建失败"); + string info = obj as string; + bool result = outStoreBusiness.OutAllBySpaceCode(appConfig.foamStoreCode, info); + if (result) + { + Query(); + MessageBoxTimeoutA((IntPtr)0, $"出库任务创建成功，3秒后关闭提示", "提示", 0, 0, 3000); + } + else + { + MessageBox.Show("出库任务创建失败"); + } } + + } diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache index d1ecd9c9..98b26fbf 100644 Binary files a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache and b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache b/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache index 14eb7ade..9180e46b 100644 Binary files a/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache and b/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache index 087037c5..be4442b2 100644 Binary files a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache and b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Mqtt/bin/Debug/HighWayIot.Mqtt.dll b/HighWayIot.Mqtt/bin/Debug/HighWayIot.Mqtt.dll index bd902ca8..c44e3323 100644 Binary files a/HighWayIot.Mqtt/bin/Debug/HighWayIot.Mqtt.dll and b/HighWayIot.Mqtt/bin/Debug/HighWayIot.Mqtt.dll differ diff --git a/HighWayIot.Mqtt/bin/Debug/HighWayIot.Mqtt.pdb b/HighWayIot.Mqtt/bin/Debug/HighWayIot.Mqtt.pdb index 3199de1b..ea0a1bcf 100644 Binary files a/HighWayIot.Mqtt/bin/Debug/HighWayIot.Mqtt.pdb and b/HighWayIot.Mqtt/bin/Debug/HighWayIot.Mqtt.pdb differ diff --git a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache index a50fcac0..32f4973a 100644 Binary files a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache and b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.CoreCompileInputs.cache b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.CoreCompileInputs.cache index bd3eca7e..04aa7f13 100644 --- a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.CoreCompileInputs.cache +++ b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -97c2581ea4187049ea02fc6f4823d36eb22d5d39 +57c70e4804f3f76f7bf48d6ecacf52f8ab467915 diff --git a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.FileListAbsolute.txt b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.FileListAbsolute.txt index 6afb86fe..aec09eb0 100644 --- a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.FileListAbsolute.txt +++ b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.FileListAbsolute.txt @@ -61,3 +61,12 @@ E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.csproj.Co E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.csproj.CopyComplete E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.dll E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.pdb +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Mqtt\bin\Debug\HighWayIot.Mqtt.dll +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Mqtt\bin\Debug\HighWayIot.Mqtt.pdb +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Mqtt\bin\Debug\log4net.dll +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Mqtt\bin\Debug\MQTTnet.dll +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.csproj.AssemblyReference.cache +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.csproj.CoreCompileInputs.cache +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.csproj.CopyComplete +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.dll +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.pdb diff --git a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.dll b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.dll index bd902ca8..c44e3323 100644 Binary files a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.dll and b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.dll differ diff --git a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.pdb b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.pdb index 3199de1b..ea0a1bcf 100644 Binary files a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.pdb and b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.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 d14ceb94..9f063d35 100644 Binary files a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache and b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll index b608ae61..26e9a2ef 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll and b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll differ diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb index 14d571d1..ea246dad 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb and b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb differ diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache index 5241478a..d61a08bc 100644 Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll index b608ae61..26e9a2ef 100644 Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll differ diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb index 14d571d1..ea246dad 100644 Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb differ diff --git a/HighWayIot.Repository/service/IExecutePlanInfoService.cs b/HighWayIot.Repository/service/IExecutePlanInfoService.cs index 09dd11c6..bfab6a69 100644 --- a/HighWayIot.Repository/service/IExecutePlanInfoService.cs +++ b/HighWayIot.Repository/service/IExecutePlanInfoService.cs @@ -12,6 +12,14 @@ namespace HighWayIot.Repository.service /// List GetExecutePlanInfosByProductLineCode(string productLineCode); + + /// + /// 通过产线工位获取执行状态为1或2的计划 + /// + /// + /// + List GetExecutePlanInfosByProductLineCode(string productLineCode, bool flag); + /// /// 通过生产计划编号获取执行计划 /// diff --git a/HighWayIot.Repository/service/Impl/ExecutePlanInfoServiceImpl.cs b/HighWayIot.Repository/service/Impl/ExecutePlanInfoServiceImpl.cs index e4798e98..84ee73d2 100644 --- a/HighWayIot.Repository/service/Impl/ExecutePlanInfoServiceImpl.cs +++ b/HighWayIot.Repository/service/Impl/ExecutePlanInfoServiceImpl.cs @@ -93,6 +93,35 @@ namespace HighWayIot.Repository.service.Impl return planInfos; } + + /// + /// 通过产线工位获取执行状态为1或2的计划 + /// + /// + /// + public List GetExecutePlanInfosByProductLineCode(string productLineCode,bool flag) + { + if (!flag) return null; + List planInfos = null; + try + { + Expression> exp = s1 => true; + exp = exp.And(x => x.productLineCode == productLineCode && x.executeStatus!=3); + + planInfos = _scadaRepository.GetList(exp); + + logHelper.Info($"根据产线工位编号：{productLineCode}；获取到的执行计划信息：{jsonChange.ModeToJson(planInfos)}"); + } + catch (Exception ex) + { + logHelper.Error("通过产线工位获取执行计划异常", ex); + } + return planInfos; + } + + + + /// /// 通过生产计划编号获取执行计划 /// diff --git a/HighWayIot.Rfid/bin/Debug/HighWayIot.Common.dll b/HighWayIot.Rfid/bin/Debug/HighWayIot.Common.dll index 3f7a2093..4fb5cd58 100644 Binary files a/HighWayIot.Rfid/bin/Debug/HighWayIot.Common.dll and b/HighWayIot.Rfid/bin/Debug/HighWayIot.Common.dll differ diff --git a/HighWayIot.Rfid/bin/Debug/HighWayIot.Common.pdb b/HighWayIot.Rfid/bin/Debug/HighWayIot.Common.pdb index ff0f9b41..1f408284 100644 Binary files a/HighWayIot.Rfid/bin/Debug/HighWayIot.Common.pdb and b/HighWayIot.Rfid/bin/Debug/HighWayIot.Common.pdb differ diff --git a/HighWayIot.Rfid/bin/Debug/HighWayIot.Log4net.dll b/HighWayIot.Rfid/bin/Debug/HighWayIot.Log4net.dll index 939e2dfd..68230cbb 100644 Binary files a/HighWayIot.Rfid/bin/Debug/HighWayIot.Log4net.dll and b/HighWayIot.Rfid/bin/Debug/HighWayIot.Log4net.dll differ diff --git a/HighWayIot.Rfid/bin/Debug/HighWayIot.Log4net.pdb b/HighWayIot.Rfid/bin/Debug/HighWayIot.Log4net.pdb index fabd3cf5..40475460 100644 Binary files a/HighWayIot.Rfid/bin/Debug/HighWayIot.Log4net.pdb and b/HighWayIot.Rfid/bin/Debug/HighWayIot.Log4net.pdb differ diff --git a/HighWayIot.Rfid/bin/Debug/HighWayIot.Rfid.dll b/HighWayIot.Rfid/bin/Debug/HighWayIot.Rfid.dll index cc691bc2..672b0235 100644 Binary files a/HighWayIot.Rfid/bin/Debug/HighWayIot.Rfid.dll and b/HighWayIot.Rfid/bin/Debug/HighWayIot.Rfid.dll differ diff --git a/HighWayIot.Rfid/bin/Debug/HighWayIot.Rfid.pdb b/HighWayIot.Rfid/bin/Debug/HighWayIot.Rfid.pdb index 2b34dc63..7ce11363 100644 Binary files a/HighWayIot.Rfid/bin/Debug/HighWayIot.Rfid.pdb and b/HighWayIot.Rfid/bin/Debug/HighWayIot.Rfid.pdb differ diff --git a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache index b65d5116..666df528 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.Rfid/obj/Debug/HighWayIot.Rfid.csproj.CoreCompileInputs.cache b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.CoreCompileInputs.cache index cc0b0cc6..c6e300f4 100644 --- a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.CoreCompileInputs.cache +++ b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -9b80b27eba7680c9113bf60611ab79ed8217a7a2 +ca7511340b20c92300885a5385eca6c41a8d5a6f diff --git a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.FileListAbsolute.txt b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.FileListAbsolute.txt index 48b6a3a8..96647a40 100644 --- a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.FileListAbsolute.txt +++ b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.FileListAbsolute.txt @@ -103,3 +103,18 @@ E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Rfid\obj\Debug\HighWayIot.Rfid.csproj.Co E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Rfid\obj\Debug\HighWayIot.Rfid.csproj.CopyComplete E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Rfid\obj\Debug\HighWayIot.Rfid.dll E:\c#\AUCMA\aucma.scada\foam\HighWayIot.Rfid\obj\Debug\HighWayIot.Rfid.pdb +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Rfid\bin\Debug\HighWayIot.Rfid.dll +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Rfid\bin\Debug\HighWayIot.Rfid.pdb +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Rfid\bin\Debug\GRreader.dll +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Rfid\bin\Debug\HighWayIot.Common.dll +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Rfid\bin\Debug\HighWayIot.Log4net.dll +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Rfid\bin\Debug\Newtonsoft.Json.dll +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Rfid\bin\Debug\log4net.dll +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Rfid\bin\Debug\HighWayIot.Common.pdb +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Rfid\bin\Debug\HighWayIot.Log4net.pdb +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Rfid\bin\Debug\Newtonsoft.Json.xml +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Rfid\obj\Debug\HighWayIot.Rfid.csproj.AssemblyReference.cache +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Rfid\obj\Debug\HighWayIot.Rfid.csproj.CoreCompileInputs.cache +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Rfid\obj\Debug\HighWayIot.Rfid.csproj.CopyComplete +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Rfid\obj\Debug\HighWayIot.Rfid.dll +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot.Rfid\obj\Debug\HighWayIot.Rfid.pdb diff --git a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.dll b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.dll index cc691bc2..672b0235 100644 Binary files a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.dll and b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.dll differ diff --git a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.pdb b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.pdb index 2b34dc63..7ce11363 100644 Binary files a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.pdb and b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.pdb differ diff --git a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache index 2ff28152..d1c7d1af 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/Aucma.Scada.Model.dll b/HighWayIot/bin/Debug/Aucma.Scada.Model.dll index b58367ed..838d0195 100644 Binary files a/HighWayIot/bin/Debug/Aucma.Scada.Model.dll and b/HighWayIot/bin/Debug/Aucma.Scada.Model.dll differ diff --git a/HighWayIot/bin/Debug/Aucma.Scada.Model.pdb b/HighWayIot/bin/Debug/Aucma.Scada.Model.pdb index 784bd7d9..4fd4e3bc 100644 Binary files a/HighWayIot/bin/Debug/Aucma.Scada.Model.pdb and b/HighWayIot/bin/Debug/Aucma.Scada.Model.pdb differ diff --git a/HighWayIot/bin/Debug/HighWayIot.Common.dll b/HighWayIot/bin/Debug/HighWayIot.Common.dll index 3f7a2093..4fb5cd58 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.Common.dll and b/HighWayIot/bin/Debug/HighWayIot.Common.dll differ diff --git a/HighWayIot/bin/Debug/HighWayIot.Common.pdb b/HighWayIot/bin/Debug/HighWayIot.Common.pdb index ff0f9b41..1f408284 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.Common.pdb and b/HighWayIot/bin/Debug/HighWayIot.Common.pdb differ diff --git a/HighWayIot/bin/Debug/HighWayIot.Config.dll b/HighWayIot/bin/Debug/HighWayIot.Config.dll index 7ea4be2e..220f8bdf 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 757a1df0..f46de720 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.Config.pdb and b/HighWayIot/bin/Debug/HighWayIot.Config.pdb differ diff --git a/HighWayIot/bin/Debug/HighWayIot.Log4net.dll b/HighWayIot/bin/Debug/HighWayIot.Log4net.dll index 939e2dfd..68230cbb 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.Log4net.dll and b/HighWayIot/bin/Debug/HighWayIot.Log4net.dll differ diff --git a/HighWayIot/bin/Debug/HighWayIot.Log4net.pdb b/HighWayIot/bin/Debug/HighWayIot.Log4net.pdb index fabd3cf5..40475460 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.Log4net.pdb and b/HighWayIot/bin/Debug/HighWayIot.Log4net.pdb differ diff --git a/HighWayIot/bin/Debug/HighWayIot.Repository.dll b/HighWayIot/bin/Debug/HighWayIot.Repository.dll index ebfca430..26e9a2ef 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.Repository.dll and b/HighWayIot/bin/Debug/HighWayIot.Repository.dll differ diff --git a/HighWayIot/bin/Debug/HighWayIot.Repository.pdb b/HighWayIot/bin/Debug/HighWayIot.Repository.pdb index ba8e0b1d..ea246dad 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.Repository.pdb and b/HighWayIot/bin/Debug/HighWayIot.Repository.pdb differ diff --git a/HighWayIot/bin/Debug/HighWayIot.exe b/HighWayIot/bin/Debug/HighWayIot.exe index 436e0697..f0193c6e 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.exe and b/HighWayIot/bin/Debug/HighWayIot.exe differ diff --git a/HighWayIot/bin/Debug/HighWayIot.pdb b/HighWayIot/bin/Debug/HighWayIot.pdb index 3d9e3184..80656c8a 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.pdb and b/HighWayIot/bin/Debug/HighWayIot.pdb differ diff --git a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache index f06daf68..009999b0 100644 Binary files a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache and b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache differ diff --git a/HighWayIot/obj/Debug/HighWayIot.csproj.CoreCompileInputs.cache b/HighWayIot/obj/Debug/HighWayIot.csproj.CoreCompileInputs.cache index 18c6cad4..f27e7aa7 100644 --- a/HighWayIot/obj/Debug/HighWayIot.csproj.CoreCompileInputs.cache +++ b/HighWayIot/obj/Debug/HighWayIot.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -952f70c5aa24ebe2b0b884df9601a6bd38147cb1 +b6f24cfde60f715e07ec9ccee22ba3c922d3df52 diff --git a/HighWayIot/obj/Debug/HighWayIot.csproj.FileListAbsolute.txt b/HighWayIot/obj/Debug/HighWayIot.csproj.FileListAbsolute.txt index 19750bd0..f4b086f4 100644 --- a/HighWayIot/obj/Debug/HighWayIot.csproj.FileListAbsolute.txt +++ b/HighWayIot/obj/Debug/HighWayIot.csproj.FileListAbsolute.txt @@ -172,3 +172,34 @@ E:\c#\AUCMA\aucma.scada\foam\HighWayIot\obj\Debug\HighWayIot.csproj.CoreCompileI E:\c#\AUCMA\aucma.scada\foam\HighWayIot\obj\Debug\HighWayIot.csproj.CopyComplete E:\c#\AUCMA\aucma.scada\foam\HighWayIot\obj\Debug\HighWayIot.exe E:\c#\AUCMA\aucma.scada\foam\HighWayIot\obj\Debug\HighWayIot.pdb +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\HighWayIot.exe.config +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\HighWayIot.exe +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\HighWayIot.pdb +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\HighWayIot.Log4net.dll +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\HighWayIot.Repository.dll +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\Oracle.ManagedDataAccess.dll +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\log4net.dll +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\SqlSugar.dll +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\HighWayIot.Common.dll +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\HighWayIot.Config.dll +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\Aucma.Scada.Model.dll +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\System.Memory.dll +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\System.Threading.Tasks.Extensions.dll +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\Newtonsoft.Json.dll +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\System.Numerics.Vectors.dll +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\System.Buffers.dll +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\HighWayIot.Log4net.pdb +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\HighWayIot.Repository.pdb +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\HighWayIot.Repository.dll.config +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\HighWayIot.Common.pdb +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\HighWayIot.Config.pdb +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\Aucma.Scada.Model.pdb +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\bin\Debug\Newtonsoft.Json.xml +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\obj\Debug\HighWayIot.csproj.AssemblyReference.cache +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\obj\Debug\HighWayIot.csproj.SuggestedBindingRedirects.cache +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\obj\Debug\HighWayIot.exe.config +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\obj\Debug\HighWayIot.csproj.CoreCompileInputs.cache +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\obj\Debug\HighWayIot.csproj.CopyComplete +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\obj\Debug\HighWayIot.exe +E:\c#\AUCMA\最新代码整合\泡后库\foam\HighWayIot\obj\Debug\HighWayIot.pdb diff --git a/HighWayIot/obj/Debug/HighWayIot.exe b/HighWayIot/obj/Debug/HighWayIot.exe index 436e0697..f0193c6e 100644 Binary files a/HighWayIot/obj/Debug/HighWayIot.exe and b/HighWayIot/obj/Debug/HighWayIot.exe differ diff --git a/HighWayIot/obj/Debug/HighWayIot.pdb b/HighWayIot/obj/Debug/HighWayIot.pdb index 3d9e3184..80656c8a 100644 Binary files a/HighWayIot/obj/Debug/HighWayIot.pdb and b/HighWayIot/obj/Debug/HighWayIot.pdb differ