From 3af79805fe9927bbcb69d41232999c794eb29381 Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Wed, 30 Aug 2023 18:30:07 +0800
Subject: [PATCH] 10176

---
 BBWY.Client/App.xaml.cs                       |   4 +-
 BBWY.Client/GlobalContext.cs                  |   2 +-
 .../SetSealBoxPolicyWareListControl.xaml      |   7 +-
 .../Views/SealBox/SetSealBoxPolicyWindow.xaml | 108 ++++++++++--------
 .../SealBox/SetSealBoxPolicyWindow.xaml.cs    |  27 +++++
 5 files changed, 94 insertions(+), 54 deletions(-)

diff --git a/BBWY.Client/App.xaml.cs b/BBWY.Client/App.xaml.cs
index c0c5bd6f..6aa4f7fb 100644
--- a/BBWY.Client/App.xaml.cs
+++ b/BBWY.Client/App.xaml.cs
@@ -56,11 +56,11 @@ namespace BBWY.Client
             //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjY1ODk1OTgzMzc4MDc1NjQ4IiwidGVhbUlkIjoiMTUxNjcxNTM3MjQ0NTcwMDA5NiIsInNvblRlYW1JZHMiOiIxNTQwODg1NTcwNjI3MDQ3NDI0LDE1MTY3MTUzNzI0NDU3MDAwOTYiLCJleHAiOjE3MjQyOTE2MDZ9.NG6wDqHJ5ozmEDcAt2duJ50IcGarygrQ2bmiP4TGNRE";
 
             //齐越山鸡
-            //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw";
+            userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw";
 
 
             //齐越陈默
-            userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjI0OTUxNjgzNTc2NTAwMjI0IiwidGVhbUlkIjoiMTYyMDM0MjAxNDcwNjk3ODgxNiIsInNvblRlYW1JZHMiOiIxNjIwMzQyMDE0NzA2OTc4ODE2LDE2MjAzNDQxNDA4NTAwMDgwNjQsMTQxMDk1NTYwNDYxMjA5MTkwNCIsImV4cCI6MTcyNDkxNDM5M30.tIgo70tzRxZyUQkX1Jsh9I4ySciX0VC9HMMOoTnwVtM";
+            //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjI0OTUxNjgzNTc2NTAwMjI0IiwidGVhbUlkIjoiMTYyMDM0MjAxNDcwNjk3ODgxNiIsInNvblRlYW1JZHMiOiIxNjIwMzQyMDE0NzA2OTc4ODE2LDE2MjAzNDQxNDA4NTAwMDgwNjQsMTQxMDk1NTYwNDYxMjA5MTkwNCIsImV4cCI6MTcyNDkxNDM5M30.tIgo70tzRxZyUQkX1Jsh9I4ySciX0VC9HMMOoTnwVtM";
 
 #else
             //var uid = e.Args.Count() > 0 ? e.Args.LastOrDefault(args => args.StartsWith("uid:")) : string.Empty;
diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs
index ee3a617f..d91a09d9 100644
--- a/BBWY.Client/GlobalContext.cs
+++ b/BBWY.Client/GlobalContext.cs
@@ -13,7 +13,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10175";
+            ClientVersion = "10176";
         }
 
         private User user;
diff --git a/BBWY.Client/Views/SealBox/SetSealBoxPolicyWareListControl.xaml b/BBWY.Client/Views/SealBox/SetSealBoxPolicyWareListControl.xaml
index d08ef8a8..23bdcdf5 100644
--- a/BBWY.Client/Views/SealBox/SetSealBoxPolicyWareListControl.xaml
+++ b/BBWY.Client/Views/SealBox/SetSealBoxPolicyWareListControl.xaml
@@ -7,6 +7,11 @@
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
-            
+        <ListBox x:Name="listbox1" ScrollViewer.VerticalScrollBarVisibility="Hidden">
+
+            <ListBox x:Name="listbox2" ScrollViewer.VerticalScrollBarVisibility="Visible">
+
+            </ListBox>
+        </ListBox>
     </Grid>
 </UserControl>
diff --git a/BBWY.Client/Views/SealBox/SetSealBoxPolicyWindow.xaml b/BBWY.Client/Views/SealBox/SetSealBoxPolicyWindow.xaml
index 8b8e20fc..3a4c3fbb 100644
--- a/BBWY.Client/Views/SealBox/SetSealBoxPolicyWindow.xaml
+++ b/BBWY.Client/Views/SealBox/SetSealBoxPolicyWindow.xaml
@@ -79,67 +79,75 @@
 
 
 
-        <Grid   Grid.Row="3"   Margin="20 10 20 0" >
+        <Grid   Grid.Row="3" Name="jd_list"  Margin="20 10 20 0" >
 
-            <ListBox Name="jd_list" ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" ScrollViewer.HorizontalScrollBarVisibility="Auto">
-                <Grid   Visibility="{Binding SelectWareType,Converter={StaticResource objConverter}, ConverterParameter=京仓:Visible:Collapsed}"
+            
+                <Grid Name="jd_gd"  Visibility="{Binding SelectWareType,Converter={StaticResource objConverter}, ConverterParameter=京仓:Visible:Collapsed}"
                         Width="{Binding Width,ElementName=jd_list,Converter={StaticResource widthConverter},ConverterParameter=-0}"
-                        
+                         Height="{Binding ActualHeight,ElementName=jd_list,Converter={StaticResource widthConverter},ConverterParameter=0}"
                         >
                     <Grid.RowDefinitions>
                         <RowDefinition Height="32"/>
                         <RowDefinition/>
                     </Grid.RowDefinitions>
-                    <Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1">
-                        <Grid >
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="224"/>
-                                <ColumnDefinition Width="97"/>
-                                <ColumnDefinition Width="auto"/>
-                                <ColumnDefinition Width="157"/>
-                            </Grid.ColumnDefinitions>
-                            <Border Width="1" Background="{StaticResource Border.Brush}" HorizontalAlignment="Right" />
-                            <Border Width="1" Grid.Column="1" Background="{StaticResource Border.Brush}" HorizontalAlignment="Right" />
-
-                            <Border Width="1" Grid.Column="3" Background="{StaticResource Border.Brush}" HorizontalAlignment="Right" />
-                            <TextBlock Style="{StaticResource middleTextBlock}" Text="商品信息"/>
-                            <TextBlock Grid.Column="1" Style="{StaticResource middleTextBlock}" Text="待分配量"/>
-                            <Grid Grid.Column="2">
+                <ScrollViewer Name="jd_header"    ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Hidden">
+                    <ScrollViewer.Content>
+                        <Border BorderThickness="1" BorderBrush="{StaticResource Border.Brush}">
+                            <Grid >
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="224"/>
+                                    <ColumnDefinition Width="97"/>
+                                    <ColumnDefinition Width="auto"/>
+                                    <ColumnDefinition Width="157"/>
+                                </Grid.ColumnDefinitions>
+                                <Border Width="1" Background="{StaticResource Border.Brush}" HorizontalAlignment="Right" />
+                                <Border Width="1" Grid.Column="1" Background="{StaticResource Border.Brush}" HorizontalAlignment="Right" />
+
+                                <Border Width="1" Grid.Column="3" Background="{StaticResource Border.Brush}" HorizontalAlignment="Right" />
+                                <TextBlock Style="{StaticResource middleTextBlock}" Text="商品信息"/>
+                                <TextBlock Grid.Column="1" Style="{StaticResource middleTextBlock}" Text="待分配量"/>
+                                <Grid Grid.Column="2">
 
+                                </Grid>
+                                <ListBox Grid.Column="2" ScrollViewer.VerticalScrollBarVisibility="Hidden"
+                
+ItemsSource="{Binding  JdWareHourseHeaderList}"
+ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
+BorderBrush="{StaticResource Border.Brush}"
+BorderThickness="0" ScrollViewer.HorizontalScrollBarVisibility="Visible"
+Visibility="{Binding JdWareHourseHeaderList.Count,Converter={StaticResource objConverter},ConverterParameter=0:Collapsed:Visible}"
+Foreground="{StaticResource Text.Color}">
+                                    <ListBox.ItemsPanel>
+                                        <ItemsPanelTemplate>
+                                            <StackPanel Orientation="Horizontal" VerticalAlignment="Center" />
+                                        </ItemsPanelTemplate>
+                                    </ListBox.ItemsPanel>
+                                    <ListBox.ItemTemplate>
+                                        <DataTemplate>
+                                            <Grid Width="180" Height="32">
+                                                <TextBlock Text="{Binding WareName,Mode=TwoWay}" Style="{StaticResource middleTextBlock}"/>
+                                                <Border Width="1" Background="{StaticResource Border.Brush}" HorizontalAlignment="Right" Grid.ColumnSpan="2"/>
+                                            </Grid>
+
+                                        </DataTemplate>
+                                    </ListBox.ItemTemplate>
+                                </ListBox>
+
+                                <TextBlock Grid.Column="3" Style="{StaticResource middleTextBlock}" Text="操作"/>
                             </Grid>
-                            <ListBox Grid.Column="2" ScrollViewer.VerticalScrollBarVisibility="Hidden"
-                     ItemsSource="{Binding  JdWareHourseHeaderList}"
-                     ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
-                     BorderBrush="{StaticResource Border.Brush}"
-                     BorderThickness="0" ScrollViewer.HorizontalScrollBarVisibility="Visible"
-                     Visibility="{Binding JdWareHourseHeaderList.Count,Converter={StaticResource objConverter},ConverterParameter=0:Collapsed:Visible}"
-                     Foreground="{StaticResource Text.Color}">
-                                <ListBox.ItemsPanel>
-                                    <ItemsPanelTemplate>
-                                        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" />
-                                    </ItemsPanelTemplate>
-                                </ListBox.ItemsPanel>
-                                <ListBox.ItemTemplate>
-                                    <DataTemplate>
-                                        <Grid Width="180" Height="32">
-                                            <TextBlock Text="{Binding WareName,Mode=TwoWay}" Style="{StaticResource middleTextBlock}"/>
-                                            <Border Width="1" Background="{StaticResource Border.Brush}" HorizontalAlignment="Right" Grid.ColumnSpan="2"/>
-                                        </Grid>
-
-                                    </DataTemplate>
-                                </ListBox.ItemTemplate>
-                            </ListBox>
-
-                            <TextBlock Grid.Column="3" Style="{StaticResource middleTextBlock}" Text="操作"/>
-                        </Grid>
+                        </Border>
+                    </ScrollViewer.Content>
+                       
 
-                    </Border>
+               
+                </ScrollViewer>
+                
                     <ListBox Grid.Column="2" Grid.Row="1" Name="list_sealbox_jddata" 
-                     ItemsSource="{Binding JdConfigureModelList}"
+                     ItemsSource="{Binding JdConfigureModelList}" Height="{Binding Height,ElementName=jd_gd,Converter={StaticResource widthConverter},ConverterParameter=30}"
                      ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
                      BorderBrush="{StaticResource Border.Brush}"
-                     BorderThickness="1,1,1,0" 
-                     Foreground="{StaticResource Text.Color}"  ScrollViewer.VerticalScrollBarVisibility="Hidden"
+                     BorderThickness="1,1,1,0"  ScrollViewer.ScrollChanged="list_sealbox_jddata_ScrollChanged"
+                     Foreground="{StaticResource Text.Color}"  ScrollViewer.VerticalScrollBarVisibility="Visible" ScrollViewer.HorizontalScrollBarVisibility="Auto"
                      >
                         <ListBox.ItemTemplate>
                             <DataTemplate >
@@ -237,8 +245,8 @@
                         </ListBox.ItemTemplate>
                     </ListBox>
 
-                </Grid>
-            </ListBox>
+       </Grid>
+   
            
 
 
diff --git a/BBWY.Client/Views/SealBox/SetSealBoxPolicyWindow.xaml.cs b/BBWY.Client/Views/SealBox/SetSealBoxPolicyWindow.xaml.cs
index 3e0e47f9..0c70cdd0 100644
--- a/BBWY.Client/Views/SealBox/SetSealBoxPolicyWindow.xaml.cs
+++ b/BBWY.Client/Views/SealBox/SetSealBoxPolicyWindow.xaml.cs
@@ -15,6 +15,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 using AutoMapper.Internal;
 using BBWY.Client.APIServices;
+using MathNet.Numerics.LinearAlgebra.Factorization;
 
 namespace BBWY.Client.Views.SealBox
 {
@@ -193,5 +194,31 @@ namespace BBWY.Client.Views.SealBox
 
             }
         }
+
+        private void list_sealbox_jddata_ScrollChanged(object sender, ScrollChangedEventArgs e)
+        {
+            System.Windows.Controls.ScrollViewer sv = e.OriginalSource as System.Windows.Controls. ScrollViewer;
+
+            if (sv != null)
+            {
+                jd_header.ScrollToHorizontalOffset(sv.HorizontalOffset);
+            }
+
+            //if (e.HorizontalChange != 0)
+            //{
+
+
+            //    ScrollViewer sv = e.OriginalSource as ScrollViewer;
+
+            //    if (sv != null)
+            //    {
+            //        jd_header.ScrollToVerticalOffset(sv.VerticalOffset);
+            //    }
+
+            //    double offset = this.list_sealbox_jddata;
+            //    this.scrollViewer2.ScrollToVerticalOffset(offset);
+            //    jd_header.ScrollIntoView(jd_header.SelectedItem);
+            //}
+        }
     }
 }