diff --git a/.vs/HighWayIot/FileContentIndex/20beb2bb-2431-4f96-93cf-f00dc33addcf.vsidx b/.vs/HighWayIot/FileContentIndex/20beb2bb-2431-4f96-93cf-f00dc33addcf.vsidx new file mode 100644 index 00000000..addaeb9d Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/20beb2bb-2431-4f96-93cf-f00dc33addcf.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/6e354185-7f4f-4392-af05-c49e1712958b.vsidx b/.vs/HighWayIot/FileContentIndex/6e354185-7f4f-4392-af05-c49e1712958b.vsidx new file mode 100644 index 00000000..94b8d7b6 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/6e354185-7f4f-4392-af05-c49e1712958b.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/6f19ed08-3313-43af-a7a6-95d9f7a36e28.vsidx b/.vs/HighWayIot/FileContentIndex/6f19ed08-3313-43af-a7a6-95d9f7a36e28.vsidx new file mode 100644 index 00000000..a70c6934 Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/6f19ed08-3313-43af-a7a6-95d9f7a36e28.vsidx differ diff --git a/.vs/HighWayIot/FileContentIndex/ba06790b-4460-4b0c-b99b-74ccf68a435d.vsidx b/.vs/HighWayIot/FileContentIndex/ba06790b-4460-4b0c-b99b-74ccf68a435d.vsidx new file mode 100644 index 00000000..2b8cea2c Binary files /dev/null and b/.vs/HighWayIot/FileContentIndex/ba06790b-4460-4b0c-b99b-74ccf68a435d.vsidx differ diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo index 7d7b0560..666d42c5 100644 Binary files a/.vs/HighWayIot/v17/.suo and b/.vs/HighWayIot/v17/.suo differ diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll index deeef55b..aed8c7ba 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 c7b25b46..0f87be07 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 206b35c2..5a051d71 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 deeef55b..aed8c7ba 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 c7b25b46..0f87be07 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 f6880d7c..0c354bee 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.UI/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll index deeef55b..aed8c7ba 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 c7b25b46..0f87be07 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 5c5e9988..3ac67579 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 b2eecdc1..b550dfef 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 9f44591c..e2b161f1 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 5c5e9988..3ac67579 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 b2eecdc1..b550dfef 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 749f7f26..02798061 100644 --- a/Aucma.Scada.UI/viewModel/OutStoreInfo/OutStoreInfoViewModel.cs +++ b/Aucma.Scada.UI/viewModel/OutStoreInfo/OutStoreInfoViewModel.cs @@ -202,6 +202,7 @@ namespace Aucma.Scada.UI.viewModel.OutStoreInfo { App.Current.Dispatcher.Invoke((Action)(() => { + taskInfo.materialType = outStoreBusiness.GetMaterialName(taskInfo.materialType); taskItems.Add(taskInfo); OutstoreTask = taskItems; })); @@ -267,6 +268,7 @@ namespace Aucma.Scada.UI.viewModel.OutStoreInfo taskItems = new ObservableCollection(); foreach (var item in info) { + item.materialType = outStoreBusiness.GetMaterialName(item.materialType); taskItems.Add(item); } OutstoreTask = taskItems.OrderBy(x => x.createTime); diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache index 9dd39b15..510df1d3 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/obj/Debug/HighWayIot.csproj.AssemblyReference.cache b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache index a0b34a89..e89e3aa5 100644 Binary files a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache and b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache differ