diff --git a/.vs/HighWayIot/v16/.suo b/.vs/HighWayIot/v16/.suo index def2541c..2184707c 100644 Binary files a/.vs/HighWayIot/v16/.suo and b/.vs/HighWayIot/v16/.suo differ diff --git a/Aucma.Scada.Business/InventoryInfoBusiness.cs b/Aucma.Scada.Business/InventoryInfoBusiness.cs index ada1dab7..3c9ca84f 100644 --- a/Aucma.Scada.Business/InventoryInfoBusiness.cs +++ b/Aucma.Scada.Business/InventoryInfoBusiness.cs @@ -31,11 +31,17 @@ namespace Aucma.Scada.Business private IBaseSpaceInfoService _spaceInfoService = new BaseSpaceInfoServiceImpl(); + private IBaseSpaceDetailService _spaceDetailService = new BaseSpaceDetailServiceImpl(); + public InventoryInfoBusiness() { } + //List + public delegate void RefreshSpaceDetails(List taskInfos); + public event RefreshSpaceDetails RefreshSpaceDetailsEvent; + /// /// 获取货道信息 /// @@ -159,5 +165,32 @@ namespace Aucma.Scada.Business } return result; } + + /// + /// 刷新货道明细 + /// + /// + /// + /// + public void RefreshBaseSpaceDetails(string storeCode,string spaceCode) + { + List spaceDetails = _spaceDetailService.GetSpaceDetailsBySpaceCode(storeCode, spaceCode); + if(spaceDetails != null) + { + RefreshSpaceDetailsEvent?.Invoke(spaceDetails); + } + } + + /// + /// 获取货道明细 + /// + /// + /// + /// + public List GetBaseSpaceDetails(string storeCode, string spaceCode) + { + List spaceDetails = _spaceDetailService.GetSpaceDetailsBySpaceCode(storeCode, spaceCode); + return spaceDetails; + } } } diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll index 029cce20..ac1c982f 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 fe521a61..f72cae09 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 eb77f155..d26748e3 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 d0ff65f5..ebbb073f 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 84d473e1..992ba64e 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 029cce20..ac1c982f 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 fe521a61..f72cae09 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.UI/Aucma.Scada.UI.csproj b/Aucma.Scada.UI/Aucma.Scada.UI.csproj index 3b10eee2..64a4ce6d 100644 --- a/Aucma.Scada.UI/Aucma.Scada.UI.csproj +++ b/Aucma.Scada.UI/Aucma.Scada.UI.csproj @@ -117,6 +117,9 @@ ShellInventory.xaml + + SpaceDetailWindow.xaml + SpaceInfoControl.xaml @@ -134,6 +137,7 @@ + @@ -180,6 +184,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/Aucma.Scada.UI/Page/InventoryInfo/LinerInventory.xaml b/Aucma.Scada.UI/Page/InventoryInfo/LinerInventory.xaml index 384a7380..76aecfa0 100644 --- a/Aucma.Scada.UI/Page/InventoryInfo/LinerInventory.xaml +++ b/Aucma.Scada.UI/Page/InventoryInfo/LinerInventory.xaml @@ -130,7 +130,7 @@ - diff --git a/Aucma.Scada.UI/Page/InventoryInfo/ShellInventory.xaml b/Aucma.Scada.UI/Page/InventoryInfo/ShellInventory.xaml index 436e966d..a6643d4e 100644 --- a/Aucma.Scada.UI/Page/InventoryInfo/ShellInventory.xaml +++ b/Aucma.Scada.UI/Page/InventoryInfo/ShellInventory.xaml @@ -131,7 +131,7 @@ - diff --git a/Aucma.Scada.UI/Page/InventoryInfo/SpaceDetailWindow.xaml b/Aucma.Scada.UI/Page/InventoryInfo/SpaceDetailWindow.xaml new file mode 100644 index 00000000..6a262eba --- /dev/null +++ b/Aucma.Scada.UI/Page/InventoryInfo/SpaceDetailWindow.xaml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + +