From 0e846b372ab5d9f594a58cadf95bade76a1aba24 Mon Sep 17 00:00:00 2001
From: "liulb@mesnac.com" <haiwei@123>
Date: Sat, 13 Jan 2024 22:51:14 +0800
Subject: [PATCH] new

---
 .../Aucma.Core.Palletiz.csproj                |   3 -
 .../Aucma.Core.Palletiz.csproj.user           |   9 -
 .../ViewModels/IndexPageViewModel.cs          |  18 +-
 .../ViewModels/MainWindowViewModel.cs         |  64 +++
 .../ViewModels/SplitPlanViewModel.cs          |  16 +-
 Aucma.Core.Palletiz/Views/IndexPageView.xaml  |  13 +-
 Aucma.Core.Palletiz/Views/MainWindow.xaml     |  19 +-
 .../Views/PalletizPageView.xaml               | 447 ++++--------------
 Aucma.Core.Palletiz/Views/PlanPageView.xaml   |  89 ----
 .../Views/PlanPageView.xaml.cs                |  30 --
 .../Views/QuantityIssuedView.xaml             | 111 -----
 .../Views/QuantityIssuedView.xaml.cs          |  24 -
 .../Views/SearchCriteriaView.xaml             | 107 -----
 .../Views/SearchCriteriaView.xaml.cs          |  17 -
 Aucma.Core.Palletiz/Views/SplitPlanView.xaml  |   4 +-
 .../Views/StatisticsPageView.xaml             |  44 +-
 Aucma.Core.PrintTo/Assets/Images/Icon.png     | Bin 0 -> 1153 bytes
 .../Assets/Images/background.jpg              | Bin 0 -> 111693 bytes
 Aucma.Core.PrintTo/Aucma.Core.PrintTo.csproj  |   4 +
 .../ViewModels/MainWindowViewModel.cs         |  71 ++-
 Aucma.Core.PrintTo/Views/IndexPageView.xaml   |  42 +-
 Aucma.Core.PrintTo/Views/MainWindow.xaml      |  69 +--
 Aucma.Core.RunPlc/RunPlcService.cs            |   4 +-
 .../Views/IndexPageView.xaml                  |   4 +-
 Aucma.Core.SheetMetal/Views/MainWindow.xaml   |   1 -
 25 files changed, 333 insertions(+), 877 deletions(-)
 delete mode 100644 Aucma.Core.Palletiz/Views/PlanPageView.xaml
 delete mode 100644 Aucma.Core.Palletiz/Views/PlanPageView.xaml.cs
 delete mode 100644 Aucma.Core.Palletiz/Views/QuantityIssuedView.xaml
 delete mode 100644 Aucma.Core.Palletiz/Views/QuantityIssuedView.xaml.cs
 delete mode 100644 Aucma.Core.Palletiz/Views/SearchCriteriaView.xaml
 delete mode 100644 Aucma.Core.Palletiz/Views/SearchCriteriaView.xaml.cs
 create mode 100644 Aucma.Core.PrintTo/Assets/Images/Icon.png
 create mode 100644 Aucma.Core.PrintTo/Assets/Images/background.jpg

diff --git a/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj b/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj
index 7eee96de..9caaaa5b 100644
--- a/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj
+++ b/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj
@@ -81,9 +81,6 @@
     <Compile Update="Views\PalletizPageView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Views\SearchCriteriaView.xaml.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Update="Views\StatisticsPageView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj.user b/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj.user
index 43c13b1d..00d9b561 100644
--- a/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj.user
+++ b/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj.user
@@ -7,9 +7,6 @@
     </ApplicationDefinition>
   </ItemGroup>
   <ItemGroup>
-    <Page Update="Views\PlanPageView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
     <Page Update="Views\PalletizPageView.xaml">
       <SubType>Designer</SubType>
     </Page>
@@ -19,12 +16,6 @@
     <Page Update="Views\MainWindow.xaml">
       <SubType>Designer</SubType>
     </Page>
-    <Page Update="Views\QuantityIssuedView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Update="Views\SearchCriteriaView.xaml">
-      <SubType>Designer</SubType>
-    </Page>
     <Page Update="Views\SplitPlanView.xaml">
       <SubType>Designer</SubType>
     </Page>
diff --git a/Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs b/Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs
index 5537a641..59ca6381 100644
--- a/Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs
+++ b/Aucma.Core.Palletiz/ViewModels/IndexPageViewModel.cs
@@ -85,15 +85,16 @@ namespace Aucma.Core.Palletiz.ViewModels
         {
             ChartValues<double> achievement = new ChartValues<double>();
             Random random = new Random();
-            for (int i = 0; i < 2; i++)
-            {
-                achievement.Add(random.Next(1, 50));
-            }
+            //for (int i = 0; i < 2; i++)
+            //{
+            //    achievement.Add(random.Next(1, 50));
+            //}
 
             var column = new ColumnSeries();
             column.DataLabels = true;
             column.Title = "小时产量";
             column.Values = achievement;
+            column.ScalesYAt = 0;
             column.Foreground = Brushes.White;
 
             ModelStatistics.Add(column);
@@ -109,13 +110,14 @@ namespace Aucma.Core.Palletiz.ViewModels
 
             ChartValues<double> achievement2 = new ChartValues<double>();
             Random random2 = new Random();
-            for (int i = 0; i < 5; i++)
-            {
-                achievement2.Add(random2.Next(0, 30));
-            }
+            //for (int i = 0; i < 5; i++)
+            //{
+            //    achievement2.Add(random2.Next(0, 30));
+            //}
             var column2 = new ColumnSeries();
             column2.DataLabels = true;
             column2.Title = "型号统计";
+            column2.ScalesYAt = 0;
             column2.Values = achievement2;
             column2.Foreground = Brushes.White;
 
diff --git a/Aucma.Core.Palletiz/ViewModels/MainWindowViewModel.cs b/Aucma.Core.Palletiz/ViewModels/MainWindowViewModel.cs
index 10d4d689..fb555eb6 100644
--- a/Aucma.Core.Palletiz/ViewModels/MainWindowViewModel.cs
+++ b/Aucma.Core.Palletiz/ViewModels/MainWindowViewModel.cs
@@ -11,6 +11,10 @@ using Admin.Core.Common;
 using Aucma.Core.PLc;
 using Aucma.Core.Scanner;
 using System.Linq;
+using System.Windows.Threading;
+using System.Threading.Tasks;
+using Admin.Core.IService;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Aucma.Core.Palletiz.ViewModels
 {
@@ -20,10 +24,19 @@ namespace Aucma.Core.Palletiz.ViewModels
         private IndexPageView firstPage = new IndexPageView();//首页
         private StatisticsPageView recordPage = new StatisticsPageView();
         private PalletizPageView palletizPage = new PalletizPageView();
+
+        ISysUserInfoServices _sysUserInfoServices;
         public MainWindowViewModel()
         {
+            _sysUserInfoServices = App.ServiceProvider.GetService<ISysUserInfoServices>();
             UserContent = firstPage;
             init();
+            Task.Run(async () =>
+            {
+                await RefreshTeamTime();//班组时间
+            });
+
+          
         }
 
         public void init()
@@ -34,6 +47,11 @@ namespace Aucma.Core.Palletiz.ViewModels
             timer.AutoReset = true;
             timer.Enabled = true;
             timer.Start();
+
+            DispatcherTimer timer2 = new DispatcherTimer();
+            timer2.Interval = new TimeSpan(0, 0, 1);   //间隔1秒
+            timer2.Tick += new EventHandler(timer_Tick);
+            timer2.Start();
         }
 
         #region 设备状态刷新
@@ -368,5 +386,51 @@ namespace Aucma.Core.Palletiz.ViewModels
         }
         #endregion
 
+        #region 刷新时间
+
+        public string _currentDateTime;
+        public string CurrentDateTime
+        {
+            get => _currentDateTime;
+            set => SetProperty(ref _currentDateTime, value);
+        }
+        #endregion
+
+        #region 班组信息
+        /// <summary>
+        /// 班组信息
+        /// </summary>
+        public string _teamName;
+        public string TeamName
+        {
+            get => _teamName;
+            set => SetProperty(ref _teamName, value);
+        }
+        #endregion
+
+        public async Task RefreshTeamTime()
+        {
+            while (true)
+            {
+                var list = await _sysUserInfoServices.GetTeamData();
+                if (list != null && list.Count > 0)
+                {
+                    var sysUserInfo = list.First();
+                    TeamName = $"{sysUserInfo.TeamName}({list.Min(d => d.StartTime).ToString("HH:mm")}~{list.Max(d => d.EndTime).ToString("HH:mm")})";
+                    //TeamName = $"{sysUserInfo.TeamName}";
+                }
+                Thread.Sleep(5000);
+            }
+        }
+
+        void timer_Tick(object sender, EventArgs e)
+        {
+            System.Windows.Application.Current.Dispatcher.Invoke((Action)(() =>
+            {
+                CurrentDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+
+            }));
+
+        }
     }
 }
diff --git a/Aucma.Core.Palletiz/ViewModels/SplitPlanViewModel.cs b/Aucma.Core.Palletiz/ViewModels/SplitPlanViewModel.cs
index d4cc2f4b..da9f4b2d 100644
--- a/Aucma.Core.Palletiz/ViewModels/SplitPlanViewModel.cs
+++ b/Aucma.Core.Palletiz/ViewModels/SplitPlanViewModel.cs
@@ -273,12 +273,12 @@ namespace Aucma.Core.Palletiz.ViewModels
         [RelayCommand]
         public async Task SearchCriteriaSet()
         {
-            SearchCriteriaView searchCriteriaWindow = new SearchCriteriaView();
-            bool? dialogResult = searchCriteriaWindow.ShowDialog();
-            if (dialogResult == false) // 用户点击了“取消”按钮或关闭窗口
-            {
+            //SearchCriteriaView searchCriteriaWindow = new SearchCriteriaView();
+            //bool? dialogResult = searchCriteriaWindow.ShowDialog();
+            //if (dialogResult == false) // 用户点击了“取消”按钮或关闭窗口
+            //{
               await  LoadData();
-            }
+            //}
         }
         #endregion
 
@@ -324,9 +324,9 @@ namespace Aucma.Core.Palletiz.ViewModels
             var info = SelectedDataItem as ProductPlanInfoModel;
             if (info != null)
             {
-                info.PlanType = _radioButtonStatus;
-                QuantityIssuedView quantityIssuedWindow = new QuantityIssuedView(info, ObjId);
-                quantityIssuedWindow.ShowDialog();
+                //info.PlanType = _radioButtonStatus;
+                //QuantityIssuedView quantityIssuedWindow = new QuantityIssuedView(info, ObjId);
+                //quantityIssuedWindow.ShowDialog();
             }
 
         }
diff --git a/Aucma.Core.Palletiz/Views/IndexPageView.xaml b/Aucma.Core.Palletiz/Views/IndexPageView.xaml
index 09449a38..c8055788 100644
--- a/Aucma.Core.Palletiz/Views/IndexPageView.xaml
+++ b/Aucma.Core.Palletiz/Views/IndexPageView.xaml
@@ -159,13 +159,6 @@
                 <Border Grid.Row="1" Grid.RowSpan="2"  Grid.Column="5">
                     <TextBlock Text="255" Foreground="White" FontSize="40" FontWeight="Bold"/>
                 </Border>
-                <!--<Border Grid.Row="4"  Grid.Column="5">
-                    <WrapPanel  HorizontalAlignment="Center" VerticalAlignment="Center">
-                        <RadioButton Content="A库" Margin="5 0"/>
-                        <RadioButton Content="B库" Margin="5 0"/>
-                    </WrapPanel>
-                    
-                </Border>-->
             </Grid>
         </Border>
         <Border Grid.Row="1">
@@ -202,7 +195,7 @@
                                  <lvc:CartesianChart.AxisY>
                                     <lvc:Axis FontSize="15">
                                         <lvc:Axis.Separator>
-                                            <lvc:Separator Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3"  Stroke="#404F56" >
+                                            <lvc:Separator Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3"  Stroke="#404F56" Step="1" >
                                             </lvc:Separator>
                                         </lvc:Axis.Separator>
                                     </lvc:Axis>
@@ -225,7 +218,7 @@
                                 <lvc:CartesianChart.AxisX>
                                     <lvc:Axis Labels="{Binding MaterialNameList}" FontSize="15">
                                         <lvc:Axis.Separator>
-                                            <lvc:Separator Visibility="Hidden" StrokeThickness="1.5" StrokeDashArray="0" Stroke="#404F56" >
+                                            <lvc:Separator Visibility="Hidden" StrokeThickness="1" StrokeDashArray="0" Stroke="#404F56"  >
                                             </lvc:Separator>
                                         </lvc:Axis.Separator>
                                     </lvc:Axis>
@@ -233,7 +226,7 @@
                                 <lvc:CartesianChart.AxisY>
                                     <lvc:Axis FontSize="15">
                                         <lvc:Axis.Separator>
-                                            <lvc:Separator Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3"  Stroke="#404F56" >
+                                            <lvc:Separator Visibility="Hidden" StrokeThickness="1" StrokeDashArray="3"  Stroke="#404F56" Step="1">
                                             </lvc:Separator>
                                         </lvc:Axis.Separator>
                                     </lvc:Axis>
diff --git a/Aucma.Core.Palletiz/Views/MainWindow.xaml b/Aucma.Core.Palletiz/Views/MainWindow.xaml
index 0be308b1..e2383798 100644
--- a/Aucma.Core.Palletiz/Views/MainWindow.xaml
+++ b/Aucma.Core.Palletiz/Views/MainWindow.xaml
@@ -34,17 +34,16 @@
                     <StackPanel Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center">
                         <TextBlock Text="澳柯玛产品分垛控制系统" FontSize="45" Foreground="White" FontWeight="Bold"/>
                     </StackPanel>
-
-                    <StackPanel Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Right">
+                    <StackPanel Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0 20 0 0" >
                         <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition/>
-                                <ColumnDefinition/>
-                                <ColumnDefinition/>
-                            </Grid.ColumnDefinitions>
-                            <TextBlock Grid.Column="0" Text="白班" FontSize="25" Foreground="White" FontWeight="Bold" Margin="0,0,30,0"/>
-                            <!--<TextBlock Grid.Column="1" Text="|" FontSize="25" Foreground="White" FontWeight="Bold" Margin="0,0,30,0"/>
-                            <TextBlock Grid.Column="2" Text="SCADA" FontSize="25" Foreground="White" FontWeight="Bold" Margin="0,0,10,0"/>-->
+                            <Grid.RowDefinitions>
+                                <RowDefinition/>
+                                <RowDefinition/>
+                            </Grid.RowDefinitions>
+                            <StackPanel Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Left" >
+                                <TextBlock Grid.Column="0" Text="{Binding TeamName}" FontSize="25" Foreground="White" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Left"/>
+                                <TextBlock Grid.Column="1" Text="{Binding CurrentDateTime}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            </StackPanel>
                         </Grid>
                     </StackPanel>
                 </Grid>
diff --git a/Aucma.Core.Palletiz/Views/PalletizPageView.xaml b/Aucma.Core.Palletiz/Views/PalletizPageView.xaml
index c78d9da3..9c673f2f 100644
--- a/Aucma.Core.Palletiz/Views/PalletizPageView.xaml
+++ b/Aucma.Core.Palletiz/Views/PalletizPageView.xaml
@@ -6,366 +6,99 @@
              xmlns:local="clr-namespace:Aucma.Core.Palletiz.Views"
              mc:Ignorable="d" Background="#1152AC" 
              d:DesignHeight="1080" d:DesignWidth="1920">
-    
-    <Border x:Name="HeightHelperPanel"  BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="5">
-        <Grid>
-            <Grid.Resources>
-                <Style TargetType="TextBlock">
-                    <Setter Property="VerticalAlignment" Value="Center"/>
-                    <Setter Property="HorizontalAlignment" Value="Center"/>
-                    <Setter Property="FontSize" Value="16"/>
-                    <Setter Property="FontFamily" Value="Microsoft YaHei"/>
-                </Style>
-                <Style TargetType="Border">
-                    <Setter Property="BorderBrush" Value="#0288d1"/>
-                    <Setter Property="BorderThickness" Value="1"/>
-                </Style>
-            </Grid.Resources>
-            <Grid.RowDefinitions>
-                <RowDefinition />
-                <RowDefinition/>
-                <RowDefinition/>
-                <RowDefinition/>
-                <RowDefinition/>
-                <RowDefinition/>
-                <RowDefinition/>
-                <RowDefinition/>
-                <RowDefinition/>
-                <RowDefinition/>
-                <RowDefinition/>
-                <RowDefinition/>
-                <RowDefinition/>
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="0.1*"/>
-                <ColumnDefinition Width="0.3*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="0.3*"/>
-                <ColumnDefinition Width="0.3*"/>
-                <ColumnDefinition Width="0.3*"/>
-            </Grid.ColumnDefinitions>
-            <Border Grid.Row="0" Grid.Column="0"></Border>
-            <Border Grid.Row="1" Grid.Column="0" >
-                <TextBlock Text="1" x:Name="Set1" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="2" Grid.Column="0">
-                <TextBlock Text="2" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="3"  Grid.Column="0" >
-                <TextBlock Text="3" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="4"  Grid.Column="0" >
-                <TextBlock Text="4" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="5"  Grid.Column="0" >
-                <TextBlock Text="5" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="6"  Grid.Column="0" >
-                <TextBlock Text="6" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="7"  Grid.Column="0" >
-                <TextBlock Text="7" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="8"  Grid.Column="0" >
-                <TextBlock Text="8" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="9"  Grid.Column="0" >
-                <TextBlock Text="9" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="10"  Grid.Column="0" >
-                <TextBlock Text="10" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="11"  Grid.Column="0" >
-                <TextBlock Text="11" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="12"  Grid.Column="0" >
-                <TextBlock Text="12" Foreground="White" FontSize="20"/>
-            </Border>
-            
-            <Border Grid.Row="0"  Grid.Column="1" >
-                <TextBlock Text="物料编号" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="0"  Grid.Column="2" >
-                <TextBlock Text="物料名称" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="0"  Grid.Column="3" >
-                <TextBlock Text="转向角度" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="0"  Grid.Column="4" >
-                <TextBlock Text="是否占用多货道" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="0"  Grid.Column="5" >
-                <TextBlock Text="操作" Foreground="White" FontSize="20"/>
-            </Border>
-
-            <Border Grid.Row="1"  Grid.Column="1" >
-                <TextBlock Text="9002006859" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="1"  Grid.Column="2" >
-                <TextBlock Text="SC-439,YZXGWBC元气森林,C" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="1"  Grid.Column="3" >
-                <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                    <TextBlock Text="180" Foreground="White" FontSize="20"/>
-                    <TextBlock Text="°" Foreground="White" FontSize="20"/>
-                </WrapPanel>
-
-            </Border>
-            <Border Grid.Row="1"  Grid.Column="4" >
-                <TextBlock Text="是" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="1"  Grid.Column="5" >
-                <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                    <Button Content="添加" FontSize="20" Width="100" Height="40" Margin="3" Command="{Binding AddPlanCommand}"  CommandParameter="{Binding Text, ElementName=Set1}"/>
-                    <Button Content="清除" FontSize="20" Width="100" Height="40" Margin="3"  Command="{Binding ClearPlanCommand}"/>
-                </WrapPanel>
-            </Border>
-
-            <Border Grid.Row="2"  Grid.Column="1" >
-                <TextBlock Text="" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="2"  Grid.Column="2" >
-                <TextBlock Text="" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="2"  Grid.Column="3" >
-                <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                    <TextBlock Text="0" Foreground="White" FontSize="20"/>
-                    <TextBlock Text="°" Foreground="White" FontSize="20"/>
-                </WrapPanel>
-            </Border>
-            <Border Grid.Row="2"  Grid.Column="4" >
-                <TextBlock Text="否" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="2"  Grid.Column="5" >
-                <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                    <Button Content="添加" FontSize="20" Width="100" Height="40" Margin="3" Command="{Binding AddPlanCommand}" />
-                    <Button Content="清除" FontSize="20" Width="100" Height="40" Margin="3"  Command="{Binding ClearPlanCommand}"/>
-                </WrapPanel>
-            </Border>
-
-            <Border Grid.Row="3"  Grid.Column="1" >
-                <TextBlock Text="" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="3"  Grid.Column="2" >
-                <TextBlock Text="" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="3"  Grid.Column="3" >
-                <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                    <TextBlock Text="0" Foreground="White" FontSize="20"/>
-                    <TextBlock Text="°" Foreground="White" FontSize="20"/>
-                </WrapPanel>
-            </Border>
-            <Border Grid.Row="3"  Grid.Column="4" >
-                <TextBlock Text="否" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="3"  Grid.Column="5" >
-                <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                    <Button Content="添加" FontSize="20" Width="100" Height="40" Margin="3" Command="{Binding AddPlanCommand}" />
-                    <Button Content="清除" FontSize="20" Width="100" Height="40" Margin="3"  Command="{Binding ClearPlanCommand}"/>
-                </WrapPanel>
-            </Border>
+    <UserControl.Resources>
+        <Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="FontSize" Value="30" />
+        </Style>
 
-            <Border Grid.Row="4"  Grid.Column="1" >
-                <TextBlock Text="" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="4"  Grid.Column="2" >
-                <TextBlock Text="" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="4"  Grid.Column="3" >
-                <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                    <TextBlock Text="0" Foreground="White" FontSize="20"/>
-                    <TextBlock Text="°" Foreground="White" FontSize="20"/>
-                </WrapPanel>
-            </Border>
-            <Border Grid.Row="4"  Grid.Column="4" >
-                <TextBlock Text="否" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="4"  Grid.Column="5" >
-                <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                    <Button Content="添加" FontSize="20" Width="100" Height="40" Margin="3" Command="{Binding AddPlanCommand}" />
-                    <Button Content="清除" FontSize="20" Width="100" Height="40" Margin="3"  Command="{Binding ClearPlanCommand}"/>
-                </WrapPanel>
-            </Border>
+        <Style TargetType="DataGrid">
+            <!--网格线颜色-->
+            <Setter Property="CanUserResizeColumns" Value="false"/>
+            <Setter Property="Background" Value="#1152AC" />
+            <Setter Property="BorderBrush" Value="#4285DE" />
+            <Setter Property="Foreground" Value="White"/>
+            <Setter Property="HorizontalGridLinesBrush">
+                <Setter.Value>
+                    <SolidColorBrush Color="#4285DE"/>
+                </Setter.Value>
+            </Setter>
+            <Setter Property="VerticalGridLinesBrush">
+                <Setter.Value>
+                    <SolidColorBrush Color="#1152AC"/>
+                </Setter.Value>
+            </Setter>
+        </Style>
+        <!--列头标题栏样式-->
+        <Style TargetType="DataGridColumnHeader">
+            <Setter Property="HorizontalContentAlignment" Value="Center" />
+            <Setter Property="BorderBrush" Value="#dddddd" />
+            <Setter Property="Height" Value="40"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Background" Value="#4285DE"/>
+            <Setter Property="Foreground" Value="White"/>
+        </Style>
 
-            <Border Grid.Row="5"  Grid.Column="1" >
-                <TextBlock Text="" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="5"  Grid.Column="2" >
-                <TextBlock Text="" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="5"  Grid.Column="3" >
-                <TextBlock Text="" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="5"  Grid.Column="3" >
-                <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                    <TextBlock Text="0" Foreground="White" FontSize="20"/>
-                    <TextBlock Text="°" Foreground="White" FontSize="20"/>
-                </WrapPanel>
-            </Border>
-            <Border Grid.Row="5"  Grid.Column="4" >
-                <TextBlock Text="否" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="5"  Grid.Column="5" >
-                <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                    <Button Content="添加" FontSize="20" Width="100" Height="40" Margin="3" Command="{Binding AddPlanCommand}" />
-                    <Button Content="清除" FontSize="20" Width="100" Height="40" Margin="3"  Command="{Binding ClearPlanCommand}"/>
-                </WrapPanel>
-            </Border>
+        <!--单元格样式-->
+        <Style TargetType="DataGridCell">
+            <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="BorderBrush" Value="Gray" />
+            <Setter Property="Height" Value="40"/>
+            <Setter Property="FontSize" Value="12"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type DataGridCell}">
+                        <Grid Background="{TemplateBinding Background}" >
+                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
+                        </Grid>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+            <Style.Triggers>
+                <Trigger Property="IsSelected" Value="True">
+                    <Setter Property="Background" Value="#4285DE"/>
+                    <Setter Property="Foreground" Value="#dddddd"/>
+                </Trigger>
+            </Style.Triggers>
 
-            <Border Grid.Row="6"  Grid.Column="1" >
-                <TextBlock Text="" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="6"  Grid.Column="2" >
-                <TextBlock Text="" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="6"  Grid.Column="3" >
-                <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                    <TextBlock Text="0" Foreground="White" FontSize="20"/>
-                    <TextBlock Text="°" Foreground="White" FontSize="20"/>
-                </WrapPanel>
-            </Border>
-            <Border Grid.Row="6"  Grid.Column="4" >
-                <TextBlock Text="否" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="6"  Grid.Column="5" >
-                <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                    <Button Content="添加" FontSize="20" Width="100" Height="40" Margin="3" Command="{Binding AddPlanCommand}" />
-                    <Button Content="清除" FontSize="20" Width="100" Height="40" Margin="3"  Command="{Binding ClearPlanCommand}"/>
-                </WrapPanel>
-            </Border>
+        </Style>
 
-            <Border Grid.Row="7"  Grid.Column="1" >
-                <TextBlock Text="" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="7"  Grid.Column="2" >
-                <TextBlock Text="" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="7"  Grid.Column="3" >
-                <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                    <TextBlock Text="0" Foreground="White" FontSize="20"/>
-                    <TextBlock Text="°" Foreground="White" FontSize="20"/>
-                </WrapPanel>
-            </Border>
-            <Border Grid.Row="7"  Grid.Column="4" >
-                <TextBlock Text="否" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="7"  Grid.Column="5" >
-                <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                    <Button Content="添加" FontSize="20" Width="100" Height="40" Margin="3" Command="{Binding AddPlanCommand}" />
-                    <Button Content="清除" FontSize="20" Width="100" Height="40" Margin="3"  Command="{Binding ClearPlanCommand}"/>
-                </WrapPanel>
-            </Border>
+        <Style TargetType="{x:Type DatePickerTextBox}">
+            <Setter Property="Background" Value="#0288d1" />
+        </Style>
+    </UserControl.Resources>
 
-            <Border Grid.Row="8"  Grid.Column="1" >
-                <TextBlock Text="" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="8"  Grid.Column="2" >
-                <TextBlock Text="" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="8"  Grid.Column="3" >
-                <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                    <TextBlock Text="0" Foreground="White" FontSize="20"/>
-                    <TextBlock Text="°" Foreground="White" FontSize="20"/>
-                </WrapPanel>
-            </Border>
-            <Border Grid.Row="8"  Grid.Column="4" >
-                <TextBlock Text="否" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="8"  Grid.Column="5" >
-                <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                    <Button Content="添加" FontSize="20" Width="100" Height="40" Margin="3" Command="{Binding AddPlanCommand}" />
-                    <Button Content="清除" FontSize="20" Width="100" Height="40" Margin="3"  Command="{Binding ClearPlanCommand}"/>
-                </WrapPanel>
-            </Border>
-
-            <Border Grid.Row="9"  Grid.Column="1" >
-                <TextBlock Text="" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="9"  Grid.Column="2" >
-                <TextBlock Text="" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="9"  Grid.Column="3" >
-                <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                    <TextBlock Text="0" Foreground="White" FontSize="20"/>
-                    <TextBlock Text="°" Foreground="White" FontSize="20"/>
-                </WrapPanel>
-            </Border>
-            <Border Grid.Row="9"  Grid.Column="4" >
-                <TextBlock Text="否" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="9"  Grid.Column="5" >
-                <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                    <Button Content="添加" FontSize="20" Width="100" Height="40" Margin="3" Command="{Binding AddPlanCommand}" />
-                    <Button Content="清除" FontSize="20" Width="100" Height="40" Margin="3"  Command="{Binding ClearPlanCommand}"/>
-                </WrapPanel>
-            </Border>
-
-            <Border Grid.Row="10"  Grid.Column="1" >
-                <TextBlock Text="" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="10"  Grid.Column="2" >
-                <TextBlock Text="" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="10"  Grid.Column="3" >
-                <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                    <TextBlock Text="0" Foreground="White" FontSize="20"/>
-                    <TextBlock Text="°" Foreground="White" FontSize="20"/>
-                </WrapPanel>
-            </Border>
-            <Border Grid.Row="10"  Grid.Column="4" >
-                <TextBlock Text="否" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="10"  Grid.Column="5" >
-                <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                    <Button Content="添加" FontSize="20" Width="100" Height="40" Margin="3" Command="{Binding AddPlanCommand}" />
-                    <Button Content="清除" FontSize="20" Width="100" Height="40" Margin="3"  Command="{Binding ClearPlanCommand}"/>
-                </WrapPanel>
-            </Border>
-
-            <Border Grid.Row="11"  Grid.Column="1" >
-                <TextBlock Text="" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="11"  Grid.Column="2" >
-                <TextBlock Text="" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="11"  Grid.Column="3" >
-                <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                    <TextBlock Text="0" Foreground="White" FontSize="20"/>
-                    <TextBlock Text="°" Foreground="White" FontSize="20"/>
-                </WrapPanel>
-            </Border>
-            <Border Grid.Row="11"  Grid.Column="4" >
-                <TextBlock Text="否" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="11"  Grid.Column="5" >
-                <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                    <Button Content="添加" FontSize="20" Width="100" Height="40" Margin="3" Command="{Binding AddPlanCommand}" />
-                    <Button Content="清除" FontSize="20" Width="100" Height="40" Margin="3"  Command="{Binding ClearPlanCommand}"/>
-                </WrapPanel>
-            </Border>
-
-            <Border Grid.Row="12"  Grid.Column="1" >
-                <TextBlock Text="" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="12"  Grid.Column="2" >
-                <TextBlock Text="" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="12"  Grid.Column="3" >
-                <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                    <TextBlock Text="0" Foreground="White" FontSize="20"/>
-                    <TextBlock Text="°" Foreground="White" FontSize="20"/>
-                </WrapPanel>
-            </Border>
-            <Border Grid.Row="12"  Grid.Column="4" >
-                <TextBlock Text="否" Foreground="White" FontSize="20"/>
-            </Border>
-            <Border Grid.Row="12"  Grid.Column="5" >
-                <WrapPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                    <Button Content="添加" FontSize="20" Width="100" Height="40" Margin="3" Command="{Binding AddPlanCommand}" />
-                    <Button Content="清除" FontSize="20" Width="100" Height="40" Margin="3"  Command="{Binding ClearPlanCommand}"/>
-                </WrapPanel>
-            </Border>
-        </Grid>
-    </Border>
-   
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="0.6*"/>
+            <RowDefinition Height="9*"/>
+        </Grid.RowDefinitions>
+        <Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="0,0,0,1" CornerRadius="0"  Margin="1,1,5,5" >
+            <TextBlock Text="分垛库设置" FontSize="25" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+        </Border>
+        <Border Grid.Row="1" x:Name="HeightHelperPanel"  BorderBrush="#0288d1" BorderThickness="1" CornerRadius="5" Margin="5">
+            <StackPanel VerticalAlignment="Stretch" HorizontalAlignment="Left">
+                <Button Content="设置货道" Width="200" VerticalAlignment="Stretch" HorizontalAlignment="Left" Margin="5" FontSize="18"/>
+                <DataGrid Grid.Row="0" ItemsSource="{Binding PlanInfoDataGrid}"
+                     ColumnHeaderHeight="35"   Height="{Binding Path=ActualHeight, ElementName=ScanPanel}" 
+                    RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0" 
+                    GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Auto" 
+                    ScrollViewer.VerticalScrollBarVisibility="Auto"  BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True"
+                    Foreground="White"  >
+                    <!--修改选中字体颜色-->
+                    <DataGrid.Columns>
+                        <DataGridTextColumn Binding="{Binding No}" Header="序号" Width="0.5*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}" />
+                        <DataGridTextColumn Binding="{Binding OrderCode}" Header="SAP订单编号" Width="1*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}" />
+                        <DataGridTextColumn Binding="{Binding PlanCode}" Header="产品条码" Width="1*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                        <DataGridTextColumn Binding="{Binding MaterialName}" Header="产品型号" Width="3*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                        <DataGridTextColumn Binding="{Binding MaterialName}" Header="入库货道" Width="*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}" />
+                        <DataGridTextColumn Binding="{Binding EnterSpace}" Header="转向角度" Width="*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                    </DataGrid.Columns>
+                </DataGrid>
+            </StackPanel>
+            
+        </Border>
+    </Grid>
+    
 </UserControl>
diff --git a/Aucma.Core.Palletiz/Views/PlanPageView.xaml b/Aucma.Core.Palletiz/Views/PlanPageView.xaml
deleted file mode 100644
index 446a0016..00000000
--- a/Aucma.Core.Palletiz/Views/PlanPageView.xaml
+++ /dev/null
@@ -1,89 +0,0 @@
-<UserControl x:Class="Aucma.Core.Palletiz.Views.PlanPageView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:Aucma.Core.Palletiz.Views"
-             mc:Ignorable="d" Background="#1152AC" 
-             d:DesignHeight="1080" d:DesignWidth="1920">
-
-    <UserControl.Resources>
-        <Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
-            <!--<Setter Property="Height" Value="40"/>-->
-            <Setter Property="FontSize" Value="16"/>
-            <Setter Property="VerticalAlignment" Value="Stretch" />
-            <Setter Property="HorizontalAlignment"  Value="Left" />
-        </Style>
-
-        <Style TargetType="DataGrid">
-            <!--网格线颜色-->
-            <Setter Property="CanUserResizeColumns" Value="false"/>
-            <Setter Property="Background" Value="#1152AC" />
-            <Setter Property="BorderBrush" Value="#4285DE" />
-            <Setter Property="Foreground" Value="White"/>
-            <Setter Property="HorizontalGridLinesBrush">
-                <Setter.Value>
-                    <SolidColorBrush Color="#4285DE"/>
-                </Setter.Value>
-            </Setter>
-            <Setter Property="VerticalGridLinesBrush">
-                <Setter.Value>
-                    <SolidColorBrush Color="#1152AC"/>
-                </Setter.Value>
-            </Setter>
-        </Style>
-        <!--列头标题栏样式-->
-        <Style TargetType="DataGridColumnHeader">
-            <!--<Setter Property="HorizontalContentAlignment" Value="Center"/>
-            <Setter Property="VerticalContentAlignment" Value="Center"/>-->
-            <!--<Setter Property="Background" Value="#dddddd"/>
-            <Setter Property="Foreground" Value="Black"/>-->
-            <!--<Setter Property="BorderThickness" Value="1" />-->
-            <Setter Property="HorizontalContentAlignment" Value="Left" />
-            <Setter Property="BorderBrush" Value="#dddddd" />
-            <Setter Property="Height" Value="48"/>
-            <Setter Property="FontSize" Value="18"/>
-            <Setter Property="Background" Value="#4285DE"/>
-            <Setter Property="Foreground" Value="White"/>
-        </Style>
-
-        <!--单元格样式-->
-        <Style TargetType="DataGridCell">
-            <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="BorderBrush" Value="Gray" />
-            <Setter Property="Height" Value="40"/>
-            <Setter Property="FontSize" Value="12"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type DataGridCell}">
-                        <Grid Background="{TemplateBinding Background}" >
-                            <ContentPresenter HorizontalAlignment="Left" VerticalAlignment="Center" />
-                        </Grid>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-            <Style.Triggers>
-                <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Background" Value="#4285DE"/>
-                    <Setter Property="Foreground" Value="White"/>
-                </Trigger>
-            </Style.Triggers>
-
-        </Style>
-    </UserControl.Resources>
-
-    <Border x:Name="HeightHelperPanel"  BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="5">
-        <DataGrid x:Name="dgvMH"   Height="{Binding Path=ActualHeight, ElementName=HeightPanel}"
-        HorizontalAlignment="Left" VerticalAlignment="Top"  AlternationCount="2"      RowHeaderWidth="0"
-            ItemsSource="{Binding Datalist}"  ColumnWidth="*" AutoGenerateColumns="False" IsReadOnly="True" CanUserAddRows="False" SelectionMode="Single" 
-            SelectedItem="{Binding SelectedCells, Mode=OneWayToSource}">
-            <DataGrid.Columns>
-                <DataGridTextColumn   Width="*"           Binding="{Binding OrderCode}"             Header="编号"                    ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-                <DataGridTextColumn   Width="*"           Binding="{Binding ProductCode}"           Header="产品编码"                     ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-                <DataGridTextColumn   Width="*"           Binding="{Binding ProductName}"           Header="产品型号"                    ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-            </DataGrid.Columns>
-        </DataGrid>
-    </Border>
-   
-</UserControl>
diff --git a/Aucma.Core.Palletiz/Views/PlanPageView.xaml.cs b/Aucma.Core.Palletiz/Views/PlanPageView.xaml.cs
deleted file mode 100644
index 90ea5126..00000000
--- a/Aucma.Core.Palletiz/Views/PlanPageView.xaml.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using Aucma.Core.Palletiz.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace Aucma.Core.Palletiz.Views
-{
-    /// <summary>
-    /// PlanPageView.xaml 的交互逻辑
-    /// </summary>
-    public partial class PlanPageView : UserControl
-    {
-        public PlanPageView()
-        {
-            InitializeComponent();
-            this.DataContext = new PlanPageViewModel();
-        }
-    }
-}
diff --git a/Aucma.Core.Palletiz/Views/QuantityIssuedView.xaml b/Aucma.Core.Palletiz/Views/QuantityIssuedView.xaml
deleted file mode 100644
index 262eb554..00000000
--- a/Aucma.Core.Palletiz/Views/QuantityIssuedView.xaml
+++ /dev/null
@@ -1,111 +0,0 @@
-<Window x:Class="Aucma.Core.Palletiz.Views.QuantityIssuedView"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-        mc:Ignorable="d"    Background="#1152AC"
-        Title="库存设置"  Height="600" Width="800" Name="window"
-        ResizeMode="NoResize" Topmost="True">
-
-    <Border Margin="5" BorderBrush="#0288d1" CornerRadius="10">
-        <Border.Effect>
-            <DropShadowEffect Color="Gray" ShadowDepth="0" BlurRadius="5" Opacity="0.3" Direction="0"></DropShadowEffect>
-        </Border.Effect>
-
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="*"/>
-            </Grid.ColumnDefinitions>
-
-            <Border Grid.Column="0" BorderBrush="#0288d1" BorderThickness="3" CornerRadius="5" Background="Transparent" Margin="5,5">
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="*"/>
-                    </Grid.RowDefinitions>
-
-                    <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-                        <TextBlock Text="SN     码 " FontSize="18" Foreground="#FFFFFF"  HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                        <TextBox x:Name="planCode" FontSize="18" Text="{Binding PlanInfo.PlanCode}"  Foreground="#FFFFFF" BorderBrush="White" Width="150" IsReadOnly="True" />
-                    </StackPanel>
-                    <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-                        <TextBlock Text="产品编号" FontSize="18" Foreground="#FFFFFF" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                        <TextBox x:Name="orderCode" FontSize="18" Text="{Binding PlanInfo.OrderCode}" Foreground="#FFFFFF" BorderBrush="White" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
-                    </StackPanel>
-                    <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-                        <TextBlock Text="产品型号" FontSize="18" Foreground="#FFFFFF" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                        <TextBox x:Name="materialCode" FontSize="18" Text="{Binding PlanInfo.MaterialName}" Foreground="#FFFFFF" BorderBrush="White" Width="150" IsReadOnly="True" Margin="5,0,10,0"/>
-                    </StackPanel>
-                    <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-                        <TextBlock Text="多货道" FontSize="18" Foreground="#FFFFFF" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                        <ComboBox  Width="150" Height="30" Margin="10 0 0 0"
-                                
-                                 Style="{x:Null}"  Background="#1152AC"  VerticalAlignment="Center" FontSize="15"  Foreground="Black"
-                                 SelectedItem="{Binding SelectLocation,Mode=TwoWay}"
-                                 SelectedValuePath="SelectedModel"
-                                 DisplayMemberPath="TypeName"
-                                 SelectedValue="{Binding SelectLocation,Mode=TwoWay}">
-                                    <ComboBoxItem Content="是" IsSelected="True"/>
-                                    <ComboBoxItem Content="否" />
-                        </ComboBox>
-                    </StackPanel>
-
-                </Grid>
-            </Border>
-
-            <Border Grid.Column="1" BorderBrush="#0288d1" BorderThickness="3" CornerRadius="5" Background="Transparent" Margin="5,5">
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="2*"/>
-                        <RowDefinition Height="9*"/>
-                        <RowDefinition Height="2*"/>
-                    </Grid.RowDefinitions>
-                    <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-                        <TextBlock Text="转向角度" FontSize="18" Foreground="#FFFFFF"  Margin="10,0,0,0" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                        <TextBox x:Name="TransmitAmount" VerticalContentAlignment="Center" FontSize="18" Text="{Binding TransmitAmount}" Foreground="#FFFFFF" BorderBrush="White" Width="150" Height="40" IsReadOnly="True" Margin="5,0,10,0"/>
-                    </StackPanel>
-
-                    <Border Grid.Row="1" BorderBrush="Black" BorderThickness="0" Margin="10">
-                        <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="*"/>
-                                <RowDefinition Height="*"/>
-                                <RowDefinition Height="*"/>
-                                <RowDefinition Height="*"/>
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="*"/>
-                            </Grid.ColumnDefinitions>
-                            <Button Grid.Row="0" Grid.Column="0" Content="1" FontSize="18" Margin="2,2"  Command="{Binding KeypadButtonCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Content}" Height="70"  Width="100"/>
-                            <Button Grid.Row="0" Grid.Column="1" Content="2" FontSize="18" Margin="2,2"  Command="{Binding KeypadButtonCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Content}" Height="70"  Width="100" />
-                            <Button Grid.Row="0" Grid.Column="2" Content="3" FontSize="18" Margin="2,2"  Command="{Binding KeypadButtonCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Content}" Height="70"  Width="100" />
-                            <Button Grid.Row="1" Grid.Column="0" Content="4" FontSize="18" Margin="2,2"  Command="{Binding KeypadButtonCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Content}" Height="70"  Width="100" />
-                            <Button Grid.Row="1" Grid.Column="1" Content="5" FontSize="18" Margin="2,2"  Command="{Binding KeypadButtonCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Content}" Height="70"  Width="100" />
-                            <Button Grid.Row="1" Grid.Column="2" Content="6" FontSize="18" Margin="2,2"  Command="{Binding KeypadButtonCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Content}" Height="70"  Width="100" />
-                            <Button Grid.Row="2" Grid.Column="0" Content="7" FontSize="18" Margin="2,2"  Command="{Binding KeypadButtonCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Content}" Height="70"  Width="100" />
-                            <Button Grid.Row="2" Grid.Column="1" Content="8" FontSize="18" Margin="2,2"  Command="{Binding KeypadButtonCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Content}" Height="70"  Width="100" />
-                            <Button Grid.Row="2" Grid.Column="2" Content="9" FontSize="18" Margin="2,2"  Command="{Binding KeypadButtonCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Content}" Height="70"  Width="100" />
-                            <Button Grid.Row="3" Grid.Column="0" Content="0" FontSize="18" Margin="2,2"  Command="{Binding KeypadButtonCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Content}" Height="70"  Width="100" />
-                           
-                            <Button Grid.Row="3" Grid.Column="2" Content="清除" FontSize="18" Margin="2,2"  Background="#FF9900" Foreground="white" BorderBrush="#FF9900"  Command="{Binding ClearTransmitAmountCommand}"   Height="70"  Width="100" />
-                           
-                        </Grid>
-                    </Border>
-
-                    <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-                        <Button Content="确    定" Command="{Binding AddPlanInfoCommand}"  Height="50" Width="140"  />
-                        <Button Content="取    消"  Command="{Binding CloseWindowCommand}" CommandParameter="{Binding ElementName=window}"   Background="#FF9900"  Margin="25,0,0,0" Height="50" BorderBrush="#FF9900" Width="140" />
-                    </StackPanel>
-                </Grid>
-            </Border>
-        </Grid>
-
-    </Border>
-</Window>
diff --git a/Aucma.Core.Palletiz/Views/QuantityIssuedView.xaml.cs b/Aucma.Core.Palletiz/Views/QuantityIssuedView.xaml.cs
deleted file mode 100644
index 2ee99752..00000000
--- a/Aucma.Core.Palletiz/Views/QuantityIssuedView.xaml.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Aucma.Core.Palletiz.Models;
-using Aucma.Core.Palletiz.ViewModels;
-using System.Windows;
-
-namespace Aucma.Core.Palletiz.Views
-{
-    /// <summary>
-    /// QuantityIssuedView.xaml 的交互逻辑
-    /// </summary>
-    public partial class QuantityIssuedView : Window
-    {
-        public QuantityIssuedView()
-        {
-            InitializeComponent();
-        }
-
-        public QuantityIssuedView(ProductPlanInfoModel productPlanInfo,string objId)
-        {
-            InitializeComponent();
-            this.DataContext = new QuantityIssuedViewModel(productPlanInfo, objId);
-
-        }
-    }
-}
diff --git a/Aucma.Core.Palletiz/Views/SearchCriteriaView.xaml b/Aucma.Core.Palletiz/Views/SearchCriteriaView.xaml
deleted file mode 100644
index 77216f61..00000000
--- a/Aucma.Core.Palletiz/Views/SearchCriteriaView.xaml
+++ /dev/null
@@ -1,107 +0,0 @@
-<Window x:Class="Aucma.Core.Palletiz.Views.SearchCriteriaView"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:Aucma.Core.Palletiz.Views"
-        mc:Ignorable="d"
-        Title="搜索条件配置" Name="window" 
-        Background="#1152AC" Height="350" Width="600" WindowStartupLocation="CenterScreen"
-        d:DesignHeight="350"
-        d:DesignWidth="600"
-        ResizeMode="NoResize" Topmost="True">
-    <Window.Resources>
-        <Style x:Key="CustomTextBoxStyle" TargetType="TextBox">
-            <Setter Property="BorderThickness" Value="1" />
-            <Setter Property="BorderBrush" Value="#CCCCCC" />
-            <Setter Property="Background" Value="#F2F2F2" />
-            <Setter Property="Padding" Value="5" />
-            <Setter Property="FontSize" Value="12" />
-            <Setter Property="Foreground" Value="#333333" />
-            <Setter Property="VerticalAlignment" Value="Center" />
-            <Setter Property="HorizontalAlignment" Value="Left" />
-            <Setter Property="Margin" Value="5" />
-            <Setter Property="MinWidth" Value="120" />
-            <Setter Property="MinHeight" Value="30" />
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="TextBox">
-                        <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                            <ScrollViewer x:Name="PART_ContentHost" />
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsEnabled" Value="False">
-                                <Setter Property="Opacity" Value="0.5" />
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-    </Window.Resources>
-    <Border Margin="5" Background="#1254AB" CornerRadius="10">
-        <Border.Effect>
-            <DropShadowEffect Color="Gray" ShadowDepth="0" BlurRadius="5" Opacity="0.3" Direction="0"></DropShadowEffect>
-        </Border.Effect>
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="6*"/>
-                <RowDefinition Height="2*"/>
-            </Grid.RowDefinitions>
-            <Border Grid.Row="0" BorderBrush="#1254AB" BorderThickness="2" Margin="5">
-                <Border.Effect>
-                    <DropShadowEffect Color="#1254AB" ShadowDepth="0" BlurRadius="5" Opacity="0.5" Direction="0"></DropShadowEffect>
-                </Border.Effect>
-                <!--<ItemsControl x:Name="YourItemsControl" ItemsSource="{Binding Configurations}">
-                    <ItemsControl.ItemsPanel>
-                        <ItemsPanelTemplate>
-                            <WrapPanel Orientation="Horizontal" />
-                        </ItemsPanelTemplate>
-                    </ItemsControl.ItemsPanel>
-                    <ItemsControl.ItemTemplate>
-                        <DataTemplate>
-                            <TextBox x:Name="YourTextBoxName" Style="{StaticResource CustomTextBoxStyle}" Text="{Binding Path=.  , Mode=TwoWay ,UpdateSourceTrigger=PropertyChanged}" />
-                        </DataTemplate>
-                    </ItemsControl.ItemTemplate>
-                </ItemsControl>-->
-
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="*"/>
-                    </Grid.RowDefinitions>
-                    <StackPanel Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal">
-                        <TextBox Text="{Binding Configurations[0], Mode=TwoWay}"  FontSize="18" BorderBrush="#FFFFFF" Foreground="#FFFFFF" Height="30px" Width="100px" Margin="10,0,0,0"/>
-                        <TextBox Text="{Binding Configurations[1], Mode=TwoWay}"  FontSize="18"   BorderBrush="#FFFFFF" Foreground="#FFFFFF" Height="30px" Width="100px" Margin="10,0,0,0"/>
-                        <TextBox Text="{Binding Configurations[2], Mode=TwoWay}"  FontSize="18"   BorderBrush="#FFFFFF" Foreground="#FFFFFF" Height="30px" Width="100px" Margin="10,0,0,0"/>
-                        <TextBox Text="{Binding Configurations[3], Mode=TwoWay}"  FontSize="18"   BorderBrush="#FFFFFF" Foreground="#FFFFFF" Height="30px" Width="100px" Margin="10,0,0,0"/>
-                        <TextBox Text="{Binding Configurations[4], Mode=TwoWay}"  FontSize="18"   BorderBrush="#FFFFFF" Foreground="#FFFFFF" Height="30px" Width="100px" Margin="10,0,0,0"/>
-                    </StackPanel>
-
-                    <StackPanel Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal">
-                        <TextBox Text="{Binding Configurations[5], Mode=TwoWay}"  FontSize="18"  BorderBrush="#FFFFFF"  Foreground="#FFFFFF" Height="30px" Width="100px" Margin="10,0,0,0"/>
-                        <TextBox Text="{Binding Configurations[6], Mode=TwoWay}"  FontSize="18"  BorderBrush="#FFFFFF"  Foreground="#FFFFFF" Height="30px" Width="100px" Margin="10,0,0,0"/>
-                        <TextBox Text="{Binding Configurations[7], Mode=TwoWay}"  FontSize="18"   BorderBrush="#FFFFFF" Foreground="#FFFFFF" Height="30px" Width="100px" Margin="10,0,0,0"/>
-                        <TextBox Text="{Binding Configurations[8], Mode=TwoWay}"  FontSize="18"   BorderBrush="#FFFFFF" Foreground="#FFFFFF" Height="30px" Width="100px" Margin="10,0,0,0"/>
-                        <TextBox Text="{Binding Configurations[9], Mode=TwoWay}"  FontSize="18"   BorderBrush="#FFFFFF" Foreground="#FFFFFF" Height="30px" Width="100px" Margin="10,0,0,0"/>
-                    </StackPanel>
-                </Grid>
-
-            </Border>
-
-            <Border Grid.Row="1" BorderBrush="#1254AB" BorderThickness="2" Margin="5">
-                <Border.Effect>
-                    <DropShadowEffect Color="Gray" ShadowDepth="0" BlurRadius="5" Opacity="0.5" Direction="0"></DropShadowEffect>
-                </Border.Effect>
-                <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="10 0">
-                    <Button Content="保    存" Command="{Binding SaveSearchCriteriaCommand}" CommandParameter="{Binding ElementName=window}"   Margin="5 0" />
-                    <Button Content="取    消" Command="{Binding CloseWindowCommand}" CommandParameter="{Binding ElementName=window}"  Background="#FF9900"  BorderBrush="#FF9900" Margin="5 0" />
-                </StackPanel>
-
-            </Border>
-        </Grid>
-
-    </Border>
-</Window>
diff --git a/Aucma.Core.Palletiz/Views/SearchCriteriaView.xaml.cs b/Aucma.Core.Palletiz/Views/SearchCriteriaView.xaml.cs
deleted file mode 100644
index cb39cffc..00000000
--- a/Aucma.Core.Palletiz/Views/SearchCriteriaView.xaml.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Aucma.Core.Palletiz.ViewModels;
-using System.Windows;
-
-namespace Aucma.Core.Palletiz.Views
-{
-    /// <summary>
-    /// SearchCriteriaView.xaml 的交互逻辑
-    /// </summary>
-    public partial class SearchCriteriaView : Window
-    {
-        public SearchCriteriaView()
-        {
-            InitializeComponent();
-            this.DataContext = new SearchCriteriaViewModel();
-        }
-    }
-}
diff --git a/Aucma.Core.Palletiz/Views/SplitPlanView.xaml b/Aucma.Core.Palletiz/Views/SplitPlanView.xaml
index 71b313a9..2cc8c52c 100644
--- a/Aucma.Core.Palletiz/Views/SplitPlanView.xaml
+++ b/Aucma.Core.Palletiz/Views/SplitPlanView.xaml
@@ -6,7 +6,7 @@
         xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
         mc:Ignorable="d"
         Background="#1152AC"
-        Title="计划维护"   FontFamily="Microsoft YaHei"  Height="700" Width="900"
+        Title="货道设置"   FontFamily="Microsoft YaHei"  Height="700" Width="900"
         d:DesignHeight="800"  WindowStartupLocation="CenterScreen"
         d:DesignWidth="1500" ResizeMode="NoResize" Topmost="True" >
 
@@ -129,7 +129,7 @@
                 <RowDefinition Height="9*"/>
             </Grid.RowDefinitions>
             <Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="0,0,0,1" CornerRadius="0"  Margin="1,1,5,5" >
-                <TextBlock Text="库存设置" FontSize="25" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                <TextBlock Text="货道设置" FontSize="25" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
             </Border>
             <Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5"  Margin="1,0,5,5">
                 <Grid>
diff --git a/Aucma.Core.Palletiz/Views/StatisticsPageView.xaml b/Aucma.Core.Palletiz/Views/StatisticsPageView.xaml
index 2a1e1146..29b0de9d 100644
--- a/Aucma.Core.Palletiz/Views/StatisticsPageView.xaml
+++ b/Aucma.Core.Palletiz/Views/StatisticsPageView.xaml
@@ -12,8 +12,7 @@
 
     <UserControl.Resources>
         <cvt:MultiBindingConverter x:Key="QueryConvert"></cvt:MultiBindingConverter>
-
-            <Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
+        <Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
             <Setter Property="VerticalAlignment" Value="Center" />
         </Style>
 
@@ -36,10 +35,10 @@
             </Style>
             <!--列头标题栏样式-->
             <Style TargetType="DataGridColumnHeader">
-                <Setter Property="HorizontalContentAlignment" Value="Center" />
+                <Setter Property="HorizontalContentAlignment" Value="Left" />
                 <Setter Property="BorderBrush" Value="#dddddd" />
                 <Setter Property="Height" Value="40"/>
-                <Setter Property="FontSize" Value="100"/>
+                <Setter Property="FontSize" Value="20"/>
                 <Setter Property="Background" Value="#4285DE"/>
                 <Setter Property="Foreground" Value="White"/>
             </Style>
@@ -55,7 +54,7 @@
                     <Setter.Value>
                         <ControlTemplate TargetType="{x:Type DataGridCell}">
                             <Grid Background="{TemplateBinding Background}" >
-                                <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                <ContentPresenter HorizontalAlignment="Left" VerticalAlignment="Center" />
                             </Grid>
                         </ControlTemplate>
                     </Setter.Value>
@@ -90,35 +89,8 @@
                         <RowDefinition Height="8*"/>
                     </Grid.RowDefinitions>
                     <WrapPanel Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Center">
-                        <TextBlock Text="开始时间" Margin="10 0" Foreground="White" FontSize="18"  VerticalAlignment="Center"/>
-                        <DatePicker 
-                            x:Name="BeginTime"
-                            Width="200"  Margin="10 0"  Text="2023-10-09" BorderBrush="White"
-                            materialDesign:CalendarAssist.IsHeaderVisible="False">
-                            <DatePicker.SelectedDate>
-                                <Binding
-                                        Path="FutureValidatingDate"
-                                        UpdateSourceTrigger="PropertyChanged">
-                                    <Binding.ValidationRules>
-                                    </Binding.ValidationRules>
-                                </Binding>
-                            </DatePicker.SelectedDate>
-                        </DatePicker>
-
-                        <TextBlock Text="结束时间" Margin="10 0" Foreground="White" FontSize="18"  VerticalAlignment="Center"/>
-                        <DatePicker
-                            x:Name="EndTime"  Margin="10 0"  Text="2023-10-09"
-                            Width="200" BorderBrush="White"
-                            materialDesign:CalendarAssist.IsHeaderVisible="False">
-                            <DatePicker.SelectedDate>
-                                <Binding
-                                        Path="FutureValidatingDate"
-                                        UpdateSourceTrigger="PropertyChanged">
-                                    <Binding.ValidationRules>
-                                    </Binding.ValidationRules>
-                                </Binding>
-                            </DatePicker.SelectedDate>
-                        </DatePicker>
+                        <TextBlock Text="查询条件" Margin="10 0" Foreground="White" FontSize="18"  VerticalAlignment="Center"/>
+                        
                         <Button Margin="10 0"
                             Content="查询"  Command="{Binding ExecQueryCommand}"
                             IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
@@ -134,13 +106,13 @@
                     </WrapPanel>
                     <UniformGrid Grid.Row="1">
                         <DataGrid Grid.Row="0" ItemsSource="{Binding MaterialDataGrid}" 
-                         ColumnHeaderHeight="45"  FontSize="100" 
+                         ColumnHeaderHeight="45"  FontSize="18" 
                          RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0"  
                          GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
                          ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True"
                          Foreground="White"  >
                             <DataGrid.Columns>
-                                <DataGridTextColumn Binding="{Binding No}" Header="序号" />
+                                <DataGridTextColumn Binding="{Binding No}" Header="序号" Width="0.5*"/>
                                 <DataGridTextColumn Binding="{Binding ProductPlanCode}" Header="计划编号" Width="1*" />
                                 <DataGridTextColumn Binding="{Binding MaterialCode}" Header="物料编号" Width="1*"  />
                                 <DataGridTextColumn Binding="{Binding MaterialName}" Header="物料名称" Width="3*"  />
diff --git a/Aucma.Core.PrintTo/Assets/Images/Icon.png b/Aucma.Core.PrintTo/Assets/Images/Icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..1560465576f3ed6859851e46cbfaa7f36a29088e
GIT binary patch
literal 1153
zcmV-{1b+L8P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000C?Nkl<Zc%1E)
zZA_JA7{`B)5>OHlTZy?6%WCU`gDotWBe3;0SuzI`SI+anTAQ@!Wo}KY<3?+}Xw<U$
z5J9a(gJx@Ntg`Vk1`KkbGnN8_TyCU|&IuCGLr?$v9M03}csNHC^NYXjJkNFA_w(G>
z|Gw_)zRzQEg}Ex=$_rRsZ09eCqxPJSborN!>k|2KI*tdMYb=jk2P>z<9x5#)W7SG|
zmyr)X=l8)Ae9>NKmCJRoa*Azx_jc$y0xNEXffIpyS}IITLbuu{rXVjHu1(Y%Gnl^C
zZW$uHFA_iX(_8f=-i~@JpAe!7kZSJBf|MkvZGatH^~MalK8AuE8KS8JUf3cd3NZyl
z;`!I0y-tS6EeQl!x>$|~?~62s$=={EFzWSZ%zN?_rxO;D9a;yDfP{FsF-<Mv^e9Z7
zg|{`!2Q<rDmcWO5;pH-Q&JgS~{GbfHC~-kf{sz_c{=y?C3+}uP`ug#7_Hu0G6nAOw
zJ*QfzK{x`Eli=<ZY7u<{@aMQ+HJ=?&gD814uq;7FJy6#uLxlDXXvQY^lN+G4Pz_<I
zZhBvOi{&!QjfkiM4BxiuA|B4uC5-SsBY0O8Jh3iv@E}KzbL^?@q$k9YIVS-oz`lmS
z-7q$;i@09z8q7N;?RzWb#Ne5ov>ZCh@C6C@!wcCf18Zw`OSy}PRI4cS?uE_k<wRiY
zFDP@vvo1I@LGQLVNsTGMzor`4oCO9`ko(`05rL<7DE&pS`W`qw1WRsGb{45a1cTp^
z;cRD*c28^pp%^jy8(>YYoCq{^!iKf*_+wC64LyDEz8gPf?*9aL>c9~YX&XkOwM*HU
zsey2ez_b*2_Z2y!Vh{8W<0mw@VfQDreAS4@5ilQ^t!aYRR>HESY7oXZga+4gc-L-W
z%=WR#5nu|;s5ht9<Sa9c#?6ZZ{|BaM%@Tf80XHP8BMcMVwT+*3AdR%wTSbn5ufGpe
zdiN2D8PSt-r0Ai4k7+ZO8K-a!tXI3qhIb5~+B>W2$e8wVC_V|7Ig%X#7n6b8m+3MK
zrXIdI2)~9*#<CdHt-_pu%-{%+x;bZH>n2^I(AdJ{!8YDds@>+pXBym*{tZ1Ukd)wA
zKA#-;j^Va$K8+=y{F*pkPfaG~ytVz3RA}Qe{n$1O&YmMtTlkFJ^UzV9r0u*XssR1S
zFSRp#J~D{H-|&cSv3a4*M!9}0NcU;i#lc3K^CzHyE<H0GQ^18_z8&@O&d>rfD1$W!
z4eTO}++y2}xMTsjCALfHHZNxohRNQPkD-J(mN)OSh6!Qb1k5)3AhTsb?d7_yQ+t6X
zQLRZ>vR#CraU)~YYh7QJIcFB?d$q0JYDP#zGjPAofWz?%DGJZhtOEWo906TDcBa<o
z9hot);c#x2Ro>BKH|1nm1!}rzEdBiS^w_C7fiq>sL@D;H%CdSTAYTHSxdi?JAB`KK
ToJ%gE00000NkvXXu0mjfn6xJD

literal 0
HcmV?d00001

diff --git a/Aucma.Core.PrintTo/Assets/Images/background.jpg b/Aucma.Core.PrintTo/Assets/Images/background.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..0725af4102f62df019ba6562f89d64406c7a6426
GIT binary patch
literal 111693
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

literal 0
HcmV?d00001

diff --git a/Aucma.Core.PrintTo/Aucma.Core.PrintTo.csproj b/Aucma.Core.PrintTo/Aucma.Core.PrintTo.csproj
index 7d03e09f..1075f198 100644
--- a/Aucma.Core.PrintTo/Aucma.Core.PrintTo.csproj
+++ b/Aucma.Core.PrintTo/Aucma.Core.PrintTo.csproj
@@ -21,10 +21,12 @@
 
   <ItemGroup>
     <None Remove="appsettings.json" />
+    <None Remove="Assets\Images\background.jpg" />
     <None Remove="Assets\Images\bg.jpg" />
     <None Remove="Assets\Images\Green.png" />
     <None Remove="Assets\Images\headbg.jpg" />
     <None Remove="Assets\Images\headbg.png" />
+    <None Remove="Assets\Images\Icon.png" />
     <None Remove="Assets\Images\logo.png" />
     <None Remove="Assets\Images\Newlog.png" />
     <None Remove="Assets\Images\Red.png" />
@@ -45,9 +47,11 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Resource Include="Assets\Images\background.jpg" />
     <Resource Include="Assets\Images\bg.jpg" />
     <Resource Include="Assets\Images\headbg.jpg" />
     <Resource Include="Assets\Images\headbg.png" />
+    <Resource Include="Assets\Images\Icon.png" />
     <Resource Include="Assets\Images\Newlog.png" />
   </ItemGroup>
 
diff --git a/Aucma.Core.PrintTo/ViewModels/MainWindowViewModel.cs b/Aucma.Core.PrintTo/ViewModels/MainWindowViewModel.cs
index 1b5622ae..b1da1ea0 100644
--- a/Aucma.Core.PrintTo/ViewModels/MainWindowViewModel.cs
+++ b/Aucma.Core.PrintTo/ViewModels/MainWindowViewModel.cs
@@ -1,10 +1,16 @@
-using Aucma.Core.PrintTo.Common;
+using Admin.Core.IService;
+using Aucma.Core.PrintTo.Common;
 using Aucma.Core.PrintTo.Views;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using log4net;
+using Microsoft.Extensions.DependencyInjection;
 using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Threading;
 
 namespace Aucma.Core.PrintTo.ViewModels
 {
@@ -12,9 +18,21 @@ namespace Aucma.Core.PrintTo.ViewModels
     {
         private static readonly log4net.ILog log = LogManager.GetLogger(typeof(MainWindowViewModel));
         private IndexPageView firstPage = new IndexPageView();//首页
+        ISysUserInfoServices _sysUserInfoServices;
+
         public MainWindowViewModel()
         {
             UserContent = firstPage;
+            _sysUserInfoServices = App.ServiceProvider.GetService<ISysUserInfoServices>();
+            Task.Run(async () =>
+            {
+                await RefreshTeamTime();//班组时间
+            });
+
+            DispatcherTimer timer = new DispatcherTimer();
+            timer.Interval = new TimeSpan(0, 0, 1);   //间隔1秒
+            timer.Tick += new EventHandler(timer_Tick);
+            timer.Start();
         }
 
         #region 更换界面
@@ -140,6 +158,55 @@ namespace Aucma.Core.PrintTo.ViewModels
         }
         #endregion
 
-        
+        #region 刷新时间
+
+        public string _currentDateTime;
+        public string CurrentDateTime
+        {
+            get => _currentDateTime;
+            set => SetProperty(ref _currentDateTime, value);
+        }
+        #endregion
+
+        #region 班组信息
+        /// <summary>
+        /// 班组信息
+        /// </summary>
+        public string _teamName;
+        public string TeamName
+        {
+            get => _teamName;
+            set => SetProperty(ref _teamName, value);
+        }
+        #endregion
+
+        #region 切换班组
+        public async Task RefreshTeamTime()
+        {
+            while (true)
+            {
+                var list = await _sysUserInfoServices.GetTeamData();
+                if (list != null && list.Count > 0)
+                {
+                    var sysUserInfo = list.First();
+                    TeamName = $"{sysUserInfo.TeamName}({list.Min(d => d.StartTime).ToString("HH:mm")}~{list.Max(d => d.EndTime).ToString("HH:mm")})";
+                    //TeamName = $"{sysUserInfo.TeamName}";
+                }
+                Thread.Sleep(5000);
+            }
+        } 
+        #endregion
+
+        #region 定时刷新时间
+        void timer_Tick(object sender, EventArgs e)
+        {
+            System.Windows.Application.Current.Dispatcher.Invoke((Action)(() =>
+            {
+                CurrentDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+
+            }));
+
+        } 
+        #endregion
     }
 }
diff --git a/Aucma.Core.PrintTo/Views/IndexPageView.xaml b/Aucma.Core.PrintTo/Views/IndexPageView.xaml
index 2b033fe7..a4fd2111 100644
--- a/Aucma.Core.PrintTo/Views/IndexPageView.xaml
+++ b/Aucma.Core.PrintTo/Views/IndexPageView.xaml
@@ -178,18 +178,18 @@
                                   ItemsSource="{Binding Datalist}"  ColumnWidth="*" AutoGenerateColumns="False" IsReadOnly="True" CanUserAddRows="False" SelectionMode="Single" 
                                   SelectedItem="{Binding SelectedCells, Mode=OneWayToSource}">
                             <DataGrid.Columns>
-                                <DataGridTextColumn   Width="1.2*"           Binding="{Binding CreatedTime, StringFormat=\{0:yyy-MM-dd\}}"   Header="订单日期"       ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-                                <DataGridTextColumn   Width="1.2*"           Binding="{Binding OrderCode}"           Header="订单编号"                    ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-                                <DataGridTextColumn   Width="1.2*"           Binding="{Binding ProductCode}"         Header="产品编码"                     ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-                                <DataGridTextColumn   Width="3*"           Binding="{Binding ProductName}"           Header="产品型号"                    ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-                                <DataGridTextColumn   Width="*"            Binding="{Binding PlanAmount}"            Header="订单数量"                     ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-                                <DataGridTextColumn   Width="*"            Binding="{Binding CompleteAmount}"        Header="完成数量"                     ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-                                <DataGridTextColumn   Width="*"            Binding="{Binding LinerAmount}"           Header="内胆编码"                     ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}" />
-                                <DataGridTextColumn   Width="*"            Binding="{Binding BoxAmount}"             Header="箱体编码"                     ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-                                <DataGridTextColumn   Width="*"            Binding="{Binding LinerCodeNum}"      Header="内胆码&#x0a;已打数量"     ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-                                <DataGridTextColumn   Width="*"            Binding="{Binding BoxCodeNum}"        Header="箱体码&#x0a;已打数量"     ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-                                <DataGridTextColumn   Width="*"            Binding="{Binding ErrorNum}"              Header="异常量"                       ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-                                <DataGridTextColumn   Width="*"            Binding="{Binding PrintName}"             Header="打印名称"                          ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}" />
+                                <DataGridTextColumn   Width="1.2*"   Binding="{Binding CreatedTime, StringFormat=\{0:yyy-MM-dd\}}"   Header="订单日期"       ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                                <DataGridTextColumn   Width="1.2*"   Binding="{Binding OrderCode}"           Header="SAP订单编号"                    ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                                <DataGridTextColumn   Width="1.2*"   Binding="{Binding ProductCode}"         Header="产品编码"                     ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                                <DataGridTextColumn   Width="3*"   Binding="{Binding ProductName}"           Header="产品型号"                    ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                                <DataGridTextColumn   Width="*"    Binding="{Binding PlanAmount}"            Header="订单数量"                     ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                                <DataGridTextColumn   Width="*"    Binding="{Binding CompleteAmount}"        Header="完成数量"                     ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                                <DataGridTextColumn   Width="*"    Binding="{Binding LinerAmount}"           Header="内胆编码"                     ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}" />
+                                <DataGridTextColumn   Width="*"    Binding="{Binding BoxAmount}"             Header="箱体编码"                     ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                                <DataGridTextColumn   Width="*"    Binding="{Binding LinerCodeNum}"      Header="内胆码&#x0a;已打数量"     ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                                <DataGridTextColumn   Width="*"    Binding="{Binding BoxCodeNum}"        Header="箱体码&#x0a;已打数量"     ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                                <DataGridTextColumn   Width="*"    Binding="{Binding ErrorNum}"              Header="异常量"                       ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                                <DataGridTextColumn   Width="*"    Binding="{Binding PrintName}"             Header="打印名称"                          ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}" />
                             </DataGrid.Columns>
                         </DataGrid>
                     </UniformGrid>
@@ -198,7 +198,7 @@
         </UniformGrid>
         <UniformGrid Grid.Column="1" Margin="5">
             <Border BorderBrush="#0288d1" BorderThickness="1"  CornerRadius="5">
-                <Grid Margin="0 30">
+                <Grid Margin="0 20">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="auto"/>
                         <RowDefinition Height="auto"/>
@@ -211,28 +211,28 @@
                     </Grid.RowDefinitions>
                     
                     <WrapPanel Grid.Row="0"  HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15">
-                        <TextBlock Text="订单编码" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                        <TextBlock Text="SAP订单编号" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" />
                         <TextBox  x:Name="OrderCode" Foreground="white" BorderBrush="White" Text="{Binding SelectedItem.OrderCode, ElementName=dgvMH}"  IsReadOnly="True" Margin="15 0 0 0 "   FontSize="18"  VerticalContentAlignment="Center" HorizontalContentAlignment="Left"  Width="{Binding Path=ActualWidth, ElementName=ProductNo}"
-         materialDesign:HintAssist.Hint="订单编码"    />
+                            materialDesign:HintAssist.Hint="SAP订单编号"    />
                     </WrapPanel>
                     <WrapPanel Grid.Row="1"  HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15">
-                        <TextBlock Text="产品编码" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" />
-                        <TextBox  x:Name="ProductNo" Foreground="white" BorderBrush="White" Text="{Binding SelectedItem.ProductCode, ElementName=dgvMH}"  IsReadOnly="True" Margin="15 0 0 0 "   FontSize="18"  VerticalContentAlignment="Center" HorizontalContentAlignment="Left"  Width="350"  
-                           materialDesign:HintAssist.Hint="产品编码"    />
+                        <TextBlock Text="&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;产品编码" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                        <TextBox  x:Name="ProductNo" Foreground="white" BorderBrush="White" Text="{Binding SelectedItem.ProductCode, ElementName=dgvMH}"  IsReadOnly="True" Margin="15 0 0 0 "   FontSize="18"  VerticalContentAlignment="Center" HorizontalContentAlignment="Left"  Width="250"  
+                           materialDesign:HintAssist.Hint="产品编码"/>
                     </WrapPanel>
 
                     <WrapPanel Grid.Row="2"  HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15">
-                        <TextBlock Text="产品型号" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                        <TextBlock Text="&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;产品型号" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" />
                         <TextBox   x:Name="ProductName" Foreground="white" BorderBrush="White" Text="{Binding SelectedItem.ProductName, ElementName=dgvMH}"  IsReadOnly="True" Margin="15 0 0 0"    FontSize="18"  VerticalContentAlignment="Center" HorizontalContentAlignment="Left" Width="{Binding Path=ActualWidth, ElementName=ProductNo}"
                                    materialDesign:HintAssist.Hint="产品型号" />
                     </WrapPanel>
                     <WrapPanel Grid.Row="3"  HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15">
-                        <TextBlock Text="打印名称" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                        <TextBlock Text="&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;打印名称" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" />
                         <TextBox   x:Name="PrintName"  Foreground="white" BorderBrush="White" Text="{Binding SelectedItem.PrintName, ElementName=dgvMH}"  Margin="15 0 0 0"    FontSize="18"  VerticalContentAlignment="Center" HorizontalContentAlignment="Left" Width="{Binding Path=ActualWidth, ElementName=ProductNo}"
                     materialDesign:HintAssist.Hint="打印名称" />
                     </WrapPanel>
                     <WrapPanel Grid.Row="4"  HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15">
-                        <TextBlock Text="打印数量" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                        <TextBlock Text="&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;打印数量" FontSize="18" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" />
                         <Slider  x:Name="PlanAmount"  FontSize="18" Minimum="0" Maximum="500" BorderBrush="White" Value="{Binding SelectedItem.CompleteAmount, ElementName=dgvMH}" Foreground="White" Height="30" VerticalContentAlignment="Center" 
                                  HorizontalContentAlignment="Left"  VerticalAlignment="Center" HorizontalAlignment="Center"  Margin="15 0 0 0"  Width="{Binding Path=ActualWidth, ElementName=ProductNo}"/>
                         <!--<TextBlock Text="1~500" Width="60" Margin="10 0 0 0"  Foreground="White" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center" />-->
diff --git a/Aucma.Core.PrintTo/Views/MainWindow.xaml b/Aucma.Core.PrintTo/Views/MainWindow.xaml
index beca89ab..a3e3f450 100644
--- a/Aucma.Core.PrintTo/Views/MainWindow.xaml
+++ b/Aucma.Core.PrintTo/Views/MainWindow.xaml
@@ -4,62 +4,75 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+        Icon="/Assets/images/Icon.png"
         mc:Ignorable="d"
         Title="澳柯玛条码打印系统"
         d:DesignHeight="1920" 
         d:DesignWidth="1080"
-        Background="#1152AC" 
         FontFamily="Microsoft YaHei"
         WindowStartupLocation="CenterScreen" 
         WindowState="Maximized"    
         WindowStyle="None"
        >
-    <Border CornerRadius="5">
+    
+    <Window.Background>
+        <ImageBrush ImageSource="/Assets/images/background.jpg" />
+    </Window.Background>
+    
+    <Border Margin="5" Background="Transparent" CornerRadius="10" >
         <Border.Effect>
             <DropShadowEffect Color="Gray" ShadowDepth="0" BlurRadius="5" Opacity="0.3" Direction="0"></DropShadowEffect>
         </Border.Effect>
         <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="0.5*"/>
+                <RowDefinition Height="auto"/>
                 <RowDefinition Height="6*"/>
                 <RowDefinition Height="auto"/>
             </Grid.RowDefinitions>
+            <Border Grid.Row="0" BorderBrush="Red" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="2,2">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="7*"/>
+                        <ColumnDefinition Width="2*"/>
+                    </Grid.ColumnDefinitions>
 
-            <DockPanel Grid.Row="0"  VerticalAlignment="Top">
-                <StackPanel  Height="100">
-                    <StackPanel.Background>
-                        <ImageBrush Stretch="Fill"  ImageSource="/Assets/Images/headbg.png" />
-                    </StackPanel.Background>
-                    <StackPanel   HorizontalAlignment="Center" Margin="0 3 0 0" >
-                        <TextBlock Text="澳柯玛MES条码打印系统" Margin="0" Foreground="White" FontSize="42" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                    <StackPanel Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center">
+                        <TextBlock Text="澳柯玛MES条码打印系统" FontSize="42" Foreground="White" FontWeight="Bold"/>
                     </StackPanel>
-                    <WrapPanel  HorizontalAlignment="Right"  VerticalAlignment="Top" Margin="0 -30 20 0">
-                        <!--<TextBlock x:Name="TestTB" Text="白班" VerticalAlignment="Center" Foreground="White" FontSize="25" Margin="5 0"/>
-                        <TextBlock Text="|" VerticalAlignment="Center" Foreground="White" FontSize="15" />
-                        <TextBlock x:Name="loginUser" Text="李四" VerticalAlignment="Center" Foreground="White" FontSize="25" Margin="5 0"/>-->
-                    </WrapPanel>
-                </StackPanel>
-            </DockPanel>
 
-            <DockPanel Grid.Row="1">
-                <!--<ScrollViewer x:Name="MainScrollViewer"
-                        materialDesign:ScrollViewerAssist.IsAutoHideEnabled="True">-->
-                    <ContentControl Content="{Binding UserContent}"  Height="auto"  />
-                <!--</ScrollViewer>-->
-            </DockPanel>
+                    <StackPanel Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0 20 0 0" >
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition/>
+                                <RowDefinition/>
+                            </Grid.RowDefinitions>
+                            <StackPanel Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Left" >
+                                <TextBlock Grid.Column="0" Text="{Binding TeamName}" FontSize="25" Foreground="White" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Left"/>
+                                <TextBlock Grid.Column="1" Text="{Binding CurrentDateTime}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            </StackPanel>
+
+                        </Grid>
+                    </StackPanel>
+                </Grid>
+
+            </Border>
 
-            <DockPanel  Grid.Row="2">
-                <Border   Margin="5" BorderBrush="#0288d1" BorderThickness="1"  CornerRadius="5"  HorizontalAlignment="Stretch"  VerticalAlignment="Bottom">
+            <Border Grid.Row="1" BorderBrush="Red" BorderThickness="0" CornerRadius="5" Background="Transparent" >
+                <ContentControl Content="{Binding UserContent}"/>
+            </Border>
+
+            <DockPanel  Grid.Row="2" Margin="5 0 5 5">
+                <Border  BorderBrush="#0288d1"   BorderThickness="1" CornerRadius="5" HorizontalAlignment="Stretch"  VerticalAlignment="Bottom">
                     <Grid>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="*" />
-                        </Grid.RowDefinitions>
+
                         <StackPanel  Grid.Row="1" Height="60" Orientation="Horizontal"  Margin="5 0" HorizontalAlignment="Left">
                             <Button Content="首  页"   Margin="5 0" Height="40"/>
                             <Button Content="键  盘"  x:Name="TabTip" Height="40" Margin="5 0"  Command="{Binding FormControlCommand}"  CommandParameter="{Binding Name,ElementName=TabTip}" />
                             <Button Content="最小化"  x:Name="Minimized" Height="40" Margin="5 0"  Command="{Binding FormControlCommand}"  CommandParameter="{Binding Name,ElementName=Minimized}"   Width="100"  Background="#FF9900" BorderBrush="#FF9900" />
                             <Button Content="退  出"  x:Name="Exit" Height="40" Margin="5 0"  Command="{Binding FormControlCommand}"  CommandParameter="{Binding Name,ElementName=Exit}"  Width="100"  Background="#FF0033" BorderBrush="#FF0033" />
                         </StackPanel>
+                        
                     </Grid>
                 </Border>
             </DockPanel>
diff --git a/Aucma.Core.RunPlc/RunPlcService.cs b/Aucma.Core.RunPlc/RunPlcService.cs
index 2739a1b5..0bc6865f 100644
--- a/Aucma.Core.RunPlc/RunPlcService.cs
+++ b/Aucma.Core.RunPlc/RunPlcService.cs
@@ -87,8 +87,8 @@ namespace Aucma.Core.RunPlc
             {
                 var item = PlcHelper.melsecList.Where(c => c.Id == i).FirstOrDefault();
                 if (item == null) continue;
-                 var test= item.plc.ReadInt16("D6050");
-                if (item.plc.Read("M100").Result)
+
+                if (item.plc.Read("D6050").Result)
                 {
                     item.IsConnect = true;
                     item.plc.IsConnected = true;
diff --git a/Aucma.Core.SheetMetal/Views/IndexPageView.xaml b/Aucma.Core.SheetMetal/Views/IndexPageView.xaml
index 0f61ea80..40d1d335 100644
--- a/Aucma.Core.SheetMetal/Views/IndexPageView.xaml
+++ b/Aucma.Core.SheetMetal/Views/IndexPageView.xaml
@@ -261,7 +261,7 @@
                                 <lvc:CartesianChart.AxisX >
                                     <lvc:Axis Labels="{Binding ProductionHourList}" FontSize="18" Foreground="White" LabelsRotation="0"  DisableAnimations="True" Position="LeftBottom" >
                                         <lvc:Axis.Separator>
-                                            <lvc:Separator Visibility="Hidden" Step="1" StrokeThickness="1.5" StrokeDashArray="0" Stroke="#404F56" >
+                                            <lvc:Separator Visibility="Hidden" Step="1" StrokeThickness="1" StrokeDashArray="0" Stroke="#404F56" >
                                             </lvc:Separator>
                                         </lvc:Axis.Separator>
                                     </lvc:Axis>
@@ -377,7 +377,7 @@
                             <lvc:CartesianChart.AxisX>
                                 <lvc:Axis Labels="{Binding MaterialNameList}" FontSize="18" Foreground="White">
                                     <lvc:Axis.Separator>
-                                        <lvc:Separator  Step="1" Visibility="Hidden" StrokeThickness="1.5" StrokeDashArray="0" Stroke="#404F56" >
+                                        <lvc:Separator  Step="1" Visibility="Hidden" StrokeThickness="1" StrokeDashArray="0" Stroke="#404F56" >
                                         </lvc:Separator>
                                     </lvc:Axis.Separator>
                                 </lvc:Axis>
diff --git a/Aucma.Core.SheetMetal/Views/MainWindow.xaml b/Aucma.Core.SheetMetal/Views/MainWindow.xaml
index c43a8693..643257ce 100644
--- a/Aucma.Core.SheetMetal/Views/MainWindow.xaml
+++ b/Aucma.Core.SheetMetal/Views/MainWindow.xaml
@@ -47,7 +47,6 @@
                                 <TextBlock Grid.Column="0" Text="{Binding TeamName}" FontSize="25" Foreground="White" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Left"/>
                                 <TextBlock Grid.Column="1" Text="{Binding CurrentDateTime}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                             </StackPanel>
-                            
                         </Grid>
                     </StackPanel>
                 </Grid>