diff --git a/.vs/HighWayIot/FileContentIndex/45a7e535-c04d-45cb-92c1-f37f31932ac1.vsidx b/.vs/HighWayIot/FileContentIndex/45a7e535-c04d-45cb-92c1-f37f31932ac1.vsidx new file mode 100644 index 00000000..52194e0f Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/45a7e535-c04d-45cb-92c1-f37f31932ac1.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/87230742-1314-42d1-a174-bf29f7c911b4.vsidx b/.vs/HighWayIot/FileContentIndex/89e71a55-1ce5-4a51-bb15-73128acef3fd.vsidx similarity index 58% rename from .vs/HighWayIot/FileContentIndex/87230742-1314-42d1-a174-bf29f7c911b4.vsidx rename to .vs/HighWayIot/FileContentIndex/89e71a55-1ce5-4a51-bb15-73128acef3fd.vsidx index 45570aee..4fa03dd8 100644 Binary files a/.vs/HighWayIot/FileContentIndex/87230742-1314-42d1-a174-bf29f7c911b4.vsidx and b/.vs/HighWayIot/FileContentIndex/89e71a55-1ce5-4a51-bb15-73128acef3fd.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/aae4be92-d0ac-4594-b170-e2d9e92407a0.vsidx b/.vs/HighWayIot/FileContentIndex/aae4be92-d0ac-4594-b170-e2d9e92407a0.vsidx deleted file mode 100644 index a9fc340c..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/aae4be92-d0ac-4594-b170-e2d9e92407a0.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/ab98dc33-e1d9-41d7-90d1-4304bee7cd63.vsidx b/.vs/HighWayIot/FileContentIndex/ab98dc33-e1d9-41d7-90d1-4304bee7cd63.vsidx new file mode 100644 index 00000000..8c2374a2 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/ab98dc33-e1d9-41d7-90d1-4304bee7cd63.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/bfa463f5-f833-48c2-91b1-8ae618bfa0b1.vsidx b/.vs/HighWayIot/FileContentIndex/bfa463f5-f833-48c2-91b1-8ae618bfa0b1.vsidx new file mode 100644 index 00000000..5c22ad28 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/bfa463f5-f833-48c2-91b1-8ae618bfa0b1.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/d58ee77f-bd43-4b62-9c52-70fedd94bde0.vsidx b/.vs/HighWayIot/FileContentIndex/d58ee77f-bd43-4b62-9c52-70fedd94bde0.vsidx deleted file mode 100644 index 201def92..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/d58ee77f-bd43-4b62-9c52-70fedd94bde0.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/FileContentIndex/f67bf6d3-7d00-4b53-ada0-41b61cfd2e19.vsidx b/.vs/HighWayIot/FileContentIndex/f67bf6d3-7d00-4b53-ada0-41b61cfd2e19.vsidx deleted file mode 100644 index 7d856a22..00000000 Binary files a/.vs/HighWayIot/FileContentIndex/f67bf6d3-7d00-4b53-ada0-41b61cfd2e19.vsidx and /dev/null differ diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo index 62d37ee0..b4ec4e49 100644 Binary files a/.vs/HighWayIot/v17/.suo and b/.vs/HighWayIot/v17/.suo differ diff --git a/Aucma.Scada.Business/OutStoreBusiness.cs b/Aucma.Scada.Business/OutStoreBusiness.cs index d0ddb8e0..ce2a2004 100644 --- a/Aucma.Scada.Business/OutStoreBusiness.cs +++ b/Aucma.Scada.Business/OutStoreBusiness.cs @@ -765,7 +765,7 @@ namespace Aucma.Scada.Business var productPlanInfo = _productPlanInfoService.GetProductPlanInfosByMaterialCode(spaceInfo.materialType); if (productPlanInfo != null) { - result = assemblyPlanBusiness.PlanTransmitByProductPlan(productPlanInfo.planCode, spaceInfo.spaceStock); + result = assemblyPlanBusiness.PlanTransmitByProductPlan(productPlanInfo.planCode, spaceInfo.spaceStock, spaceInfo); } #endregion else diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll index 7c2bf97a..f86597fa 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 f732c69a..fc1ff439 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/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache index 777aad11..9a2c279c 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 7c2bf97a..f86597fa 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 f732c69a..fc1ff439 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 9b087c63..d58a4231 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 487f0c6c..85122cca 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/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll index 7c2bf97a..f86597fa 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 f732c69a..fc1ff439 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 3a035b84..c8e5d3c2 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 3f8c24fd..979d674a 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/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache index 2e582cca..6d787821 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 3a035b84..c8e5d3c2 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.pdb b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb index 3f8c24fd..979d674a 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/viewModel/OutStoreInfo/OutStoreInfoViewModel.cs b/Aucma.Scada.UI/viewModel/OutStoreInfo/OutStoreInfoViewModel.cs index 4919f449..24eda118 100644 --- a/Aucma.Scada.UI/viewModel/OutStoreInfo/OutStoreInfoViewModel.cs +++ b/Aucma.Scada.UI/viewModel/OutStoreInfo/OutStoreInfoViewModel.cs @@ -294,6 +294,11 @@ namespace Aucma.Scada.UI.viewModel.OutStoreInfo OutstoreTask = taskItems.OrderBy(x => x.createTime); })); } + else + { + taskItems.Clear(); + OutstoreTask = taskItems; + } } catch (Exception ex) { diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache index 8faff48f..4d336766 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 e0ce7ef4..93f707ea 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.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache index 40c694d9..3fd08dff 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/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache index e35a3899..95cf4047 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 14c1ce57..51ab490d 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 16f1d955..7f0f9d35 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.Repository.dll b/HighWayIot/bin/Debug/HighWayIot.Repository.dll index 11a72417..ebfca430 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 ec5698a6..ba8e0b1d 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.Repository.pdb and b/HighWayIot/bin/Debug/HighWayIot.Repository.pdb differ diff --git a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache index 76dd27ce..3244c7be 100644 Binary files a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache and b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache differ