From 9fb9f5266f816cae84c88092b7fd0360972257e4 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Thu, 10 Apr 2025 13:27:00 +0800
Subject: [PATCH] =?UTF-8?q?add-=E6=89=AB=E6=8F=8F=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=8A=A0=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Khd.Core.Domain/Models/MesBaseUnitInfo.cs |   87 ++
 .../DefaultDbContext.cs                       |    4 +-
 src/Khd.Core.Wpf/Form/FormBoardT.xaml         | 1238 ++++++++---------
 src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs      |  325 ++---
 4 files changed, 783 insertions(+), 871 deletions(-)
 create mode 100644 src/Khd.Core.Domain/Models/MesBaseUnitInfo.cs

diff --git a/src/Khd.Core.Domain/Models/MesBaseUnitInfo.cs b/src/Khd.Core.Domain/Models/MesBaseUnitInfo.cs
new file mode 100644
index 0000000..e2e0ab1
--- /dev/null
+++ b/src/Khd.Core.Domain/Models/MesBaseUnitInfo.cs
@@ -0,0 +1,87 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Khd.Core.Domain.Models
+{
+    [Table("mes_base_unit_info")]
+    public class MesBaseUnitInfo
+    {
+        /// <summary>
+        /// 主键标识
+        /// </summary>
+        [Key]
+        [Column("unit_id")]
+        public long UnitId { get; set; }
+
+        /// <summary>
+        /// 供应商编号;对应FNumber
+        /// </summary>
+        [Column("unit_code")]
+        public string UnitCode { get; set; }
+
+        /// <summary>
+        /// 供应商名称;对应FName
+        /// </summary>
+        [Column("unit_name")]
+        public string UnitName { get; set; }
+
+        /// <summary>
+        /// erp的主键;对应FUnitId
+        /// </summary>
+        [Column("erp_id")]
+        public long? ErpId { get; set; }
+
+        /// <summary>
+        /// 单位状态：1-启用；0-停用
+        /// </summary>
+        [Column("unit_status")]
+        public string UnitStatus { get; set; } = "1";
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [Column("remark")]
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        [Column("create_by")]
+        public string CreateBy { get; set; }
+
+        /// <summary>
+        /// 创建时间;对应FCreateDate
+        /// </summary>
+        [Column("create_time")]
+        public DateTime? CreateTime { get; set; }
+
+        /// <summary>
+        /// 更新人
+        /// </summary>
+        [Column("update_by")]
+        public string UpdateBy { get; set; }
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        [Column("update_time")]
+        public DateTime? UpdateTime { get; set; }
+
+        /// <summary>
+        /// 审核日期;对应FAuditDate
+        /// </summary>
+        [Column("audit_date")]
+        public DateTime? AuditDate { get; set; }
+
+        /// <summary>
+        /// erp最后更新时间;对应FModifyDate
+        /// </summary>
+        [Column("erp_modify_date")]
+        public DateTime? ErpModifyDate { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Khd.Core.EntityFramework/DefaultDbContext.cs b/src/Khd.Core.EntityFramework/DefaultDbContext.cs
index 8414db6..fd1ec7a 100644
--- a/src/Khd.Core.EntityFramework/DefaultDbContext.cs
+++ b/src/Khd.Core.EntityFramework/DefaultDbContext.cs
@@ -31,7 +31,7 @@ namespace Khd.Core.EntityFramework
         public DbSet<BasePlcpoint> BasePlcpoint { get; set; }
 
         public DbSet<BasePlc> BasePlc { get; set; }
-        
+
         public DbSet<MesBasePalletInfo> MesBasePalletInfo { get; set; }
 
         public DbSet<MesSaleOrderRelate> MesSaleOrderRelate { get; set; }
@@ -95,5 +95,7 @@ namespace Khd.Core.EntityFramework
         public DbSet<DmsRecordAlarmInfo> DmsRecordAlarmInfo { get; set; }
 
         public DbSet<DmsRecordAlarmTime> DmsRecordAlarmTime { get; set; }
+
+        public DbSet<MesBaseUnitInfo> MesBaseUnitInfo { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
index 59b145d..a43a03a 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
@@ -5,7 +5,7 @@
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
             xmlns:local="clr-namespace:Khd.Core.Wpf.myConverter"
             xmlns:pg="clr-namespace:Khd.Core.Wpf.CSS"
-            mc:Ignorable="d"  
+            mc:Ignorable="d"
             WindowStyle="None"
             Closing="Window_Closing"
             WindowStartupLocation="CenterOwner"
@@ -14,26 +14,21 @@
             Title="FormBoardT"
             Loaded="FormBoard_Loaded"
             Width="1920"
-            Height="1080"
-        >
+            Height="1080">
     <Window.Resources>
 
-
-
         <ResourceDictionary>
 
-
             <ResourceDictionary.MergedDictionaries>
-                <!--<hc:ThemeResources/>
-                 <hc:Theme/>-->
+                <!--<hc:ThemeResources />
+                 <hc:Theme />-->
                 <ResourceDictionary Source="/CSS/SearchBtnClass.xaml" />
                 <ResourceDictionary Source="/CSS/SearchTextClass.xaml" />
                 <ResourceDictionary Source="/CSS/DataGridClass.xaml" />
             </ResourceDictionary.MergedDictionaries>
-            <local:TypeDataConverter x:Key="taskTypeConverter"/>
-            <local:EquipConverter x:Key="EquipConverter"/>
-            <local:AgvTaskStatusConverter x:Key="AgvTaskStatusConverter"/>
-
+            <local:TypeDataConverter x:Key="taskTypeConverter" />
+            <local:EquipConverter x:Key="EquipConverter" />
+            <local:AgvTaskStatusConverter x:Key="AgvTaskStatusConverter" />
 
             <Style  TargetType="{x:Type ComboBox}">
                 <Setter Property="Width" Value="120"></Setter>
@@ -46,24 +41,23 @@
                                     <ToggleButton ClickMode="Press" Focusable="False" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="2" MinWidth="0" MinHeight="0" Width="Auto">
                                         <ToggleButton.Style>
                                             <Style TargetType="{x:Type ToggleButton}">
-                                                <Setter Property="MinWidth" Value="0"/>
-                                                <Setter Property="MinHeight" Value="0"/>
-                                                <Setter Property="Width" Value="Auto"/>
-                                                <Setter Property="Height" Value="Auto"/>
-                                                <Setter Property="Background" Value="White"/>
-                                                <Setter Property="BorderBrush" Value="#00000000"/>
-                                                <Setter Property="BorderThickness" Value="2"/>
+                                                <Setter Property="MinWidth" Value="0" />
+                                                <Setter Property="MinHeight" Value="0" />
+                                                <Setter Property="Width" Value="Auto" />
+                                                <Setter Property="Height" Value="Auto" />
+                                                <Setter Property="Background" Value="White" />
+                                                <Setter Property="BorderBrush" Value="#00000000" />
+                                                <Setter Property="BorderThickness" Value="2" />
                                                 <Setter Property="Template">
                                                     <Setter.Value>
                                                         <ControlTemplate TargetType="{x:Type ToggleButton}">
                                                             <DockPanel Background="{TemplateBinding Background}" LastChildFill="False" SnapsToDevicePixels="True">
-                                                                <Border x:Name="Border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"  DockPanel.Dock="Right" >
-                                                                    <Path Data="M0,0L3.5,4 7,0z" Fill="{TemplateBinding Foreground}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                                                <Border x:Name="Border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"  DockPanel.Dock="Right">
+                                                                    <Path Data="M0,0L3.5,4 7,0z" Fill="{TemplateBinding Foreground}" HorizontalAlignment="Center" VerticalAlignment="Center" />
                                                                 </Border>
                                                             </DockPanel>
                                                             <ControlTemplate.Triggers>
                                                                 <Trigger Property="IsChecked" Value="True">
-
                                                                 </Trigger>
                                                             </ControlTemplate.Triggers>
                                                         </ControlTemplate>
@@ -71,14 +65,14 @@
                                                 </Setter>
                                                 <Style.Triggers>
                                                     <Trigger Property="IsEnabled" Value="False">
-                                                        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"/>
+                                                        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" />
                                                     </Trigger>
                                                 </Style.Triggers>
                                             </Style>
                                         </ToggleButton.Style>
                                     </ToggleButton>
                                     <!--项内容-->
-                                    <ContentPresenter  IsHitTestVisible="False" Content="{TemplateBinding SelectionBoxItem}" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" VerticalAlignment="Center" Margin="3"  />
+                                    <ContentPresenter  IsHitTestVisible="False" Content="{TemplateBinding SelectionBoxItem}" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" VerticalAlignment="Center" Margin="3" />
                                     <!--下拉显示面板HorizontalOffset:设置下拉面板的相对位置-->
                                     <Popup HorizontalOffset="-1" Width="{TemplateBinding ActualWidth}"
                                         IsOpen="{TemplateBinding IsDropDownOpen}" Focusable="False"    PopupAnimation="Slide">
@@ -88,8 +82,8 @@
                                                     <SolidColorBrush Color="White" />
                                                 </Border.Background>
                                             </Border>
-                                            <ScrollViewer  SnapsToDevicePixels="True"  HorizontalScrollBarVisibility="Hidden" >
-                                                <StackPanel IsItemsHost="True"/>
+                                            <ScrollViewer  SnapsToDevicePixels="True"  HorizontalScrollBarVisibility="Hidden">
+                                                <StackPanel IsItemsHost="True" />
                                             </ScrollViewer>
                                         </Grid>
                                     </Popup>
@@ -109,24 +103,24 @@
                 </Setter>
             </Style>
             <Style TargetType="TabItem" x:Key="DefaultItem">
-                <Setter Property="Background" Value="#213269"/>
-                <Setter Property="Foreground" Value="White"/>
-                <Setter Property="BorderBrush" Value="#213269"/>
+                <Setter Property="Background" Value="#213269" />
+                <Setter Property="Foreground" Value="White" />
+                <Setter Property="BorderBrush" Value="#213269" />
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="TabItem">
-                            <Border x:Name="Border" 
+                            <Border x:Name="Border"
                                     Background="{TemplateBinding Background}"
-                                    BorderBrush="{TemplateBinding BorderBrush}" 
+                                    BorderBrush="{TemplateBinding BorderBrush}"
                                     BorderThickness="1">
                                 <ContentPresenter x:Name="ContentSite"
                                                 ContentSource="Header"
                                                 HorizontalAlignment="Center"
-                                                VerticalAlignment="Center"/>
+                                                VerticalAlignment="Center" />
                             </Border>
                             <ControlTemplate.Triggers>
                                 <Trigger Property="IsSelected" Value="True">
-                                    <Setter TargetName="Border" Property="Background" Value="#172557"/>
+                                    <Setter TargetName="Border" Property="Background" Value="#172557" />
                                 </Trigger>
                             </ControlTemplate.Triggers>
                         </ControlTemplate>
@@ -175,14 +169,14 @@
                 </Setter>
             </Style>
             <Style x:Key="MenuItemStype" TargetType="MenuItem">
-                <Setter Property="Width" Value="150"/>
-                <Setter Property="Header" Value="75"/>
-                <Setter Property="FontSize" Value="16"/>
-                <Setter Property="HorizontalContentAlignment" Value="Center"/>
-                <Setter Property="VerticalContentAlignment" Value="Center"/>
+                <Setter Property="Width" Value="150" />
+                <Setter Property="Header" Value="75" />
+                <Setter Property="FontSize" Value="16" />
+                <Setter Property="HorizontalContentAlignment" Value="Center" />
+                <Setter Property="VerticalContentAlignment" Value="Center" />
             </Style>
             <!--  TextBox默认样式  -->
-            <Style x:Key="DefaultTextBox" TargetType="{x:Type TextBox}"  />
+            <Style x:Key="DefaultTextBox" TargetType="{x:Type TextBox}" />
             <Style x:Key="dgCell" TargetType="TextBlock" BasedOn="{x:Null}">
                 <Setter Property="TextAlignment" Value="Center" />
                 <Setter Property="HorizontalAlignment" Value="Center" />
@@ -193,7 +187,7 @@
                 <Setter Property="FontFamily" Value="Microsoft YaHei" />
                 <Setter Property="FontSize" Value="20" />
 
-                <!--<Setter Property="FontWeight" Value="Bold"/>-->
+                <!--<Setter Property="FontWeight" Value="Bold" />-->
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="Button">
@@ -222,7 +216,7 @@
                 <Setter Property="FontFamily" Value="Microsoft YaHei" />
                 <Setter Property="FontSize" Value="20" />
 
-                <!--<Setter Property="FontWeight" Value="Bold"/>-->
+                <!--<Setter Property="FontWeight" Value="Bold" />-->
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="Button">
@@ -251,7 +245,7 @@
                 <Setter Property="FontFamily" Value="Microsoft YaHei" />
                 <Setter Property="FontSize" Value="20" />
 
-                <!--<Setter Property="FontWeight" Value="Bold"/>-->
+                <!--<Setter Property="FontWeight" Value="Bold" />-->
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="Button">
@@ -277,7 +271,7 @@
             </Style>
             <!-- 周义帆 20231008 一下代码添加-->
             <!--  清空按钮样式  -->
-            <Style  x:Key="qingkongButton" TargetType ="{x:Type Button}" >
+            <Style  x:Key="qingkongButton" TargetType ="{x:Type Button}">
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="{x:Type Button}">
@@ -292,7 +286,7 @@
                 <Setter Property="FontSize" Value="14"></Setter>
             </Style>
             <!--  警告按钮样式  -->
-            <Style  x:Key="jinggaoButton" TargetType ="{x:Type Button}" >
+            <Style  x:Key="jinggaoButton" TargetType ="{x:Type Button}">
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="{x:Type Button}">
@@ -335,7 +329,7 @@
                 </Setter>
             </Style>
             <!--  查询按钮样式  -->
-            <Style  x:Key="chaxunButton" TargetType ="{x:Type Button}" >
+            <Style  x:Key="chaxunButton" TargetType ="{x:Type Button}">
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="{x:Type Button}">
@@ -350,7 +344,7 @@
                 <Setter Property="FontSize" Value="14"></Setter>
             </Style>
             <!--  修改按钮样式  -->
-            <Style  x:Key="xiugaiButton" TargetType ="{x:Type Button}" >
+            <Style  x:Key="xiugaiButton" TargetType ="{x:Type Button}">
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="{x:Type Button}">
@@ -365,7 +359,7 @@
                 <Setter Property="FontSize" Value="14"></Setter>
             </Style>
             <!--  订单清空备份按钮样式  -->
-            <Style  x:Key="ClearOrderButton" TargetType ="{x:Type Button}" >
+            <Style  x:Key="ClearOrderButton" TargetType ="{x:Type Button}">
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="{x:Type Button}">
@@ -380,21 +374,19 @@
                 <Setter Property="FontSize" Value="14"></Setter>
             </Style>
 
-
             <DataTemplate x:Key="LocationTemplate">
                 <Button Content="{Binding}" Click="LocationButton_Click" Height="50" Margin="0 0 2 2">
                     <Button.Style>
                         <Style TargetType="Button">
                             <!--有库存绿色#75F76D，无库存但是有空料箱#D78E28，无库存无料箱#4789AE，库位禁用有个小红点-->
-                            <Setter Property="Background" Value="#75F76D"/>
+                            <Setter Property="Background" Value="#75F76D" />
                             <Style.Triggers>
                                 <DataTrigger Binding="{Binding Status}" Value="OutOfStock">
-                                    <Setter Property="Background" Value="#4789AE"/>
+                                    <Setter Property="Background" Value="#4789AE" />
                                 </DataTrigger>
                                 <DataTrigger Binding="{Binding Status}" Value="EmptyInStock">
-                                    <Setter Property="Background" Value="#D78E28"/>
+                                    <Setter Property="Background" Value="#D78E28" />
                                 </DataTrigger>
-
                             </Style.Triggers>
                         </Style>
                     </Button.Style>
@@ -402,13 +394,13 @@
                         <DataTemplate>
                             <Grid>
                                 <!-- 主内容 -->
-                                <TextBlock Text="{Binding Code}" 
+                                <TextBlock Text="{Binding Code}"
                                VerticalAlignment="Center"
                                HorizontalAlignment="Center"
                                FontSize="20"
                                RenderTransformOrigin="0.5, 0.5">
                                     <TextBlock.RenderTransform>
-                                        <RotateTransform Angle="90"/>
+                                        <RotateTransform Angle="90" />
                                     </TextBlock.RenderTransform>
                                 </TextBlock>
 
@@ -417,42 +409,41 @@
                              VerticalAlignment="Top"
                              HorizontalAlignment="Right"
                              Margin="0,0,0,0"
-                             Fill="Red" Visibility="{Binding isFreeze}"/>
+                             Fill="Red" Visibility="{Binding isFreeze}" />
                             </Grid>
                         </DataTemplate>
                     </Button.ContentTemplate>
                 </Button>
             </DataTemplate>
-
         </ResourceDictionary>
     </Window.Resources>
 
     <Window.ContextMenu>
         <ContextMenu>
-            <MenuItem Header="退出" Click="WindowClose_Click" Style="{StaticResource MenuItemStype}"/>
+            <MenuItem Header="退出" Click="WindowClose_Click" Style="{StaticResource MenuItemStype}" />
         </ContextMenu>
     </Window.ContextMenu>
 
     <Grid Background="#172557">
         <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="0.8*"/>
-                <RowDefinition Height="0.1*"/>
-                <RowDefinition Height="7*"/>
-                <RowDefinition Height="0.2*"/>
+                <RowDefinition Height="0.8*" />
+                <RowDefinition Height="0.1*" />
+                <RowDefinition Height="7*" />
+                <RowDefinition Height="0.2*" />
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="0.1*"/>
-                <ColumnDefinition Width="9*"/>
-                <ColumnDefinition Width="0.1*"/>
+                <ColumnDefinition Width="0.1*" />
+                <ColumnDefinition Width="9*" />
+                <ColumnDefinition Width="0.1*" />
             </Grid.ColumnDefinitions>
             <Grid Grid.Row="2" Grid.Column="1">
-                <Viewbox Stretch=" fill"  >
-                    <Canvas Width="1880" Height="1080" >
+                <Viewbox Stretch=" fill">
+                    <Canvas Width="1880" Height="1080">
                         <Grid   Width="1880" Height="1080">
                             <TabControl x:Name="TabControl" Background="Transparent" BorderThickness="0" HorizontalAlignment="Center" VerticalContentAlignment="Center" SelectionChanged="TabControl_SelectionChanged"  TabStripPlacement="Left"  Width="1890" Margin="-10,0,0,0">
                                 <TabItem Visibility="Collapsed" x:Name="FirstItem"></TabItem>
-                                <TabItem  x:Name="TaskManager" Header="任务管理" Style="{StaticResource DefaultItem}" Background="#213269"  Foreground="White"   FontSize="25"   Width="160" Height="80" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="5" >
+                                <TabItem  x:Name="TaskManager" Header="任务管理" Style="{StaticResource DefaultItem}" Background="#213269"  Foreground="White"   FontSize="25"   Width="160" Height="80" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="5">
                                     <StackPanel
                                                 x:Name="essentialData"
                                                 Orientation="Vertical"
@@ -463,30 +454,28 @@
                                 Width="125"
                                 VerticalAlignment="Center"
                                 Text="设备编号 :"
-                                FontSize="25" 
-                                             Foreground="White"
-                              />
+                                FontSize="25"
+                                             Foreground="White" />
                                             <Border
                                                         ></Border>
-                                            <TextBox x:Name="lba_ThrifTtitle1" Margin="5"  Style="{StaticResource XingHaoBianMaYangShi}" IsEnabled="true" 
+                                            <TextBox x:Name="lba_ThrifTtitle1" Margin="5"  Style="{StaticResource XingHaoBianMaYangShi}" IsEnabled="true"
                                   Width="180" Height="50" ></TextBox>
                                             <TextBlock
                                 Width="125"
                                 Text="容器号 :"
                                                 Margin="5"
                                                  VerticalAlignment="Center"
-                                FontSize="25" 
-                                             Foreground="White"
-                              />
+                                FontSize="25"
+                                             Foreground="White" />
                                             <Border
                                                         ></Border>
                                             <TextBox x:Name="lba_ThrifTtitle2"   Style="{StaticResource XingHaoBianMaYangShi}" IsEnabled="true"
                                   Width="180" Height="50" Margin="5" ></TextBox>
-                                            <TextBlock Text="设备:" VerticalAlignment="Center"/>
-                                            <ComboBox x:Name="EquipListSelectDy" DisplayMemberPath="equipName" Width="200" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"/>
+                                            <TextBlock Text="设备:" VerticalAlignment="Center" />
+                                            <ComboBox x:Name="EquipListSelectDy" DisplayMemberPath="equipName" Width="200" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" />
                                             <Button Content="搜索"  Foreground="White" Height="50" Margin="5" FontSize="25"  Width="132" Click="btnGetTask_Click">
-                                                <Button.Template >
-                                                    <ControlTemplate TargetType="{x:Type Button}" >
+                                                <Button.Template>
+                                                    <ControlTemplate TargetType="{x:Type Button}">
                                                         <Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="4,4,4,4">
                                                             <Border.Background>#346DFF</Border.Background>
                                                             <ContentPresenter Content="{TemplateBinding ContentControl.Content}" HorizontalAlignment="Center" VerticalAlignment="Center" ></ContentPresenter>
@@ -495,8 +484,8 @@
                                                 </Button.Template>
                                             </Button>
                                             <Button Content="创建任务" FontSize="25" Margin="5" Foreground="White" Height="50"  Width="132" Click="AddTaskButton_Click">
-                                                <Button.Template >
-                                                    <ControlTemplate TargetType="{x:Type Button}" >
+                                                <Button.Template>
+                                                    <ControlTemplate TargetType="{x:Type Button}">
                                                         <Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="4,4,4,4">
                                                             <Border.Background>#346DFF</Border.Background>
                                                             <ContentPresenter Content="{TemplateBinding ContentControl.Content}" HorizontalAlignment="Center" VerticalAlignment="Center" ></ContentPresenter>
@@ -505,8 +494,8 @@
                                                 </Button.Template>
                                             </Button>
                                             <Button Content="删除任务" FontSize="25" Foreground="White" Height="50"  Width="132" Click="btnDelTask_Click">
-                                                <Button.Template >
-                                                    <ControlTemplate TargetType="{x:Type Button}" >
+                                                <Button.Template>
+                                                    <ControlTemplate TargetType="{x:Type Button}">
                                                         <Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="4,4,4,4">
                                                             <Border.Background>#346DFF</Border.Background>
                                                             <ContentPresenter Content="{TemplateBinding ContentControl.Content}" HorizontalAlignment="Center" VerticalAlignment="Center" ></ContentPresenter>
@@ -515,8 +504,8 @@
                                                 </Button.Template>
                                             </Button>
                                             <Button Content="开始任务" Margin="5" FontSize="25" Foreground="White" Height="50"  Width="132" Click="btnEditTask_Click">
-                                                <Button.Template >
-                                                    <ControlTemplate TargetType="{x:Type Button}" >
+                                                <Button.Template>
+                                                    <ControlTemplate TargetType="{x:Type Button}">
                                                         <Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="4,4,4,4">
                                                             <Border.Background>#346DFF</Border.Background>
                                                             <ContentPresenter Content="{TemplateBinding ContentControl.Content}" HorizontalAlignment="Center" VerticalAlignment="Center" ></ContentPresenter>
@@ -526,8 +515,8 @@
                                             </Button>
 
                                             <Button Content="任务历史" FontSize="25" Foreground="White" Margin="60 0 0 0 " Height="50"  Width="132" Click="btnTaskHistory_Click">
-                                                <Button.Template >
-                                                    <ControlTemplate TargetType="{x:Type Button}" >
+                                                <Button.Template>
+                                                    <ControlTemplate TargetType="{x:Type Button}">
                                                         <Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="4,4,4,4">
                                                             <Border.Background>YellowGreen</Border.Background>
                                                             <ContentPresenter Content="{TemplateBinding ContentControl.Content}" HorizontalAlignment="Center" VerticalAlignment="Center" ></ContentPresenter>
@@ -536,8 +525,8 @@
                                                 </Button.Template>
                                             </Button>
                                             <!--<Button Content="手动完成" Margin="800,-8,0,-100" Foreground="White" Height="50"  Width="132" Click="btnFinishTask_Click">
-                                            <Button.Template >
-                                                <ControlTemplate TargetType="{x:Type Button}" >
+                                            <Button.Template>
+                                                <ControlTemplate TargetType="{x:Type Button}">
                                                     <Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="4,4,4,4">
                                                         <Border.Background>#346DFF</Border.Background>
                                                         <ContentPresenter Content="{TemplateBinding ContentControl.Content}" HorizontalAlignment="Center" VerticalAlignment="Center" ></ContentPresenter>
@@ -550,13 +539,13 @@
                                         <!--  订单信息  -->
                                         <Grid  Width="1711" Margin="0,10,0,0" HorizontalAlignment="Left">
                                             <Grid.RowDefinitions>
-                                                <RowDefinition Height="10*"/>
-                                                <RowDefinition Height="2*"/>
-                                                <RowDefinition Height="88*"/>
+                                                <RowDefinition Height="10*" />
+                                                <RowDefinition Height="2*" />
+                                                <RowDefinition Height="88*" />
                                             </Grid.RowDefinitions>
                                             <Grid Background="#172557" Grid.Row="1" ></Grid>
                                             <Grid Grid.Row="2">
-                                                <DataGrid 
+                                                <DataGrid
                                                             x:Name="LoadMaterial0"
                                                     Height="1000"
                             AlternationCount="2"
@@ -577,9 +566,8 @@
                                                             <DataGridTemplateColumn.CellTemplate>
                                                                 <DataTemplate>
                                                                     <Grid>
-                                                                        <CheckBox x:Name="SelectBox" Click="CheckBox_Click" 
-                                                                                  Style="{StaticResource CheckBoxStyle}"
-                                                                          />
+                                                                        <CheckBox x:Name="SelectBox" Click="CheckBox_Click"
+                                                                                  Style="{StaticResource CheckBoxStyle}" />
                                                                     </Grid>
                                                                 </DataTemplate>
                                                             </DataGridTemplateColumn.CellTemplate>
@@ -618,7 +606,7 @@
                                     ElementStyle="{StaticResource dgCell}"
                                     FontSize="20"
                                     Header="设备编号"
-                                    IsReadOnly="True" Visibility="Hidden"/>
+                                    IsReadOnly="True" Visibility="Hidden" />
 
                                                         <DataGridTextColumn
                                     Width="300*"
@@ -638,7 +626,7 @@
                                     IsReadOnly="True" />
                                                         <DataGridTextColumn
                                     Width="300*"
-                                    Binding="{Binding ., Converter={StaticResource AgvTaskStatusConverter}}"            
+                                    Binding="{Binding ., Converter={StaticResource AgvTaskStatusConverter}}"
                                      CanUserSort="False"
                                     ElementStyle="{StaticResource dgCell}"
                                     FontSize="20"
@@ -651,7 +639,7 @@
                                     ElementStyle="{StaticResource dgCell}"
                                     FontSize="20"
                                     Header="数量"
-                                    IsReadOnly="True" Visibility="Hidden"/>
+                                    IsReadOnly="True" Visibility="Hidden" />
                                                         <DataGridTextColumn
                                     Width="300*"
                                     Binding="{Binding currPointNo,Converter={StaticResource EquipConverter}}"
@@ -659,7 +647,7 @@
                                     ElementStyle="{StaticResource dgCell}"
                                     FontSize="20"
                                     Header="起始站点"
-                                    IsReadOnly="True"/>
+                                    IsReadOnly="True" />
                                                         <DataGridTextColumn
                                     Width="300*"
                                     Binding="{Binding endPointNo,Converter={StaticResource EquipConverter}}"
@@ -702,7 +690,7 @@
                                                             <DataGridTemplateColumn.CellTemplate>
                                                                 <DataTemplate>
                                                                     <StackPanel Orientation="Horizontal">
-                                                                        <Button Content="任务完成" Visibility="{Binding isShow}" Style="{StaticResource ButtonPrimary}" FontSize="25" Width="100" Height="75" Click="taskCompeleted_Click"/>
+                                                                        <Button Content="任务完成" Visibility="{Binding isShow}" Style="{StaticResource ButtonPrimary}" FontSize="25" Width="100" Height="75" Click="taskCompeleted_Click" />
                                                                     </StackPanel>
                                                                 </DataTemplate>
                                                             </DataGridTemplateColumn.CellTemplate>
@@ -715,7 +703,6 @@
                                                             <Setter Property="Height" Value="50" />
                                                             <Setter Property="HorizontalContentAlignment" Value="Center" />
                                                         </Style>
-
                                                     </DataGrid.CellStyle>
                                                     <DataGrid.RowStyle>
                                                         <Style TargetType="{x:Type DataGridRow}">
@@ -752,14 +739,14 @@
                                 <!--<TabItem  Header="入库确认" Foreground="White" FontSize="25" Width="160" Height="100" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="5">
                                     <Grid>
                                         <Grid.RowDefinitions>
-                                            <RowDefinition Height="auto"/>
-                                            <RowDefinition Height="*"/>
+                                            <RowDefinition Height="auto" />
+                                            <RowDefinition Height="*" />
                                         </Grid.RowDefinitions>
-                                        <StackPanel Orientation="Horizontal" >
-                                            <Button Content="搜素" Background="#346DFF" Foreground="White" Height="50" Width="150" Margin="10" Click="InSearchButton_Click"/>
-                                            <Button Content="确认入库" Background="#346DFF" Foreground="White" Height="50" Width="150" Margin="10" Click="ConfirmTaskButton_Click"/>
+                                        <StackPanel Orientation="Horizontal">
+                                            <Button Content="搜素" Background="#346DFF" Foreground="White" Height="50" Width="150" Margin="10" Click="InSearchButton_Click" />
+                                            <Button Content="确认入库" Background="#346DFF" Foreground="White" Height="50" Width="150" Margin="10" Click="ConfirmTaskButton_Click" />
                                         </StackPanel>
-                                        <DataGrid 
+                                        <DataGrid
                                                 Grid.Row="1"
                                                 x:Name="WcsTaskLogDataGrid"
                                                 AlternationCount="2"
@@ -774,15 +761,14 @@
                                                 IsReadOnly="True"
                                                 LoadingRow="dgData_LoadingRow"
                                                 RowHeaderWidth="0"
-                                                SelectionMode="Single" FontSize="16" HorizontalAlignment="Left" 
-                                              >
+                                                SelectionMode="Single" FontSize="16" HorizontalAlignment="Left">
                                             <DataGrid.Columns>
                                                 <DataGridTemplateColumn Width="130*" Header="选择">
                                                     <DataGridTemplateColumn.CellTemplate>
                                                         <DataTemplate>
                                                             <Grid>
-                                                                <CheckBox x:Name="InSelectBox" Click="InCheckBox_Click" 
-                                                                Style="{StaticResource CheckBoxStyle}"  />
+                                                                <CheckBox x:Name="InSelectBox" Click="InCheckBox_Click"
+                                                                Style="{StaticResource CheckBoxStyle}" />
                                                             </Grid>
                                                         </DataTemplate>
                                                     </DataGridTemplateColumn.CellTemplate>
@@ -800,7 +786,7 @@
                                                             VerticalAlignment="Center"
                                                             Focusable="False"
                                                             FontSize="20"
-                                                            Text="{Binding Header, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}, Mode=FindAncestor}}" />    
+                                                            Text="{Binding Header, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}, Mode=FindAncestor}}" />
                                                         </DataTemplate>
                                                     </DataGridTemplateColumn.CellTemplate>
                                                 </DataGridTemplateColumn>
@@ -836,7 +822,6 @@
                                                     <Setter Property="Height" Value="50" />
                                                     <Setter Property="HorizontalContentAlignment" Value="Center" />
                                                 </Style>
-
                                             </DataGrid.CellStyle>
                                             <DataGrid.RowStyle>
                                                 <Style TargetType="{x:Type DataGridRow}">
@@ -868,7 +853,7 @@
                                         </DataGrid>
                                     </Grid>
                                 </TabItem>-->
-                                <TabItem  Header="设备管理" Visibility="Collapsed" Background="#213269" Style="{StaticResource DefaultItem}" Foreground="White"   FontSize="25"   Width="160" Height="100"  VerticalAlignment="Center" HorizontalAlignment="Center" Margin="5" >
+                                <TabItem  Header="设备管理" Visibility="Collapsed" Background="#213269" Style="{StaticResource DefaultItem}" Foreground="White"   FontSize="25"   Width="160" Height="100"  VerticalAlignment="Center" HorizontalAlignment="Center" Margin="5">
                                     <StackPanel
                                                 x:Name="materialBom"
                                                  Canvas.Left="174"
@@ -881,16 +866,15 @@
                                 Height="70"
                                 Margin="-1500,20,0,-100"
                                 Text="设备编号 :"
-                                FontSize="25" 
-                                             Foreground="White"
-                              />
+                                FontSize="25"
+                                             Foreground="White" />
                                         <Border
                                                         ></Border>
                                         <TextBox x:Name="lba_ThrifTtitle3"   Style="{StaticResource XingHaoBianMaYangShi}" IsEnabled="true"
                                   Width="180" Height="50" Margin="-1150,-8,0,-100"></TextBox>
                                         <Button Content="搜索" FontSize="25" Margin="-700,-8,0,-100" Foreground="White" Height="50"  Width="132" Click="btnGetEquip_Click">
-                                            <Button.Template >
-                                                <ControlTemplate TargetType="{x:Type Button}" >
+                                            <Button.Template>
+                                                <ControlTemplate TargetType="{x:Type Button}">
                                                     <Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="4,4,4,4">
                                                         <Border.Background>#346DFF</Border.Background>
                                                         <ContentPresenter Content="{TemplateBinding ContentControl.Content}" HorizontalAlignment="Center" VerticalAlignment="Center" ></ContentPresenter>
@@ -902,13 +886,13 @@
                                         <!--  订单信息  -->
                                         <Grid  Width="1711" Height="1070" HorizontalAlignment="Left">
                                             <Grid.RowDefinitions>
-                                                <RowDefinition Height="10*"/>
-                                                <RowDefinition Height="2*"/>
-                                                <RowDefinition Height="88*"/>
+                                                <RowDefinition Height="10*" />
+                                                <RowDefinition Height="2*" />
+                                                <RowDefinition Height="88*" />
                                             </Grid.RowDefinitions>
                                             <Grid Background="#172557" Grid.Row="1"></Grid>
                                             <Grid Grid.Row="2">
-                                                <DataGrid 
+                                                <DataGrid
                                                             x:Name="LoadMaterial3"
                             AlternationCount="2"
                             AutoGenerateColumns="False"
@@ -922,7 +906,7 @@
                             IsReadOnly="True"
                             LoadingRow="dgData_LoadingRow"
                             RowHeaderWidth="0"
-                            SelectionMode="Single" FontSize="16" HorizontalAlignment="Left" Width="1711" Margin="0,0,0,10" >
+                            SelectionMode="Single" FontSize="16" HorizontalAlignment="Left" Width="1711" Margin="0,0,0,10">
                                                     <DataGrid.Columns>
                                                         <DataGridTemplateColumn
                                     x:Name="orderControlData3"
@@ -960,7 +944,6 @@
                                     Header="设备名称"
                                     IsReadOnly="True" />
 
-
                                                         <DataGridTextColumn
                                     Width="180*"
                                     Binding="{Binding serverIp}"
@@ -993,7 +976,6 @@
                                                             <Setter Property="Height" Value="50" />
                                                             <Setter Property="HorizontalContentAlignment" Value="Center" />
                                                         </Style>
-
                                                     </DataGrid.CellStyle>
                                                     <DataGrid.RowStyle>
                                                         <Style TargetType="{x:Type DataGridRow}">
@@ -1025,23 +1007,23 @@
                                                 </DataGrid>
                                             </Grid>
                                         </Grid>
-                                        <Label Content="Label"/>
-                                        <Label Content="Label"/>
-                                        <Label x:Name="_1111" Content="Label" Margin="1,0,1,0" HorizontalAlignment="Right" VerticalAlignment="Center" Foreground="#FFFBF5EC" Background="#FFECDADA"/>
-                                        <Label Content="Label"/>
+                                        <Label Content="Label" />
+                                        <Label Content="Label" />
+                                        <Label x:Name="_1111" Content="Label" Margin="1,0,1,0" HorizontalAlignment="Right" VerticalAlignment="Center" Foreground="#FFFBF5EC" Background="#FFECDADA" />
+                                        <Label Content="Label" />
                                     </StackPanel>
                                 </TabItem>
-                                <TabItem x:Name="LocationManager"  Header="库存信息" Visibility="Collapsed" Style="{StaticResource DefaultItem}"  FontSize="25" HorizontalContentAlignment="Center" Background="#213269" VerticalContentAlignment="Center"   Foreground="White" Width="160" Height="80" Margin="5" >
+                                <TabItem x:Name="LocationManager"  Header="库存信息" Visibility="Collapsed" Style="{StaticResource DefaultItem}"  FontSize="25" HorizontalContentAlignment="Center" Background="#213269" VerticalContentAlignment="Center"   Foreground="White" Width="160" Height="80" Margin="5">
                                     <StackPanel
                                                 x:Name="orderControl"
                                                 Canvas.Left="174"
                                                 Canvas.Top="110"
                                                 Width="1714"
                                                 Height="1060"
-                                                Background="#213269" Margin="0,-15,0,0" >
-                                        <StackPanel Orientation="Horizontal" >
-                                            <TextBlock VerticalAlignment="Center" Margin="10" Text="仓库:"/>
-                                            <ComboBox x:Name="WarehourseId"  DisplayMemberPath="warehouseName" Height="50" Width="200" FontSize="25" Margin="5"/>
+                                                Background="#213269" Margin="0,-15,0,0">
+                                        <StackPanel Orientation="Horizontal">
+                                            <TextBlock VerticalAlignment="Center" Margin="10" Text="仓库:" />
+                                            <ComboBox x:Name="WarehourseId"  DisplayMemberPath="warehouseName" Height="50" Width="200" FontSize="25" Margin="5" />
                                             <TextBlock Text="库位 :" FontSize="25" VerticalAlignment="Center" Foreground="White" />
                                             <TextBox x:Name="lba_ThrifTtitle6"   Style="{StaticResource XingHaoBianMaYangShi}" IsEnabled="true" Width="180" Height="50"></TextBox>
                                             <TextBlock Text="库位状态 :" FontSize="25" VerticalAlignment="Center" Foreground="White" />
@@ -1057,8 +1039,8 @@
                                                 <ComboBoxItem Content="异常库位" Tag="9" />
                                             </ComboBox>
                                             <Button Content="搜索" FontSize="25" Margin="10" Foreground="White" Height="50"  Width="132" Click="btnGetStocK_Click">
-                                                <Button.Template >
-                                                    <ControlTemplate TargetType="{x:Type Button}" >
+                                                <Button.Template>
+                                                    <ControlTemplate TargetType="{x:Type Button}">
                                                         <Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="4,4,4,4">
                                                             <Border.Background>#346DFF</Border.Background>
                                                             <ContentPresenter Content="{TemplateBinding ContentControl.Content}" HorizontalAlignment="Center" VerticalAlignment="Center" ></ContentPresenter>
@@ -1067,8 +1049,8 @@
                                                 </Button.Template>
                                             </Button>
                                             <Button Content="锁定库位" FontSize="25"  Margin="10" Foreground="White" Height="50"  Width="132" Click="LockLocation_Click">
-                                                <Button.Template >
-                                                    <ControlTemplate TargetType="{x:Type Button}" >
+                                                <Button.Template>
+                                                    <ControlTemplate TargetType="{x:Type Button}">
                                                         <Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="4,4,4,4">
                                                             <Border.Background>#346DFF</Border.Background>
                                                             <ContentPresenter Content="{TemplateBinding ContentControl.Content}" HorizontalAlignment="Center" VerticalAlignment="Center" ></ContentPresenter>
@@ -1077,8 +1059,8 @@
                                                 </Button.Template>
                                             </Button>
                                             <Button Content="解锁库位" FontSize="25"  Margin="10" Foreground="White" Height="50"  Width="132" Click="UnLockLocation_Click">
-                                                <Button.Template >
-                                                    <ControlTemplate TargetType="{x:Type Button}" >
+                                                <Button.Template>
+                                                    <ControlTemplate TargetType="{x:Type Button}">
                                                         <Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="4,4,4,4">
                                                             <Border.Background>#346DFF</Border.Background>
                                                             <ContentPresenter Content="{TemplateBinding ContentControl.Content}" HorizontalAlignment="Center" VerticalAlignment="Center" ></ContentPresenter>
@@ -1089,11 +1071,11 @@
                                         </StackPanel>
                                         <Grid  HorizontalAlignment="Left" Height="1000">
                                             <Grid.RowDefinitions>
-                                                <RowDefinition Height="88*"/>
-                                                <RowDefinition Height="auto"/>
+                                                <RowDefinition Height="88*" />
+                                                <RowDefinition Height="auto" />
                                             </Grid.RowDefinitions>
-                                            <Grid Grid.Row="0" >
-                                                <DataGrid 
+                                            <Grid Grid.Row="0">
+                                                <DataGrid
                                                 x:Name="LoadMaterial1"
                                                 AlternationCount="2"
                                                 AutoGenerateColumns="False"
@@ -1107,20 +1089,18 @@
                                                 IsReadOnly="True"
                                                 LoadingRow="dgData_LoadingRow"
                                                 RowHeaderWidth="0"
-                                                SelectionMode="Single" FontSize="16" HorizontalAlignment="Left" 
-                                                    >
+                                                SelectionMode="Single" FontSize="16" HorizontalAlignment="Left">
                                                     <DataGrid.Columns>
                                                         <DataGridTemplateColumn Width="130*" Header="选择">
                                                             <DataGridTemplateColumn.CellTemplate>
                                                                 <DataTemplate>
                                                                     <Grid>
                                                                         <Grid.Tag>
-                                                                            <Binding Path="IsSelected"/>
+                                                                            <Binding Path="IsSelected" />
                                                                         </Grid.Tag>
-                                                                        <CheckBox 
+                                                                        <CheckBox
                                                     Style="{StaticResource CheckBoxStyle}"
-                                                    Click="LocationPersonBox_Click"
-                                                          />
+                                                    Click="LocationPersonBox_Click" />
                                                                     </Grid>
                                                                 </DataTemplate>
                                                             </DataGridTemplateColumn.CellTemplate>
@@ -1229,8 +1209,6 @@
                                         FontSize="20"
                                         Header="冻结数量"
                                         IsReadOnly="True" />-->
-
-
                                                     </DataGrid.Columns>
                                                     <DataGrid.CellStyle>
                                                         <Style TargetType="{x:Type DataGridCell}">
@@ -1239,7 +1217,6 @@
                                                             <Setter Property="Height" Value="50" />
                                                             <Setter Property="HorizontalContentAlignment" Value="Center" />
                                                         </Style>
-
                                                     </DataGrid.CellStyle>
                                                     <DataGrid.RowStyle>
                                                         <Style TargetType="{x:Type DataGridRow}">
@@ -1271,7 +1248,7 @@
                                                 </DataGrid>
                                             </Grid>
                                             <Grid Grid.Row="1"  HorizontalAlignment="Center">
-                                                <pg:PageControl x:Name="PageControl1" Height="65" Margin="0,10" PreviousPageClicked="PageControl1_PreviousPageClicked" NextPageClicked="PageControl1_NextPageClicked"/>
+                                                <pg:PageControl x:Name="PageControl1" Height="65" Margin="0,10" PreviousPageClicked="PageControl1_PreviousPageClicked" NextPageClicked="PageControl1_NextPageClicked" />
                                                 <!--<hc:Pagination x:Name="Pagination1" MaxWidth="1500" Margin="0,0,0,15"  PageUpdated="Pagination_PageUpdated" IsJumpEnabled="True"   HorizontalAlignment="Center" Width="339" />-->
                                             </Grid>
                                         </Grid>
@@ -1282,8 +1259,8 @@
                                     <Grid Height="1080" Width="1680">
                                         <Grid.RowDefinitions>
 
-                                            <RowDefinition Height="*"/>
-                                            <RowDefinition Height="9*"/>
+                                            <RowDefinition Height="*" />
+                                            <RowDefinition Height="9*" />
                                         </Grid.RowDefinitions>
                                         <Grid Grid.Row="0">
                                             <StackPanel Orientation="Horizontal">
@@ -1295,32 +1272,29 @@
 
                                                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="600 0 0 0">
                                                     <Rectangle  Width="50" Height="50" Fill="#75F76D" />
-                                                    <TextBlock Text=" 有库存" FontSize="30"/>
+                                                    <TextBlock Text=" 有库存" FontSize="30" />
                                                 </StackPanel>
 
                                                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="30 0 0 0">
                                                     <Rectangle  Width="50" Height="50" Fill="#D78E28" />
-                                                    <TextBlock Text=" 空料箱在库里" FontSize="30"/>
+                                                    <TextBlock Text=" 空料箱在库里" FontSize="30" />
                                                 </StackPanel>
                                                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="30 0 0 0">
                                                     <Rectangle  Width="50" Height="50" Fill="#4789AE" />
-                                                    <TextBlock Text=" 空库位" FontSize="30"/>
+                                                    <TextBlock Text=" 空库位" FontSize="30" />
                                                 </StackPanel>
 
                                                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="30 0 0 0">
                                                     <!-- 包含透明正方形和红点的 Canvas -->
                                                     <Canvas Width="50" Height="50" VerticalAlignment="Center" HorizontalAlignment="Center">
                                                         <!-- 透明的正方形 -->
-                                                        <Rectangle Width="50" Height="50" Fill="Transparent" Stroke="Black" StrokeThickness="1"/>
+                                                        <Rectangle Width="50" Height="50" Fill="Transparent" Stroke="Black" StrokeThickness="1" />
                                                         <!-- 中间的红点 -->
                                                         <Ellipse Width="10" Height="10" Fill="Red" Canvas.Left="20" Canvas.Top="20" />
                                                     </Canvas>
-                                                    <TextBlock Text=" 库位锁定" FontSize="30"/>
-
+                                                    <TextBlock Text=" 库位锁定" FontSize="30" />
                                                 </StackPanel>
-
                                             </StackPanel>
-
                                         </Grid>
                                         <Grid Grid.Row="1">
                                             <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
@@ -1338,14 +1312,14 @@
                                 <TabItem Header="库位状态"  Style="{StaticResource DefaultItem}"  FontSize="25" HorizontalContentAlignment="Center" Background="#213269" VerticalContentAlignment="Center"   Foreground="White" Width="160" Height="80" Margin="5">
                                     <Grid  Margin="0 10 10 0" Height="1080" Width="1680">
                                         <Grid.RowDefinitions>
-                                            <RowDefinition Height="Auto"/>
-                                            <RowDefinition Height="*"/>
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="*" />
                                         </Grid.RowDefinitions>
                                         <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="10 0 0 0">
-                                            <ComboBox x:Name="WareHouseId" SelectionChanged="WareHouseId_SelectionChanged"/>
+                                            <ComboBox x:Name="WareHouseId" SelectionChanged="WareHouseId_SelectionChanged" />
                                             <Button Content="刷新"  Foreground="White" Height="50" Margin="5" FontSize="25"  Width="132" Click="Refulsh_Click">
-                                                <Button.Template >
-                                                    <ControlTemplate TargetType="{x:Type Button}" >
+                                                <Button.Template>
+                                                    <ControlTemplate TargetType="{x:Type Button}">
                                                         <Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="4,4,4,4">
                                                             <Border.Background>#346DFF</Border.Background>
                                                             <ContentPresenter Content="{TemplateBinding ContentControl.Content}" HorizontalAlignment="Center" VerticalAlignment="Center" ></ContentPresenter>
@@ -1356,33 +1330,30 @@
 
                                             <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="700 0 0 0">
                                                 <Rectangle  Width="50" Height="50" Fill="#75F76D" />
-                                                <TextBlock Text=" 有库存" FontSize="30"/>
+                                                <TextBlock Text=" 有库存" FontSize="30" />
                                             </StackPanel>
 
                                             <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="30 0 0 0">
                                                 <Rectangle  Width="50" Height="50" Fill="#4789AE" />
-                                                <TextBlock Text=" 空库位" FontSize="30"/>
+                                                <TextBlock Text=" 空库位" FontSize="30" />
                                             </StackPanel>
 
                                             <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="30 0 0 0">
                                                 <!-- 包含透明正方形和红点的 Canvas -->
                                                 <Canvas Width="50" Height="50" VerticalAlignment="Center" HorizontalAlignment="Center">
                                                     <!-- 透明的正方形 -->
-                                                    <Rectangle Width="50" Height="50" Fill="Transparent" Stroke="Black" StrokeThickness="1"/>
+                                                    <Rectangle Width="50" Height="50" Fill="Transparent" Stroke="Black" StrokeThickness="1" />
                                                     <!-- 中间的红点 -->
                                                     <Ellipse Width="10" Height="10" Fill="Red" Canvas.Left="20" Canvas.Top="20" />
                                                 </Canvas>
-                                                <TextBlock Text=" 库位锁定" FontSize="30"/>
-
+                                                <TextBlock Text=" 库位锁定" FontSize="30" />
                                             </StackPanel>
-
                                         </StackPanel>
                                         <Grid Grid.Row="1" x:Name="LocaltionGrid">
-
                                         </Grid>
                                     </Grid>
                                 </TabItem>
-                                <!--<TabItem Header="指令管理"   Foreground="White"   FontSize="25"   Width="160" Height="100"  VerticalAlignment="Center" HorizontalAlignment="Center" Margin="5" >
+                                <!--<TabItem Header="指令管理"   Foreground="White"   FontSize="25"   Width="160" Height="100"  VerticalAlignment="Center" HorizontalAlignment="Center" Margin="5">
                                     <StackPanel
                     x:Name="UpperStart"
                     Canvas.Left="174"
@@ -1395,7 +1366,7 @@
                         Height="918"
                         HorizontalAlignment="Left"
                         Focusable="False">
-                                            <StackPanel                       
+                                            <StackPanel
                             Height="80"
                             Width="1724"
                             Margin="-16,0,10,10"
@@ -1408,43 +1379,42 @@
                                 Content="设备编号 :"
                                 FontSize="25"
                                 Foreground="White"
-                                HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
+                                HorizontalContentAlignment="Center" VerticalContentAlignment="Center" />
                                                 <Border
                                                         ></Border>
                                                 <TextBox x:Name="txtEquipNo"   Style="{StaticResource XingHaoBianMaYangShi}" IsEnabled="true"
                                   Width="180" Height="50"
                                    VerticalAlignment="Center"
                                                              HorizontalAlignment="Left"
-                                   HorizontalContentAlignment="Left" 
-                                   VerticalContentAlignment="Center" 
+                                   HorizontalContentAlignment="Left"
+                                   VerticalContentAlignment="Center"
                                    FontSize="30"
-                                   Margin="-10,5,0,5"
-                                   />
-                                                <Label 
-                                Foreground="White" 
-                                FontSize="25"  
-                                HorizontalAlignment="Stretch" 
-                                VerticalAlignment="Stretch" 
-                                HorizontalContentAlignment="Center" 
-                                VerticalContentAlignment="Center" 
-                                Content="容器编号 : " 
-                                Margin="20,0,0,0"/>
+                                   Margin="-10,5,0,5" />
+                                                <Label
+                                Foreground="White"
+                                FontSize="25"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                HorizontalContentAlignment="Center"
+                                VerticalContentAlignment="Center"
+                                Content="容器编号 : "
+                                Margin="20,0,0,0" />
                                                 <Border></Border>
-                                                <TextBox 
-                                x:Name="txtContainNo" 
-                                HorizontalAlignment="Center"  
-                               
+                                                <TextBox
+                                x:Name="txtContainNo"
+                                HorizontalAlignment="Center"
+
                                 VerticalAlignment="Center"
-                                Width="180" 
-                                Height="50" 
-                                FontSize="30" 
-                                HorizontalContentAlignment="Left" 
-                                VerticalContentAlignment="Center" 
-                                Margin="10,0,20,0" 
+                                Width="180"
+                                Height="50"
+                                FontSize="30"
+                                HorizontalContentAlignment="Left"
+                                VerticalContentAlignment="Center"
+                                Margin="10,0,20,0"
                                 ></TextBox>
                                                 <Button Content="搜索" Margin="20,15,0,15" Foreground="White"  Width="132" Click="btnGetWcsCmd_Click">
-                                                    <Button.Template >
-                                                        <ControlTemplate TargetType="{x:Type Button}" >
+                                                    <Button.Template>
+                                                        <ControlTemplate TargetType="{x:Type Button}">
                                                             <Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="4,4,4,4">
                                                                 <Border.Background>#346DFF</Border.Background>
                                                                 <ContentPresenter Content="{TemplateBinding ContentControl.Content}" HorizontalAlignment="Center" VerticalAlignment="Center" ></ContentPresenter>
@@ -1453,8 +1423,8 @@
                                                     </Button.Template>
                                                 </Button>
                                                 <Button Content="删除指令" Margin="20,15,0,15" Foreground="White"  Width="132" Click="btnDelCmd_Click">
-                                                    <Button.Template >
-                                                        <ControlTemplate TargetType="{x:Type Button}" >
+                                                    <Button.Template>
+                                                        <ControlTemplate TargetType="{x:Type Button}">
                                                             <Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="4,4,4,4">
                                                                 <Border.Background>#346DFF</Border.Background>
                                                                 <ContentPresenter Content="{TemplateBinding ContentControl.Content}" HorizontalAlignment="Center" VerticalAlignment="Center" ></ContentPresenter>
@@ -1463,8 +1433,8 @@
                                                     </Button.Template>
                                                 </Button>
                                                 <Button Content="重发指令" Margin="20,15,0,15" Foreground="White"  Width="132" Click="btnReSendCmd_Click">
-                                                    <Button.Template >
-                                                        <ControlTemplate TargetType="{x:Type Button}" >
+                                                    <Button.Template>
+                                                        <ControlTemplate TargetType="{x:Type Button}">
                                                             <Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="4,4,4,4">
                                                                 <Border.Background>#346DFF</Border.Background>
                                                                 <ContentPresenter Content="{TemplateBinding ContentControl.Content}" HorizontalAlignment="Center" VerticalAlignment="Center" ></ContentPresenter>
@@ -1473,7 +1443,7 @@
                                                     </Button.Template>
                                                 </Button>
                                             </StackPanel>
-                                            <DataGrid 
+                                            <DataGrid
                                                         Margin="-25,0,0,0"
                             x:Name="LoadMaterial"
                             Width="1678"
@@ -1586,9 +1556,6 @@
                                     FontSize="20"
                                     Header="修改时间"
                                     IsReadOnly="True" />
-
-
-
                                                 </DataGrid.Columns>
                                                 <DataGrid.CellStyle>
                                                     <Style TargetType="{x:Type DataGridCell}">
@@ -1597,7 +1564,6 @@
                                                         <Setter Property="Height" Value="50" />
                                                         <Setter Property="HorizontalContentAlignment" Value="Center" />
                                                     </Style>
-
                                                 </DataGrid.CellStyle>
                                                 <DataGrid.RowStyle>
                                                     <Style TargetType="{x:Type DataGridRow}">
@@ -1633,32 +1599,32 @@
                                 <TabItem  x:Name="WasterManager" Header="二楼废料" Style="{StaticResource DefaultItem}"  FontSize="25" HorizontalContentAlignment="Center" Background="#213269" VerticalContentAlignment="Center"   Foreground="White" Width="160" Height="80" Margin="5">
                                     <Grid Height="1100" Width="1700">
                                         <Grid.RowDefinitions>
-                                            <RowDefinition Height="*"/>
-                                            <RowDefinition Height="2*"/>
+                                            <RowDefinition Height="*" />
+                                            <RowDefinition Height="2*" />
                                         </Grid.RowDefinitions>
                                         <Border BorderBrush="White" BorderThickness="2" Height="320" CornerRadius="10" Margin="10">
                                             <Grid Grid.Column="0" Grid.Row="0">
                                                 <Grid.RowDefinitions>
-                                                    <RowDefinition Height="*"/>
-                                                    <RowDefinition Height="2*"/>
+                                                    <RowDefinition Height="*" />
+                                                    <RowDefinition Height="2*" />
                                                 </Grid.RowDefinitions>
-                                                <TextBlock Text="2楼废料区任务下发" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="75"/>
-                                                <Grid Grid.Row="1" >
+                                                <TextBlock Text="2楼废料区任务下发" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="75" />
+                                                <Grid Grid.Row="1">
                                                     <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="2*"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                        <ColumnDefinition Width="2*"/>
-                                                        <ColumnDefinition Width="*"/>
+                                                        <ColumnDefinition Width="2*" />
+                                                        <ColumnDefinition Width="*" />
+                                                        <ColumnDefinition Width="2*" />
+                                                        <ColumnDefinition Width="*" />
                                                     </Grid.ColumnDefinitions>
-                                                    <TextBlock Text="废料区请求空托盘" Grid.Column="0" Grid.Row="0" FontSize="50" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                                    <Button Content="执行" Foreground="White" Background="#346DFF" Width="150" Height="75" Grid.Column="1" Grid.Row="0" FontSize="30" HorizontalAlignment="Center" VerticalAlignment="Center" Click="btnSendEmptyTray_Click"/>
-                                                    <TextBlock Text="废料区出托盘到周转区" Grid.Column="2" Grid.Row="0" FontSize="50" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                                    <Button Content="执行" Foreground="White" Background="#346DFF" Width="150" Height="75" Grid.Column="3" Grid.Row="0" FontSize="30" HorizontalAlignment="Center" VerticalAlignment="Center" Click="btnSendTrayToTurnover_Click"/>
+                                                    <TextBlock Text="废料区请求空托盘" Grid.Column="0" Grid.Row="0" FontSize="50" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                                    <Button Content="执行" Foreground="White" Background="#346DFF" Width="150" Height="75" Grid.Column="1" Grid.Row="0" FontSize="30" HorizontalAlignment="Center" VerticalAlignment="Center" Click="btnSendEmptyTray_Click" />
+                                                    <TextBlock Text="废料区出托盘到周转区" Grid.Column="2" Grid.Row="0" FontSize="50" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                                    <Button Content="执行" Foreground="White" Background="#346DFF" Width="150" Height="75" Grid.Column="3" Grid.Row="0" FontSize="30" HorizontalAlignment="Center" VerticalAlignment="Center" Click="btnSendTrayToTurnover_Click" />
                                                 </Grid>
                                             </Grid>
                                         </Border>
                                         <Border Grid.Column="0" Grid.Row="1" BorderBrush="White" BorderThickness="2" Height="650" CornerRadius="10" Margin="10">
-                                            <DataGrid 
+                                            <DataGrid
                                                        AlternationCount="2"
                                                          AutoGenerateColumns="False"
                                                          Background="#172557"
@@ -1748,8 +1714,8 @@
                                                         <DataGridTemplateColumn.CellTemplate>
                                                             <DataTemplate>
                                                                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                                                                    <!--<Button Content="清除" Style="{StaticResource ButtonPrimary}" FontSize="25" Width="125" Height="75" Click="clearLocation_Click"/>-->
-                                                                    <Button Content="出库" Style="{StaticResource ButtonPrimary}" Visibility="{Binding IsShowOut}" FontSize="25" Width="125" Height="75" Click="outLocation_Click"/>
+                                                                    <!--<Button Content="清除" Style="{StaticResource ButtonPrimary}" FontSize="25" Width="125" Height="75" Click="clearLocation_Click" />-->
+                                                                    <Button Content="出库" Style="{StaticResource ButtonPrimary}" Visibility="{Binding IsShowOut}" FontSize="25" Width="125" Height="75" Click="outLocation_Click" />
                                                                 </StackPanel>
                                                             </DataTemplate>
                                                         </DataGridTemplateColumn.CellTemplate>
@@ -1761,13 +1727,12 @@
                                                         <Setter Property="Foreground" Value="White" />
                                                         <Setter Property="HorizontalContentAlignment" Value="Center" />
                                                     </Style>
-
                                                 </DataGrid.CellStyle>
                                                 <DataGrid.RowStyle>
                                                     <Style TargetType="{x:Type DataGridRow}">
                                                         <Setter Property="Background" Value="#213269" />
                                                         <Setter Property="Foreground" Value="White" />
-                                                        <Setter Property="Height" Value="60"/>
+                                                        <Setter Property="Height" Value="60" />
                                                     </Style>
                                                 </DataGrid.RowStyle>
                                                 <DataGrid.RowHeaderStyle>
@@ -1795,28 +1760,27 @@
                                 <TabItem  x:Name="CallPersonManager" Header="人工叫料" Style="{StaticResource DefaultItem}"  FontSize="25" HorizontalContentAlignment="Center" Background="#213269" VerticalContentAlignment="Center"   Foreground="White" Width="160" Height="80" Margin="5">
                                     <Grid Height="1100" Width="1700">
                                         <Grid.RowDefinitions>
-                                            <RowDefinition Height="0.5*"/>
-                                            <RowDefinition Height="0.8*"/>
-
-                                            <RowDefinition Height="5*"/>
-                                            <RowDefinition Height="0.7*"/>
+                                            <RowDefinition Height="0.5*" />
+                                            <RowDefinition Height="0.8*" />
 
+                                            <RowDefinition Height="5*" />
+                                            <RowDefinition Height="0.7*" />
                                         </Grid.RowDefinitions>
                                         <Border Background="#213269" BorderBrush="Silver" BorderThickness="2" CornerRadius="10"  Margin="0,5,0,0">
                                             <StackPanel Orientation="Horizontal">
-                                                <TextBlock Text="物料名称:" FontSize="30" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                                <TextBox x:Name="MaterialName" Width="200" Height="40" Margin="5,0,0,0" VerticalAlignment="Center" KeyDown="Form1_KeyDown"/>
-                                                <Button Content="搜索" Background="#346DFF" Foreground="White" FontSize="25" Height="50" Width="100" Margin="20,0,0,0" Click="SelectButton_Click" KeyDown="Form1_KeyDown"/>
-                                                <Button Content="出空箱" HorizontalAlignment="Right" Background="#346DFF" Foreground="White" FontSize="25" Height="50" Width="100" Margin="20,0,0,0" Click="CallEmptyBtn_Click"/>
-                                                <Button Content="出选择料箱" HorizontalAlignment="Right" Background="#346DFF" Foreground="White" FontSize="25" Height="50" Width="200" Margin="20,0,0,0" Click="CallTrayBtn_Click"/>
-                                                <Button Content="移库" HorizontalAlignment="Right" Background="#346DFF" Foreground="White" FontSize="25" Height="50" Width="200" Margin="20,0,0,0" Click="RemoveTrayBtn_Click"/>
+                                                <TextBlock Text="物料名称:" FontSize="30" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                                <TextBox x:Name="MaterialName" Width="200" Height="40" Margin="5,0,0,0" VerticalAlignment="Center" KeyDown="Form1_KeyDown" />
+                                                <Button Content="搜索" Background="#346DFF" Foreground="White" FontSize="25" Height="50" Width="100" Margin="20,0,0,0" Click="SelectButton_Click" KeyDown="Form1_KeyDown" />
+                                                <Button Content="出空箱" HorizontalAlignment="Right" Background="#346DFF" Foreground="White" FontSize="25" Height="50" Width="100" Margin="20,0,0,0" Click="CallEmptyBtn_Click" />
+                                                <Button Content="出选择料箱" HorizontalAlignment="Right" Background="#346DFF" Foreground="White" FontSize="25" Height="50" Width="200" Margin="20,0,0,0" Click="CallTrayBtn_Click" />
+                                                <Button Content="移库" HorizontalAlignment="Right" Background="#346DFF" Foreground="White" FontSize="25" Height="50" Width="200" Margin="20,0,0,0" Click="RemoveTrayBtn_Click" />
                                             </StackPanel>
                                         </Border>
                                         <Border Grid.Row="1" Height="100" Background="#213269" BorderThickness="2" CornerRadius="10" Margin="0,5,0,0">
                                             <ItemsControl x:Name="itemsControl">
                                                 <ItemsControl.ItemsPanel>
                                                     <ItemsPanelTemplate>
-                                                        <WrapPanel  Orientation="Horizontal"/>
+                                                        <WrapPanel  Orientation="Horizontal" />
                                                         <!-- 使项自动换行 -->
                                                     </ItemsPanelTemplate>
                                                 </ItemsControl.ItemsPanel>
@@ -1824,15 +1788,15 @@
                                                     <DataTemplate>
                                                         <Border  Margin="5" Padding="5">
                                                             <StackPanel Orientation="Horizontal">
-                                                                <TextBlock Text="{Binding palletInfoCode}" VerticalAlignment="Center"/>
-                                                                <Button Content="删除" FontSize="15" Width="50"  Background="LightSkyBlue" Foreground="Red" Margin="0,0,10,0" Click="DeleteButton_Click" Tag="{Binding}"/>
+                                                                <TextBlock Text="{Binding palletInfoCode}" VerticalAlignment="Center" />
+                                                                <Button Content="删除" FontSize="15" Width="50"  Background="LightSkyBlue" Foreground="Red" Margin="0,0,10,0" Click="DeleteButton_Click" Tag="{Binding}" />
                                                             </StackPanel>
                                                         </Border>
                                                     </DataTemplate>
                                                 </ItemsControl.ItemTemplate>
                                             </ItemsControl>
                                         </Border>
-                                        <DataGrid 
+                                        <DataGrid
                                               Style="{StaticResource DataGridStyle}"
                                               Grid.Row="2" AlternationCount="2"
                                               AutoGenerateColumns="False"
@@ -1859,13 +1823,12 @@
                                                         <DataTemplate>
                                                             <Grid>
                                                                 <Grid.Tag>
-                                                                    <Binding Path="IsSelected"/>
+                                                                    <Binding Path="IsSelected" />
                                                                 </Grid.Tag>
-                                                                <CheckBox 
+                                                                <CheckBox
                                                                           IsChecked="{Binding Tag, RelativeSource={RelativeSource AncestorType=Grid}}"
                                                                           Style="{StaticResource CheckBoxStyle}"
-                                                                          Click="CheckPersonBox_Click"
-                                                                  />
+                                                                          Click="CheckPersonBox_Click" />
                                                             </Grid>
                                                         </DataTemplate>
                                                     </DataGridTemplateColumn.CellTemplate>
@@ -1912,10 +1875,10 @@
                                                      Header="物料编码"
                                                      IsReadOnly="True" />
                                                 <DataGridTemplateColumn
-                                                        Width="280*" 
+                                                        Width="280*"
                                                         CanUserSort="False"
                                                         Header="物料名称"
-                                                        IsReadOnly="True" >
+                                                        IsReadOnly="True">
                                                     <DataGridTemplateColumn.CellTemplate>
                                                         <DataTemplate>
                                                             <TextBlock TextWrapping="Wrap" Text="{Binding materialName}" ToolTip="{Binding materialNameSrc}" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="20" />
@@ -1926,7 +1889,7 @@
                                                    Width="300*"
                                                    CanUserSort="False"
                                                    Header="物料规格"
-                                                   IsReadOnly="True" >
+                                                   IsReadOnly="True">
                                                     <DataGridTemplateColumn.CellTemplate>
                                                         <DataTemplate>
                                                             <TextBlock TextWrapping="Wrap" Text="{Binding materialSpecSrc}" ToolTip="{Binding materialSpecSrc}" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="20" />
@@ -1938,7 +1901,7 @@
                                                    Width="130*"
                                                    CanUserSort="False"
                                                    Header="总数"
-                                                   IsReadOnly="True" >
+                                                   IsReadOnly="True">
                                                     <DataGridTemplateColumn.CellTemplate>
                                                         <DataTemplate>
                                                             <TextBlock TextWrapping="Wrap" Text="{Binding totalAmount}" ToolTip="{Binding totalAmount}" Height="auto" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="20" />
@@ -1949,7 +1912,7 @@
                                                    Width="130*"
                                                    CanUserSort="False"
                                                    Header="冻结数量"
-                                                   IsReadOnly="True" >
+                                                   IsReadOnly="True">
                                                     <DataGridTemplateColumn.CellTemplate>
                                                         <DataTemplate>
                                                             <TextBlock TextWrapping="WrapWithOverflow" Text="{Binding frozenAmount}" Height="auto" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="20" />
@@ -1963,7 +1926,6 @@
                                                     <Setter Property="Foreground" Value="White" />
                                                     <Setter Property="HorizontalContentAlignment" Value="Center" />
                                                 </Style>
-
                                             </DataGrid.CellStyle>
                                             <DataGrid.RowStyle>
                                                 <Style TargetType="{x:Type DataGridRow}">
@@ -1991,7 +1953,7 @@
                                             </DataGrid.ColumnHeaderStyle>
                                         </DataGrid>
                                         <StackPanel  Grid.Row="3" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal">
-                                            <pg:PageControl x:Name="PageControl2" Height="65" PreviousPageClicked="PageControl2_PreviousPageClicked" NextPageClicked="PageControl2_NextPageClicked"/>
+                                            <pg:PageControl x:Name="PageControl2" Height="65" PreviousPageClicked="PageControl2_PreviousPageClicked" NextPageClicked="PageControl2_NextPageClicked" />
 
                                             <!--<hc:Pagination x:Name="Pagination2" Visibility="Visible" Height="50"  MaxPageCount="1"   Margin="0,0,0,15"  PageUpdated="Pagination2_PageUpdated"    HorizontalAlignment="Center" Width="339" />-->
                                         </StackPanel>
@@ -2000,17 +1962,17 @@
                                 <TabItem Visibility="Visible" x:Name="InventoryManager" Header="盘库任务" Style="{StaticResource DefaultItem}"  FontSize="25" HorizontalContentAlignment="Center" Background="#213269" VerticalContentAlignment="Center"   Foreground="White" Width="160" Height="80" Margin="5">
                                     <Grid Height="1100" Width="1700">
                                         <Grid.RowDefinitions>
-                                            <RowDefinition Height="Auto"/>
-                                            <RowDefinition Height="*"/>
-                                            <RowDefinition Height="Auto"/>
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="*" />
+                                            <RowDefinition Height="Auto" />
                                         </Grid.RowDefinitions>
                                         <StackPanel Orientation="Horizontal">
-                                            <Button Content="搜索" Background="#346DFF" Foreground="White" FontSize="25" Height="50" Width="100" Margin="20,0,0,0" Click="SelectInventoryButton_Click"/>
-                                            <Button Content="添加盘库任务" Background="#346DFF" Foreground="White" FontSize="25" Height="50" Width="200" Margin="20,0,0,0" Click="AddInventoryButton_Click"/>
-                                            <Button Content="库存盘点" Background="#346DFF" Foreground="White" FontSize="25" Height="50" Width="150" Margin="20,0,0,0" Click="InventoryTaskButton_Click"/>
-                                            <Button Content="一键收料" Grid.Row="7" Grid.ColumnSpan="2" FontSize="25" Height="50" Width="150" Background="#346DFF" Foreground="White" Click="callPlc_Click" HorizontalAlignment="Left" Grid.Column="4" Margin="222,0,0,0"/>
+                                            <Button Content="搜索" Background="#346DFF" Foreground="White" FontSize="25" Height="50" Width="100" Margin="20,0,0,0" Click="SelectInventoryButton_Click" />
+                                            <Button Content="添加盘库任务" Background="#346DFF" Foreground="White" FontSize="25" Height="50" Width="200" Margin="20,0,0,0" Click="AddInventoryButton_Click" />
+                                            <Button Content="库存盘点" Background="#346DFF" Foreground="White" FontSize="25" Height="50" Width="150" Margin="20,0,0,0" Click="InventoryTaskButton_Click" />
+                                            <Button Content="一键收料" Grid.Row="7" Grid.ColumnSpan="2" FontSize="25" Height="50" Width="150" Background="#346DFF" Foreground="White" Click="callPlc_Click" HorizontalAlignment="Left" Grid.Column="4" Margin="222,0,0,0" />
                                         </StackPanel>
-                                        <DataGrid 
+                                        <DataGrid
                                                 Style="{StaticResource DataGridStyle}"
                                                 Grid.Row="1" AlternationCount="2"
                                                 AutoGenerateColumns="False"
@@ -2114,14 +2076,12 @@
                                                     <DataGridTemplateColumn.CellTemplate>
                                                         <DataTemplate>
                                                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-                                                                <Button Content="{Binding StartContent}" Style="{StaticResource ButtonPrimary}" IsEnabled="{Binding StartEnable}" FontSize="15" Width="90" Height="55" Click="StartInventory" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                                                                <Button Content="结束盘点" Style="{StaticResource ButtonPrimary}" IsEnabled="{Binding EndEnable}" Margin="5 0 0 0" FontSize="15" Width="90" Height="55" Click="EndInventory" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                                                                <Button Content="详情" Style="{StaticResource ButtonPrimary}"    Margin="5 0 0 0" FontSize="15" Width="90" Height="55" Click="OpenInventoryDetails" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                                                                <Button Content="{Binding StartContent}" Style="{StaticResource ButtonPrimary}" IsEnabled="{Binding StartEnable}" FontSize="15" Width="90" Height="55" Click="StartInventory" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                                                                <Button Content="结束盘点" Style="{StaticResource ButtonPrimary}" IsEnabled="{Binding EndEnable}" Margin="5 0 0 0" FontSize="15" Width="90" Height="55" Click="EndInventory" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                                                                <Button Content="详情" Style="{StaticResource ButtonPrimary}"    Margin="5 0 0 0" FontSize="15" Width="90" Height="55" Click="OpenInventoryDetails" VerticalAlignment="Center" HorizontalAlignment="Center" />
                                                             </StackPanel>
                                                         </DataTemplate>
-
                                                     </DataGridTemplateColumn.CellTemplate>
-
                                                 </DataGridTemplateColumn>
                                             </DataGrid.Columns>
                                             <DataGrid.CellStyle>
@@ -2135,7 +2095,7 @@
                                                 <Style TargetType="{x:Type DataGridRow}">
                                                     <Setter Property="Background" Value="#213269" />
                                                     <Setter Property="Foreground" Value="White" />
-                                                    <Setter Property="Height" Value="60"/>
+                                                    <Setter Property="Height" Value="60" />
                                                 </Style>
                                             </DataGrid.RowStyle>
                                             <DataGrid.RowHeaderStyle>
@@ -2158,7 +2118,7 @@
                                             </DataGrid.ColumnHeaderStyle>
                                         </DataGrid>
                                         <Grid Grid.Row="3" Height="100">
-                                            <pg:PageControl x:Name="PageControl3" VerticalAlignment="Center" Height="65" PreviousPageClicked="PageControl3_PreviousPageClicked" NextPageClicked="PageControl3_NextPageClicked"/>
+                                            <pg:PageControl x:Name="PageControl3" VerticalAlignment="Center" Height="65" PreviousPageClicked="PageControl3_PreviousPageClicked" NextPageClicked="PageControl3_NextPageClicked" />
                                         </Grid>
 
                                         <!--<hc:Pagination x:Name="Pagination3" Grid.Row="3" MaxWidth="1500" MaxPageCount="1"  Margin="0,0,0,15"  PageUpdated="Pagination3_PageUpdated" IsJumpEnabled="True"   HorizontalAlignment="Center" Width="339" />-->
@@ -2170,53 +2130,54 @@
                                             <StackPanel Orientation="Vertical" Margin="20,5,0,0">
                                                 <Grid Width="1650" Height="1000">
                                                     <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="*"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                        <ColumnDefinition Width="*"/>
+                                                        <ColumnDefinition Width="*" />
+                                                        <ColumnDefinition Width="*" />
+                                                        <ColumnDefinition Width="*" />
+                                                        <ColumnDefinition Width="*" />
+                                                        <ColumnDefinition Width="*" />
+                                                        <ColumnDefinition Width="*" />
                                                     </Grid.ColumnDefinitions>
                                                     <Grid.RowDefinitions>
-                                                        <RowDefinition/>
-                                                        <RowDefinition/>
-                                                        <RowDefinition/>
-                                                        <RowDefinition/>
-                                                        <RowDefinition  Height="2*"/>
-                                                        <RowDefinition Height="166.667"/>
-                                                        <RowDefinition/>
-                                                        <RowDefinition/>
-                                                        <RowDefinition Height="119.048"/>
+                                                        <RowDefinition />
+                                                        <RowDefinition />
+                                                        <RowDefinition />
+                                                        <RowDefinition />
+                                                        <RowDefinition  Height="2*" />
+                                                        <RowDefinition Height="166.667" />
+                                                        <RowDefinition />
+                                                        <RowDefinition />
+                                                        <RowDefinition Height="119.048" />
                                                     </Grid.RowDefinitions>
-                                                    <TextBlock Text="扫描入库"  FontSize="50" Grid.ColumnSpan="6"  HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                                    <TextBlock Text="扫描料箱号:" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75"/>
-                                                    <TextBlock Text="扫描条码号:" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75"/>
-                                                    <TextBlock Text="物料名称:" Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75"/>
+                                                    <TextBlock Text="扫描入库"  FontSize="50" Grid.ColumnSpan="6"  HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                                    <TextBlock Text="扫描料箱号:" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" />
+                                                    <TextBlock Text="扫描条码号:" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" />
+                                                    <TextBlock Text="物料名称:" Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" />
                                                     <TextBlock Text="物料规格:" Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" />
-                                                    <TextBlock Text="入库数量:" Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75"/>
-                                                    <TextBlock Text="备注信息:" Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75"/>
-                                                    <hc:TextBox x:Name="txtInBox" hc:InfoElement.ShowClearButton="True" FontSize="50" LostFocus="txtInBox_TextChanged" TextChanged="txtInBox_TextChanged" Width="900" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80"  Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="4"/>
+                                                    <TextBlock Text="入库数量:" Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" />
+                                                    <TextBlock Text="单位:" Grid.Row="5" Grid.Column="3" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" Width="172" />
+                                                    <TextBlock Text="备注信息:" Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" />
+                                                    <hc:TextBox x:Name="txtInBox" hc:InfoElement.ShowClearButton="True" FontSize="50" LostFocus="txtInBox_TextChanged" TextChanged="txtInBox_TextChanged" Width="900" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80"  Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="4" />
                                                     <Button Click="barClear_Click" HorizontalAlignment="Right" Height="80" Panel.ZIndex="1" Width="100" Margin="0,0,130,0"  Grid.Column="5" Grid.Row="2">
-                                                        <Image Source="..\Resources\cancel.png"/>
+                                                        <Image Source="..\Resources\cancel.png" />
                                                     </Button>
                                                     <Button Click="boxClear_Click" HorizontalAlignment="Right" Height="80" Panel.ZIndex="1" Width="100" Margin="0,0,130,0"  Grid.Column="5" Grid.Row="1">
                                                         <Image Source="..\Resources\cancel.png" />
                                                     </Button>
-                                                    <hc:TextBox x:Name="txtInBarCode" hc:InfoElement.ShowClearButton="True" FontSize="50" LostFocus="txtInBarCode_TextChanged" TextChanged="txtInBarCode_TextChanged" Width="900" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80"  Grid.Row="2" Grid.Column="2" Grid.ColumnSpan="4"/>
-                                                    <hc:TextBox x:Name="txtInStoreRemark" hc:InfoElement.ShowClearButton="True" FontSize="50"   Width="726" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80"  Grid.Row="6" Grid.Column="2" Grid.ColumnSpan="3"/>
-                                                    <hc:TextBox x:Name="materialName" IsReadOnly="True"  hc:InfoElement.ShowClearButton="True" FontSize="50"  Width="970" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80"  Grid.Row="3" Grid.Column="2" Grid.ColumnSpan="4"/>
-                                                    <hc:TextBox x:Name="materialSpec" TextWrapping="Wrap" ScrollViewer.VerticalScrollBarVisibility="Visible"   IsReadOnly="True" hc:InfoElement.ShowClearButton="True" FontSize="50"  Width="970" HorizontalAlignment="Left" VerticalAlignment="Center" Height="140"  Grid.Row="4" Grid.Column="2" Grid.ColumnSpan="4"/>
-                                                    <hc:TextBox x:Name="txtInScan" FontSize="50" IsReadOnly="True" Width="400" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80"  Grid.Row="5" Grid.Column="2" Grid.ColumnSpan="3" KeyDown="ScanInKeyDown" Margin="0 20 0 20"/>
-                                                    <Button Content="确认入库" Grid.Row="7" Grid.ColumnSpan="2" Width="300" Height="80" FontSize="50" Background="#346DFF" Foreground="White" Click="InRawBaseLocaltion_Click" Grid.Column="2" HorizontalAlignment="Left" Margin="125,0,0,10" VerticalAlignment="Bottom"/>
-                                                    <Button Content="取消预调度"  x:Name="CancelPreScheduling" Grid.Row="6" Grid.ColumnSpan="2" Width="328" Height="80" FontSize="50" Background="#346DFF" Foreground="White"  HorizontalAlignment="Left" Grid.Column="4" Margin="222,0,0,0" Click="CancelPreScheduling_Click"/>
-                                                    <Button Content="一键收料" Grid.Row="7" Grid.ColumnSpan="2" Width="328" Height="80" FontSize="50" Background="#346DFF" Foreground="White" Click="callPlc_Click" HorizontalAlignment="Left" Grid.Column="4" Margin="222,0,0,0"/>
+                                                    <hc:TextBox x:Name="txtInBarCode" hc:InfoElement.ShowClearButton="True" FontSize="50" LostFocus="txtInBarCode_TextChanged" TextChanged="txtInBarCode_TextChanged" Width="900" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80"  Grid.Row="2" Grid.Column="2" Grid.ColumnSpan="4" />
+                                                    <hc:TextBox x:Name="txtInStoreRemark" hc:InfoElement.ShowClearButton="True" FontSize="50"   Width="726" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80"  Grid.Row="6" Grid.Column="2" Grid.ColumnSpan="3" />
+                                                    <hc:TextBox x:Name="materialName" IsReadOnly="True"  hc:InfoElement.ShowClearButton="True" FontSize="50"  Width="970" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80"  Grid.Row="3" Grid.Column="2" Grid.ColumnSpan="4" />
+                                                    <hc:TextBox x:Name="materialSpec" TextWrapping="Wrap" ScrollViewer.VerticalScrollBarVisibility="Visible"   IsReadOnly="True" hc:InfoElement.ShowClearButton="True" FontSize="50"  Width="970" HorizontalAlignment="Left" VerticalAlignment="Center" Height="140"  Grid.Row="4" Grid.Column="2" Grid.ColumnSpan="4" />
+                                                    <hc:TextBox x:Name="txtInScan" FontSize="50" IsReadOnly="True" Width="400" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80"  Grid.Row="5" Grid.Column="2" Grid.ColumnSpan="3" KeyDown="ScanInKeyDown" Margin="0 20 0 20" />
+                                                    <hc:TextBox x:Name="txtInUnit" FontSize="50" IsReadOnly="True" Width="287" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80"  Grid.Row="5" Grid.Column="4" Grid.ColumnSpan="2" KeyDown="ScanInKeyDown" Margin="138,0,0,0" />
+                                                    <Button Content="确认入库" Grid.Row="7" Grid.ColumnSpan="2" Width="300" Height="80" FontSize="50" Background="#346DFF" Foreground="White" Click="InRawBaseLocaltion_Click" Grid.Column="2" HorizontalAlignment="Left" Margin="125,0,0,10" VerticalAlignment="Bottom" />
+                                                    <Button Content="取消预调度"  x:Name="CancelPreScheduling" Grid.Row="6" Grid.ColumnSpan="2" Width="328" Height="80" FontSize="50" Background="#346DFF" Foreground="White"  HorizontalAlignment="Left" Grid.Column="4" Margin="222,0,0,0" Click="CancelPreScheduling_Click" />
+                                                    <Button Content="一键收料" Grid.Row="7" Grid.ColumnSpan="2" Width="328" Height="80" FontSize="50" Background="#346DFF" Foreground="White" Click="callPlc_Click" HorizontalAlignment="Left" Grid.Column="4" Margin="222,0,0,0" />
                                                     <TextBlock  Grid.Row="8" Text="提示信息:"  HorizontalAlignment="Center"  Grid.Column="1" Grid.ColumnSpan="1" Width="250" Height="100" FontSize="50"  Foreground="White" />
                                                     <TextBlock x:Name="MsgText"   Grid.Row="8"  FontSize="50" Grid.ColumnSpan="5" Width="800" Height="100"   Foreground="White" HorizontalAlignment="Right" />
-                                                    <Button Content="执行CTU入库任务" Visibility="Hidden" Click="btnCtuInConfirmBox_Click" Grid.Row="5" Grid.ColumnSpan="6" Width="500" Height="100" FontSize="50" Background="#346DFF" Foreground="White"/>
+                                                    <Button Content="执行CTU入库任务" Visibility="Hidden" Click="btnCtuInConfirmBox_Click" Grid.Row="5" Grid.ColumnSpan="6" Width="500" Height="100" FontSize="50" Background="#346DFF" Foreground="White" />
                                                 </Grid>
                                             </StackPanel>
                                         </StackPanel>
-
                                     </StackPanel>
                                 </TabItem>
                                 <TabItem x:Name="ScanReturnManager" Header="扫描退库" Style="{StaticResource DefaultItem}"  FontSize="25" HorizontalContentAlignment="Center" Background="#213269" VerticalContentAlignment="Center"   Foreground="White" Width="160" Height="80" Margin="5">
@@ -2225,53 +2186,51 @@
                                             <StackPanel Orientation="Vertical" Margin="20,5,0,0">
                                                 <Grid Width="1650" Height="1000">
                                                     <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="*"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                        <ColumnDefinition Width="*"/>
+                                                        <ColumnDefinition Width="*" />
+                                                        <ColumnDefinition Width="*" />
+                                                        <ColumnDefinition Width="*" />
+                                                        <ColumnDefinition Width="*" />
+                                                        <ColumnDefinition Width="*" />
+                                                        <ColumnDefinition Width="*" />
                                                     </Grid.ColumnDefinitions>
                                                     <Grid.RowDefinitions>
-                                                        <RowDefinition Height="*"/>
-                                                        <RowDefinition Height="*"/>
-                                                        <RowDefinition Height="*"/>
-                                                        <RowDefinition Height="*"/>
-                                                        <RowDefinition Height="*"/>
-                                                        <RowDefinition Height="*"/>
-                                                        <RowDefinition Height="*"/>
-                                                        <RowDefinition Height="*"/>
-                                                        <RowDefinition Height="*"/>
-                                                        <RowDefinition Height="*"/>
+                                                        <RowDefinition Height="*" />
+                                                        <RowDefinition Height="*" />
+                                                        <RowDefinition Height="*" />
+                                                        <RowDefinition Height="*" />
+                                                        <RowDefinition Height="*" />
+                                                        <RowDefinition Height="*" />
+                                                        <RowDefinition Height="*" />
+                                                        <RowDefinition Height="*" />
+                                                        <RowDefinition Height="*" />
+                                                        <RowDefinition Height="*" />
                                                     </Grid.RowDefinitions>
                                                     <Border BorderBrush="White" BorderThickness="2"  Grid.ColumnSpan="2" Grid.Column="4" Grid.RowSpan="2" Margin="20">
-                                                        <StackPanel Orientation="Vertical" >
-                                                            <TextBlock x:Name="ReturnOrder" Background="Transparent" Grid.ColumnSpan="2" Grid.RowSpan="2" VerticalAlignment="Top" HorizontalAlignment="Center"/>
-                                                            <TextBlock x:Name="thisReturnEndStation" Background="Transparent" Grid.ColumnSpan="2" Grid.RowSpan="2" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="0,20,0,0"/>
+                                                        <StackPanel Orientation="Vertical">
+                                                            <TextBlock x:Name="ReturnOrder" Background="Transparent" Grid.ColumnSpan="2" Grid.RowSpan="2" VerticalAlignment="Top" HorizontalAlignment="Center" />
+                                                            <TextBlock x:Name="thisReturnEndStation" Background="Transparent" Grid.ColumnSpan="2" Grid.RowSpan="2" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="0,20,0,0" />
                                                         </StackPanel>
                                                     </Border>
                                                     <Border Visibility="Collapsed" BorderBrush="White" BorderThickness="2" Grid.Column="0" Grid.ColumnSpan="6" Grid.Row="8" Grid.RowSpan="2" Margin="20">
-                                                        <DataGrid Background="Transparent" 
+                                                        <DataGrid Background="Transparent"
                                                               CanUserAddRows="False"
                                                                AutoGenerateColumns="False"
                                                               CanUserSortColumns="False"
                                                               CanUserDeleteRows="False"
                                                               CanUserReorderColumns="False"
                                                               CanUserResizeColumns="False"
-                                                              x:Name="ReturnTaskNumber" >
+                                                              x:Name="ReturnTaskNumber">
                                                             <DataGrid.Columns>
                                                                 <DataGridTextColumn
                                                                 Header="物料名称"
                                                                 Binding="{Binding materiaName}"
                                                                 ElementStyle="{StaticResource dgCell}"
-                                                                Width="3*"
-                                                                />
+                                                                Width="3*" />
                                                                 <DataGridTextColumn
                                                                 Header="物料规格"
                                                                 Binding="{Binding materialSpec}"
                                                                 ElementStyle="{StaticResource dgCell}"
-                                                                Width="5*"
-                                                                />
+                                                                Width="5*" />
                                                                 <!--<DataGridTextColumn
                                                                 Header="销售订单"
                                                                 Binding="{Binding saleOrderId}"
@@ -2288,21 +2247,17 @@
                                                                 Header="申请退库数量"
                                                                 Binding="{Binding outstockAmount}"
                                                                 ElementStyle="{StaticResource dgCell}"
-                                                                Width="2*"
-                                                                />
+                                                                Width="2*" />
                                                                 <DataGridTextColumn
                                                                 Header="已退数量"
                                                                 Binding="{Binding realOutstockAmount}"
                                                                 ElementStyle="{StaticResource dgCell}"
-                                                                Width="2*"
-                                                                />
+                                                                Width="2*" />
                                                                 <DataGridTextColumn
                                                                 Header="退库工位"
                                                                 Binding="{Binding endStationCode}"
                                                                 ElementStyle="{StaticResource dgCell}"
-                                                                Width="2*"
-                                                                />
-
+                                                                Width="2*" />
                                                             </DataGrid.Columns>
                                                             <DataGrid.CellStyle>
                                                                 <Style TargetType="{x:Type DataGridCell}">
@@ -2310,7 +2265,6 @@
                                                                     <Setter Property="Foreground" Value="White" />
                                                                     <Setter Property="HorizontalContentAlignment" Value="Center" />
                                                                 </Style>
-
                                                             </DataGrid.CellStyle>
                                                             <DataGrid.RowStyle>
                                                                 <Style TargetType="{x:Type DataGridRow}">
@@ -2337,58 +2291,57 @@
                                                             </DataGrid.ColumnHeaderStyle>
                                                         </DataGrid>
                                                     </Border>
-                                                    <TextBlock Text="扫描退库" Grid.RowSpan="2" Foreground="White" FontSize="50"   HorizontalAlignment="Center" VerticalAlignment="Center" Grid.ColumnSpan="6"/>
-                                                    <TextBlock Text="待执行CTU任务数:" Visibility="Hidden" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Right" VerticalAlignment="Center" FontSize="50"/>
-                                                    <TextBlock x:Name="ReturnTaskCount" Visibility="Hidden" Grid.Row="1" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75"/>
-                                                    <Button Content="执行CTU出库任务" Visibility="Hidden" Grid.Row="1" Grid.Column="3" Grid.ColumnSpan="2" Width="500" Height="100" FontSize="50" Background="#346DFF" Foreground="White" Click="ExecuteCtuTask_Click"/>
-
+                                                    <TextBlock Text="扫描退库" Grid.RowSpan="2" Foreground="White" FontSize="50"   HorizontalAlignment="Center" VerticalAlignment="Center" Grid.ColumnSpan="6" />
+                                                    <TextBlock Text="待执行CTU任务数:" Visibility="Hidden" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Right" VerticalAlignment="Center" FontSize="50" />
+                                                    <TextBlock x:Name="ReturnTaskCount" Visibility="Hidden" Grid.Row="1" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" />
+                                                    <Button Content="执行CTU出库任务" Visibility="Hidden" Grid.Row="1" Grid.Column="3" Grid.ColumnSpan="2" Width="500" Height="100" FontSize="50" Background="#346DFF" Foreground="White" Click="ExecuteCtuTask_Click" />
 
                                                     <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="2" Grid.ColumnSpan="6">
-                                                        <TextBlock Text="扫描料箱号:" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50"/>
+                                                        <TextBlock Text="扫描料箱号:" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50" />
                                                         <Grid>
-                                                            <hc:TextBox hc:InfoElement.ShowClearButton="True" x:Name="txtReturnBox" FontSize="50" TextChanged="txtReturnBox_TextChanged"   Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="90"  Grid.Row="2" Grid.Column="3" Grid.ColumnSpan="3"/>
+                                                            <hc:TextBox hc:InfoElement.ShowClearButton="True" x:Name="txtReturnBox" FontSize="50" TextChanged="txtReturnBox_TextChanged"   Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="90"  Grid.Row="2" Grid.Column="3" Grid.ColumnSpan="3" />
                                                             <Button Click="boxReturnClear_Click" HorizontalAlignment="Right" Height="75" Panel.ZIndex="1" Width="100" Margin="0,0,0,0"  Grid.Column="5" Grid.Row="2">
-                                                                <Image Source="..\Resources\cancel.png"/>
+                                                                <Image Source="..\Resources\cancel.png" />
                                                             </Button>
                                                         </Grid>
-                                                        <Button Content="选择退库" Background="#346DFF" Grid.ColumnSpan="6" Grid.Row="1" Foreground="White" FontSize="50" Margin="100,0,0,0"  Height="100" Width="330" Click="SelectReturnBtn_Click"/>
+                                                        <Button Content="选择退库" Background="#346DFF" Grid.ColumnSpan="6" Grid.Row="1" Foreground="White" FontSize="50" Margin="100,0,0,0"  Height="100" Width="330" Click="SelectReturnBtn_Click" />
                                                     </StackPanel>
                                                     <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="3" Grid.ColumnSpan="6">
-                                                        <TextBlock Text="扫描条码号:" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50"/>
+                                                        <TextBlock Text="扫描条码号:" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50" />
                                                         <Grid>
-                                                            <hc:TextBox hc:InfoElement.ShowClearButton="True" x:Name="txtReturnBarCode" FontSize="50" TextChanged="txtReturnBarCode_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="90"  Grid.Row="3" Grid.Column="3" Grid.ColumnSpan="3"/>
+                                                            <hc:TextBox hc:InfoElement.ShowClearButton="True" x:Name="txtReturnBarCode" FontSize="50" TextChanged="txtReturnBarCode_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="90"  Grid.Row="3" Grid.Column="3" Grid.ColumnSpan="3" />
                                                             <Button Click="barReturnClear_Click" HorizontalAlignment="Right" Height="75" Panel.ZIndex="1" Width="100" Margin="0,0,0,0"  Grid.Column="5" Grid.Row="3">
-                                                                <Image Source="..\Resources\cancel.png"/>
+                                                                <Image Source="..\Resources\cancel.png" />
                                                             </Button>
                                                         </Grid>
                                                     </StackPanel>
                                                     <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="4" Grid.ColumnSpan="6">
-                                                        <TextBlock Width="260"  Text="物料名称:" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50"/>
+                                                        <TextBlock Width="260"  Text="物料名称:" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50" />
                                                         <Grid>
-                                                            <hc:TextBox hc:InfoElement.ShowClearButton="True"  IsReadOnly="True" x:Name="returnMaterialName" FontSize="50" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="90"   Grid.Row="2" Grid.Column="3" Grid.ColumnSpan="3"/>
+                                                            <hc:TextBox hc:InfoElement.ShowClearButton="True"  IsReadOnly="True" x:Name="returnMaterialName" FontSize="50" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="90"   Grid.Row="2" Grid.Column="3" Grid.ColumnSpan="3" />
                                                         </Grid>
-                                                        <Button Content="确认退库" Grid.Column="4" Grid.Row="5" Grid.ColumnSpan="2" Width="330" Height="100"  Margin="100,0,0,0" FontSize="35" Background="#346DFF" Foreground="White" Click="ReturnRawBaseLocaltion_Click"/>
+                                                        <Button Content="确认退库" Grid.Column="4" Grid.Row="5" Grid.ColumnSpan="2" Width="330" Height="100"  Margin="100,0,0,0" FontSize="35" Background="#346DFF" Foreground="White" Click="ReturnRawBaseLocaltion_Click" />
                                                     </StackPanel>
                                                     <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="5" Grid.ColumnSpan="6">
-                                                        <TextBlock Text="物料规格:" Width="260" Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50"/>
+                                                        <TextBlock Text="物料规格:" Width="260" Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50" />
                                                         <Grid>
                                                             <hc:TextBox hc:InfoElement.ShowClearButton="True" IsReadOnly="True" x:Name="returnGG" FontSize="50" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80" />
                                                         </Grid>
                                                     </StackPanel>
                                                     <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="6" Grid.ColumnSpan="6">
-                                                        <TextBlock Text="退库数量:" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50"/>
+                                                        <TextBlock Text="退库数量:" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50" />
                                                         <Grid>
                                                             <Grid.ColumnDefinitions>
-                                                                <ColumnDefinition Width="313*"/>
-                                                                <ColumnDefinition Width="467*"/>
+                                                                <ColumnDefinition Width="313*" />
+                                                                <ColumnDefinition Width="467*" />
                                                             </Grid.ColumnDefinitions>
                                                             <hc:TextBox x:Name="txtReturnScan" Margin="50,0,0,0"  IsReadOnly="True" FontSize="50" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="90" Grid.ColumnSpan="2" />
                                                         </Grid>
-                                                        <Button Content="小车回原点" Grid.Column="4" Grid.Row="6" Grid.ColumnSpan="2" Width="330" Height="100" Margin="100,0,0,0" FontSize="35" Background="#346DFF" Foreground="White" Click="btnBearConfirmBox_Click"/>
+                                                        <Button Content="小车回原点" Grid.Column="4" Grid.Row="6" Grid.ColumnSpan="2" Width="330" Height="100" Margin="100,0,0,0" FontSize="35" Background="#346DFF" Foreground="White" Click="btnBearConfirmBox_Click" />
                                                     </StackPanel>
                                                     <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="7" Grid.ColumnSpan="6">
-                                                        <TextBlock Text="提示信息:" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50"/>
-                                                        <Grid Width="1125" >
+                                                        <TextBlock Text="提示信息:" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50" />
+                                                        <Grid Width="1125">
 
                                                             <TextBlock x:Name="txtReturnMsg" Margin="50,0,0,0"  VerticalAlignment="Center" FontSize="40" HorizontalAlignment="Left"  Height="90" Width="1065" />
                                                         </Grid>
@@ -2405,33 +2358,33 @@
                                             <StackPanel Orientation="Vertical" Margin="20,5,0,0">
                                                 <Grid Width="1650" Height="1000">
                                                     <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="*"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                        <ColumnDefinition Width="0.5*"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                        <ColumnDefinition Width="*"/>
+                                                        <ColumnDefinition Width="*" />
+                                                        <ColumnDefinition Width="*" />
+                                                        <ColumnDefinition Width="*" />
+                                                        <ColumnDefinition Width="0.5*" />
+                                                        <ColumnDefinition Width="*" />
+                                                        <ColumnDefinition Width="*" />
                                                     </Grid.ColumnDefinitions>
                                                     <Grid.RowDefinitions>
-                                                        <RowDefinition Height="*"/>
-                                                        <RowDefinition Height="*"/>
-                                                        <RowDefinition Height="*"/>
-                                                        <RowDefinition Height="*"/>
-                                                        <RowDefinition Height="*"/>
-                                                        <RowDefinition Height="*"/>
-                                                        <RowDefinition Height="*"/>
-                                                        <RowDefinition Height="3*"/>
-                                                        <RowDefinition Height="*"/>
+                                                        <RowDefinition Height="*" />
+                                                        <RowDefinition Height="*" />
+                                                        <RowDefinition Height="*" />
+                                                        <RowDefinition Height="*" />
+                                                        <RowDefinition Height="*" />
+                                                        <RowDefinition Height="*" />
+                                                        <RowDefinition Height="*" />
+                                                        <RowDefinition Height="3*" />
+                                                        <RowDefinition Height="*" />
                                                     </Grid.RowDefinitions>
                                                     <Border BorderBrush="White" BorderThickness="2"  Grid.ColumnSpan="1" Width="150" Grid.Column="4" Grid.RowSpan="2" Margin="20 0 0 0">
 
-                                                        <StackPanel Orientation="Vertical" >
-                                                            <TextBlock x:Name="OutOrder" Text="待出库:" Background="Transparent" Grid.ColumnSpan="2" Grid.RowSpan="2" VerticalAlignment="Top" HorizontalAlignment="Center"/>
+                                                        <StackPanel Orientation="Vertical">
+                                                            <TextBlock x:Name="OutOrder" Text="待出库:" Background="Transparent" Grid.ColumnSpan="2" Grid.RowSpan="2" VerticalAlignment="Top" HorizontalAlignment="Center" />
                                                             <ListBox x:Name='OutEndStations' HorizontalAlignment="Center" Background="Transparent" Foreground="White">
                                                                 <ListBox.ItemTemplate>
                                                                     <DataTemplate>
                                                                         <Grid>
-                                                                            <TextBlock Text="{Binding EndStationName}" Foreground="{Binding ForeColor}" FontSize="25"/>
+                                                                            <TextBlock Text="{Binding EndStationName}" Foreground="{Binding ForeColor}" FontSize="25" />
                                                                         </Grid>
                                                                     </DataTemplate>
                                                                 </ListBox.ItemTemplate>
@@ -2440,17 +2393,15 @@
                                                     </Border>
                                                     <Border BorderBrush="White" BorderThickness="0"  Grid.ColumnSpan="1" Grid.Column="6" Grid.RowSpan="3" Margin="20 0 0 0">
 
-                                                        <StackPanel Orientation="Vertical" >
-
-                                                            <Button x:Name="SelectOutButton" Content="选择出库" Background="#346DFF"  Foreground="White" FontSize="50" Margin="20,0,0,0"  Height="100" Width="250" Click="SelectOutBtn_Click"/>
-                                                            <Button  Content="继续出库" Background="#346DFF"  Foreground="White" FontSize="50" Margin="20,50,0,0"  Height="100" Width="250" Click="ContineOutBtn_Click"/>
+                                                        <StackPanel Orientation="Vertical">
 
+                                                            <Button x:Name="SelectOutButton" Content="选择出库" Background="#346DFF"  Foreground="White" FontSize="50" Margin="20,0,0,0"  Height="100" Width="250" Click="SelectOutBtn_Click" />
+                                                            <Button  Content="继续出库" Background="#346DFF"  Foreground="White" FontSize="50" Margin="20,50,0,0"  Height="100" Width="250" Click="ContineOutBtn_Click" />
                                                         </StackPanel>
                                                     </Border>
 
                                                     <Border BorderBrush="White" BorderThickness="2" Grid.Column="0" Grid.ColumnSpan="6" Grid.Row="7" Grid.RowSpan="2" Margin="20">
 
-
                                                         <DataGrid     Style="{StaticResource DataGridStyle}"
                                                                     Grid.Row="2" AlternationCount="2"
                                                                     AutoGenerateColumns="False"
@@ -2469,20 +2420,18 @@
                                                                     SelectionMode="Single" FontSize="16"
                                                                     Visibility="Visible"
                                                                    VerticalAlignment="Top"
-                                                                  x:Name="OutTaskNumber" >
+                                                                  x:Name="OutTaskNumber">
                                                             <DataGrid.Columns>
                                                                 <DataGridTextColumn
                                                                     Header="物料名称"
                                                                     Binding="{Binding materiaName}"
                                                                     ElementStyle="{StaticResource dgCell}"
-                                                                    Width="*"
-                                                                    />
+                                                                    Width="*" />
                                                                 <DataGridTextColumn
                                                                     Header="物料规格"
                                                                     Binding="{Binding materialSpec}"
                                                                     ElementStyle="{StaticResource dgCell}"
-                                                                    Width="*"
-                                                                    />
+                                                                    Width="*" />
                                                                 <!--<DataGridTextColumn
                                                                     Header="销售订单"
                                                                     Binding="{Binding saleOrderId}"
@@ -2494,46 +2443,40 @@
                                                                     Header="申请数量"
                                                                     Binding="{Binding outstockAmount}"
                                                                     ElementStyle="{StaticResource dgCell}"
-                                                                    Width="*"
-                                                                    />
+                                                                    Width="*" />
 
                                                                 <DataGridTextColumn
                                                                     Header="已出数量"
                                                                     Binding="{Binding realOutstockAmount}"
                                                                     ElementStyle="{StaticResource dgCell}"
-                                                                    Width="*"
-                                                                    />
+                                                                    Width="*" />
                                                                 <DataGridTextColumn
                                                                     Header="目的地"
                                                                     Binding="{Binding EndStationCodes}"
                                                                     Width="*"
-                                                                    ElementStyle="{StaticResource dgCell}"
-                                                                    />
+                                                                    ElementStyle="{StaticResource dgCell}" />
                                                                 <DataGridTextColumn
                                                                     Header="申请时间"
                                                                     Binding="{Binding ApplyTime,StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}"
-                                                                   
+
                                                                     Width="1.2*"
-                                                                    ElementStyle="{StaticResource dgCell}"
-                                                                    />
+                                                                    ElementStyle="{StaticResource dgCell}" />
                                                                 <DataGridTextColumn
                                                                     Header="是否出完"
                                                                     Binding="{Binding isSendOver}"
                                                                     Width="*"
-                                                                    ElementStyle="{StaticResource dgCell}"
-                                                                    />
+                                                                    ElementStyle="{StaticResource dgCell}" />
                                                                 <DataGridTemplateColumn
-                                                   Width="3*" 
+                                                   Width="3*"
                                                    CanUserSort="False"
                                                    Header="料箱携带数量"
-                                                   IsReadOnly="True" >
+                                                   IsReadOnly="True">
                                                                     <DataGridTemplateColumn.CellTemplate>
                                                                         <DataTemplate>
                                                                             <TextBlock TextWrapping="Wrap" Text="{Binding thisOutAmount}" ToolTip="{Binding thisOutAmount}" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="20" />
                                                                         </DataTemplate>
                                                                     </DataGridTemplateColumn.CellTemplate>
                                                                 </DataGridTemplateColumn>
-
                                                             </DataGrid.Columns>
                                                             <DataGrid.CellStyle>
                                                                 <Style TargetType="{x:Type DataGridCell}">
@@ -2541,7 +2484,6 @@
                                                                     <Setter Property="Foreground" Value="White" />
                                                                     <Setter Property="HorizontalContentAlignment" Value="Center" />
                                                                 </Style>
-
                                                             </DataGrid.CellStyle>
                                                             <DataGrid.RowStyle>
                                                                 <Style TargetType="{x:Type DataGridRow}">
@@ -2569,78 +2511,70 @@
                                                             </DataGrid.ColumnHeaderStyle>
                                                         </DataGrid>
                                                     </Border>
-                                                    <!--<TextBlock Text="扫描出库:"  Grid.Column="3" Grid.RowSpan="2" Foreground="White" FontSize="50"   HorizontalAlignment="Center" VerticalAlignment="Center" Grid.ColumnSpan="6"/>-->
-                                                    <TextBlock Text="待执行CTU任务数:" Visibility="Hidden" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Right" VerticalAlignment="Center" FontSize="50"/>
-                                                    <TextBlock x:Name="outTaskCount" Visibility="Hidden" Grid.Row="1" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75"/>
-                                                    <Button Content="执行CTU出库任务" Visibility="Hidden" Grid.Row="1" Grid.Column="3" Grid.ColumnSpan="2" Width="500" Height="100" FontSize="50" Background="#346DFF" Foreground="White" Click="ExecuteCtuTask_Click"/>
+                                                    <!--<TextBlock Text="扫描出库:"  Grid.Column="3" Grid.RowSpan="2" Foreground="White" FontSize="50"   HorizontalAlignment="Center" VerticalAlignment="Center" Grid.ColumnSpan="6" />-->
+                                                    <TextBlock Text="待执行CTU任务数:" Visibility="Hidden" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Right" VerticalAlignment="Center" FontSize="50" />
+                                                    <TextBlock x:Name="outTaskCount" Visibility="Hidden" Grid.Row="1" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" />
+                                                    <Button Content="执行CTU出库任务" Visibility="Hidden" Grid.Row="1" Grid.Column="3" Grid.ColumnSpan="2" Width="500" Height="100" FontSize="50" Background="#346DFF" Foreground="White" Click="ExecuteCtuTask_Click" />
 
                                                     <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="0" Grid.ColumnSpan="6">
-                                                        <TextBlock Text="扫描料箱号:" Width="280" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50"/>
+                                                        <TextBlock Text="扫描料箱号:" Width="280" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50" />
                                                         <Grid>
                                                             <hc:TextBox hc:InfoElement.ShowClearButton="True" x:Name="txtOutBox" FontSize="50" TextChanged="txtOutBox_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80"  Grid.Row="2" Grid.Column="3" Grid.ColumnSpan="3" />
                                                             <Button Click="boxOutClear_Click" HorizontalAlignment="Right" Height="80" Panel.ZIndex="1" Width="100" Margin="0,0,0,0"  Grid.Column="5" Grid.Row="2">
-                                                                <Image Source="..\Resources\cancel.png"/>
+                                                                <Image Source="..\Resources\cancel.png" />
                                                             </Button>
                                                         </Grid>
                                                     </StackPanel>
 
                                                     <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="1" Grid.ColumnSpan="6">
-                                                        <TextBlock Text="扫描条码号:" Width="280" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50"/>
+                                                        <TextBlock Text="扫描条码号:" Width="280" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50" />
                                                         <Grid>
-                                                            <hc:TextBox hc:InfoElement.ShowClearButton="True" x:Name="txtOutBarCode" FontSize="50" TextChanged="txtOutBarCode_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80"  Grid.Row="3" Grid.Column="3" Grid.ColumnSpan="3"/>
+                                                            <hc:TextBox hc:InfoElement.ShowClearButton="True" x:Name="txtOutBarCode" FontSize="50" TextChanged="txtOutBarCode_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80"  Grid.Row="3" Grid.Column="3" Grid.ColumnSpan="3" />
                                                             <Button Click="barOutClear_Click" HorizontalAlignment="Right" Height="80" Panel.ZIndex="1" Width="100" Margin="0,0,0,0"  Grid.Column="5" Grid.Row="3">
-                                                                <Image Source="..\Resources\cancel.png"/>
+                                                                <Image Source="..\Resources\cancel.png" />
                                                             </Button>
                                                         </Grid>
-
                                                     </StackPanel>
 
                                                     <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="2" Grid.ColumnSpan="6">
-                                                        <TextBlock Width="280"  Text="物料名称:" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50"/>
+                                                        <TextBlock Width="280"  Text="物料名称:" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50" />
                                                         <Grid>
-                                                            <hc:TextBox hc:InfoElement.ShowClearButton="True"  IsReadOnly="True" x:Name="outMaterialNameTxt" FontSize="50" LostFocus="txtOutBox_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80"  Grid.Row="2" Grid.Column="3" Grid.ColumnSpan="3"/>
+                                                            <hc:TextBox hc:InfoElement.ShowClearButton="True"  IsReadOnly="True" x:Name="outMaterialNameTxt" FontSize="50" LostFocus="txtOutBox_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80"  Grid.Row="2" Grid.Column="3" Grid.ColumnSpan="3" />
                                                         </Grid>
                                                     </StackPanel>
                                                     <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="3" Grid.ColumnSpan="6">
-                                                        <TextBlock Text="物料规格:" Width="280" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50"/>
+                                                        <TextBlock Text="物料规格:" Width="280" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50" />
                                                         <Grid>
-                                                            <hc:TextBox hc:InfoElement.ShowClearButton="True" IsReadOnly="True" x:Name="outMaterialSpecTxt" FontSize="50" LostFocus="txtOutBarCode_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80"  Grid.Row="3" Grid.Column="3" Grid.ColumnSpan="3"/>
+                                                            <hc:TextBox hc:InfoElement.ShowClearButton="True" IsReadOnly="True" x:Name="outMaterialSpecTxt" FontSize="50" LostFocus="txtOutBarCode_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80"  Grid.Row="3" Grid.Column="3" Grid.ColumnSpan="3" />
                                                         </Grid>
-                                                        <Button Content="确认出库" Grid.Column="4" Grid.Row="3" Grid.ColumnSpan="2" Width="400" Height="75" Margin="100,0,0,0" FontSize="35" Background="#346DFF" Foreground="White" Click="OutRawBaseLocaltion_Click"/>
-
+                                                        <Button Content="确认出库" Grid.Column="4" Grid.Row="3" Grid.ColumnSpan="2" Width="400" Height="75" Margin="100,0,0,0" FontSize="35" Background="#346DFF" Foreground="White" Click="OutRawBaseLocaltion_Click" />
                                                     </StackPanel>
                                                     <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="4" Grid.ColumnSpan="6">
-                                                        <TextBlock Text="库存:" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50"/>
+                                                        <TextBlock Text="库存:" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50" />
                                                         <Grid>
                                                             <hc:TextBox x:Name="txtTotalAmount" Margin="0,0,0,0"  IsReadOnly="True" FontSize="50" Width="300" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80"  Grid.Row="4" Grid.Column="3" Grid.ColumnSpan="3" KeyDown="OutEnter" />
                                                         </Grid>
 
-                                                        <TextBlock Text="出库数量:"  Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50" Margin="63 0 0 0"/>
+                                                        <TextBlock Text="出库数量:"  Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50" Margin="63 0 0 0" />
                                                         <Grid>
                                                             <hc:TextBox x:Name="txtOutScan" Margin="0,0,0,0"  FontSize="50" Width="300" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80"  Grid.Row="4" Grid.Column="3" Grid.ColumnSpan="3" KeyDown="OutEnter" />
                                                         </Grid>
-                                                        <Button Content="背负式小车捡料完成" Grid.Column="4" Grid.Row="6" Grid.ColumnSpan="2" Width="400" Height="75" Margin="100,0,0,0" FontSize="35" Background="#346DFF" Foreground="White" Click="btnBearConfirmBox_Click"/>
-
-
+                                                        <Button Content="背负式小车捡料完成" Grid.Column="4" Grid.Row="6" Grid.ColumnSpan="2" Width="400" Height="75" Margin="100,0,0,0" FontSize="35" Background="#346DFF" Foreground="White" Click="btnBearConfirmBox_Click" />
                                                     </StackPanel>
 
                                                     <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="5" Grid.ColumnSpan="6">
-                                                        <TextBlock Text="备注信息:" Width="280" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50"/>
+                                                        <TextBlock Text="备注信息:" Width="280" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50" />
                                                         <Grid>
-                                                            <hc:TextBox hc:InfoElement.ShowClearButton="True" x:Name="remarks" FontSize="50" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80"  Grid.Row="3" Grid.Column="3" Grid.ColumnSpan="3"/>
+                                                            <hc:TextBox hc:InfoElement.ShowClearButton="True" x:Name="remarks" FontSize="50" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80"  Grid.Row="3" Grid.Column="3" Grid.ColumnSpan="3" />
                                                         </Grid>
-                                                        <Button Content="创建背负小车任务" Grid.Column="4" Grid.Row="6" Grid.ColumnSpan="2" Width="400" Height="75" Margin="100,0,0,0" FontSize="35" Background="#346DFF" Foreground="White" Click="createBearConfirmBox_Click"/>
-
+                                                        <Button Content="创建背负小车任务" Grid.Column="4" Grid.Row="6" Grid.ColumnSpan="2" Width="400" Height="75" Margin="100,0,0,0" FontSize="35" Background="#346DFF" Foreground="White" Click="createBearConfirmBox_Click" />
                                                     </StackPanel>
                                                     <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="6" Grid.ColumnSpan="6">
-                                                        <TextBlock Text="提示信息:" Width="280" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50"/>
+                                                        <TextBlock Text="提示信息:" Width="280" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50" />
                                                         <Grid>
-                                                            <TextBlock  x:Name="scanOutMsg"  hc:InfoElement.ShowClearButton="True"  FontSize="50"  Width="1300" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80"  Grid.Row="3" Grid.Column="3" Grid.ColumnSpan="4"/>
+                                                            <TextBlock  x:Name="scanOutMsg"  hc:InfoElement.ShowClearButton="True"  FontSize="50"  Width="1300" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80"  Grid.Row="3" Grid.Column="3" Grid.ColumnSpan="4" />
                                                         </Grid>
-
                                                     </StackPanel>
-
-
                                                 </Grid>
                                                 <!--<Border Background="#213269" BorderBrush="Silver" BorderThickness="2" CornerRadius="10" Width="900" Height="500" Margin="0,5,0,0">
                           <StackPanel Margin="0,10,10,10">
@@ -2649,32 +2583,28 @@
                       Height="37"
                       Text="业务类型 :"
                       FontSize="25"  Margin="0,20,750,-60"
-                                   Foreground="White" 
-                    />
+                                   Foreground="White" />
                               <TextBlock x:Name="cbxType" Margin="0,20,400,0" Width="180" Height="50" Text="入库" />
 
-
                               <TextBlock
       Width="152"
       Height="36"
       Text="料箱 :"
       FontSize="25"  Margin="0,30,750,-60"
-                   Foreground="White" 
-    />
+                   Foreground="White" />
                               <TextBox x:Name="txtBox"   Style="{StaticResource XingHaoBianMaYangShi}" IsEnabled="true"
-        Width="180" Height="50" Margin="0,15,400,0" KeyDown="txtBox_KeyDown"/>
+        Width="180" Height="50" Margin="0,15,400,0" KeyDown="txtBox_KeyDown" />
                               <TextBlock
       Width="152"
       Height="39"
       Text="条码:"
       FontSize="25"  Margin="0,20,750,-60"
-                   Foreground="White" 
-    />
+                   Foreground="White" />
                               <TextBox x:Name="txtBarCode"   Style="{StaticResource XingHaoBianMaYangShi}" IsEnabled="true"
-        Width="180" Height="50" Margin="0,20,400,0" TextChanged="txtBarCode_KeyDown"/>
+        Width="180" Height="50" Margin="0,20,400,0" TextChanged="txtBarCode_KeyDown" />
                               <Button Content="清除料箱条码" FontSize="25" Margin="400,-180,10,0" HorizontalAlignment="Left" Foreground="White" Height="50"  Width="170" Click="clearRFID_Click">
-                                  <Button.Template >
-                                      <ControlTemplate TargetType="{x:Type Button}" >
+                                  <Button.Template>
+                                      <ControlTemplate TargetType="{x:Type Button}">
                                           <Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="4,4,4,4">
                                               <Border.Background>#346DFF</Border.Background>
                                               <ContentPresenter Content="{TemplateBinding ContentControl.Content}" HorizontalAlignment="Center" VerticalAlignment="Center" ></ContentPresenter>
@@ -2683,8 +2613,8 @@
                                   </Button.Template>
                               </Button>
                               <Button Content="清除条码" FontSize="25" Margin="400,-50,10,0" HorizontalAlignment="Left" Foreground="White" Height="50"  Width="170" Click="clearBarCode_Click">
-                                  <Button.Template >
-                                      <ControlTemplate TargetType="{x:Type Button}" >
+                                  <Button.Template>
+                                      <ControlTemplate TargetType="{x:Type Button}">
                                           <Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="4,4,4,4">
                                               <Border.Background>#346DFF</Border.Background>
                                               <ContentPresenter Content="{TemplateBinding ContentControl.Content}" HorizontalAlignment="Center" VerticalAlignment="Center" ></ContentPresenter>
@@ -2697,14 +2627,13 @@
       Height="42"
       Text="已扫描数量:"
       FontSize="25"  Margin="0,20,750,-60"
-                   Foreground="White" 
-    />
+                   Foreground="White" />
                               <TextBox x:Name="txtScan"   Style="{StaticResource XingHaoBianMaYangShi}" IsReadOnly="True"
         Width="180" Height="50" Margin="0,10,400,0" IsEnabled="False" />
 
                               <Button Content="确认" FontSize="25" Margin="150,30,10,0" HorizontalAlignment="Left" Foreground="White" Height="50"  Width="132" Click="btnConfirmBox_Click">
-                                  <Button.Template >
-                                      <ControlTemplate TargetType="{x:Type Button}" >
+                                  <Button.Template>
+                                      <ControlTemplate TargetType="{x:Type Button}">
                                           <Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="4,4,4,4">
                                               <Border.Background>#346DFF</Border.Background>
                                               <ContentPresenter Content="{TemplateBinding ContentControl.Content}" HorizontalAlignment="Center" VerticalAlignment="Center" ></ContentPresenter>
@@ -2714,8 +2643,8 @@
                               </Button>
 
                               <Button Content="背负式小车捡料完成" FontSize="25" Margin="50,50,10,0" HorizontalAlignment="Left" Foreground="White" Height="50"  Width="300" Click="btnBearConfirmBox_Click">
-                                  <Button.Template >
-                                      <ControlTemplate TargetType="{x:Type Button}" >
+                                  <Button.Template>
+                                      <ControlTemplate TargetType="{x:Type Button}">
                                           <Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="4,4,4,4">
                                               <Border.Background>#346DFF</Border.Background>
                                               <ContentPresenter Content="{TemplateBinding ContentControl.Content}" HorizontalAlignment="Center" VerticalAlignment="Center" ></ContentPresenter>
@@ -2725,8 +2654,8 @@
                               </Button>
 
                               <Button Content="执行小车入库任务" FontSize="25" Margin="500,-50,10,0" HorizontalAlignment="Left" Foreground="White" Height="50"  Width="300" Click="btnCtuInConfirmBox_Click">
-                                  <Button.Template >
-                                      <ControlTemplate TargetType="{x:Type Button}" >
+                                  <Button.Template>
+                                      <ControlTemplate TargetType="{x:Type Button}">
                                           <Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="4,4,4,4">
                                               <Border.Background>#346DFF</Border.Background>
                                               <ContentPresenter Content="{TemplateBinding ContentControl.Content}" HorizontalAlignment="Center" VerticalAlignment="Center" ></ContentPresenter>
@@ -2743,134 +2672,128 @@
                                 <TabItem x:Name="RemoveManager" Header="辅料移库" Style="{StaticResource DefaultItem}"  FontSize="25" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="#213269"  Foreground="White" Width="160" Height="80"  Margin="5">
                                     <Grid Height="1100" Width="1700">
                                         <Grid.RowDefinitions>
-                                            <RowDefinition Height="*"/>
-                                            <RowDefinition Height="*"/>
-                                            <RowDefinition Height="*"/>
-                                            <RowDefinition Height="*"/>
-                                            <RowDefinition Height="*"/>
-                                            <RowDefinition Height="*"/>
-                                            <RowDefinition Height="*"/>
-                                            <RowDefinition Height="*"/>
+                                            <RowDefinition Height="*" />
+                                            <RowDefinition Height="*" />
+                                            <RowDefinition Height="*" />
+                                            <RowDefinition Height="*" />
+                                            <RowDefinition Height="*" />
+                                            <RowDefinition Height="*" />
+                                            <RowDefinition Height="*" />
+                                            <RowDefinition Height="*" />
                                         </Grid.RowDefinitions>
                                         <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="*"/>
-                                            <ColumnDefinition Width="*"/>
-                                            <ColumnDefinition Width="*"/>
-                                            <ColumnDefinition Width="*"/>
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="*" />
                                         </Grid.ColumnDefinitions>
-                                        <TextBlock Text="辅料移库" FontSize="50" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Column="0" Grid.ColumnSpan="4"/>
+                                        <TextBlock Text="辅料移库" FontSize="50" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Column="0" Grid.ColumnSpan="4" />
 
                                         <StackPanel Orientation="Horizontal" Grid.Row="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" Margin="5">
-                                            <TextBlock Text="原料箱号:" FontSize="40" VerticalAlignment="Center" HorizontalAlignment="Left"/>
-                                            <hc:TextBox x:Name="rawSourceBox" TextChanged="rawSourceBox_TextChanged" FontSize="40" Width="600" Height="100" Margin="0,0,0,0" hc:InfoElement.ShowClearButton="True"/>
+                                            <TextBlock Text="原料箱号:" FontSize="40" VerticalAlignment="Center" HorizontalAlignment="Left" />
+                                            <hc:TextBox x:Name="rawSourceBox" TextChanged="rawSourceBox_TextChanged" FontSize="40" Width="600" Height="100" Margin="0,0,0,0" hc:InfoElement.ShowClearButton="True" />
                                             <Button Click="rawSourceBoxClear_Click" HorizontalAlignment="Right" Height="100" Panel.ZIndex="1" Width="100" Margin="-100,0,0,0"  Grid.Column="5" Grid.Row="2">
-                                                <Image Source="..\Resources\cancel.png"/>
+                                                <Image Source="..\Resources\cancel.png" />
                                             </Button>
                                         </StackPanel>
                                         <StackPanel Orientation="Horizontal" Grid.Row="2" Grid.ColumnSpan="2" HorizontalAlignment="Center" Margin="5">
-                                            <TextBlock Text="原条码号:" FontSize="40" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                                            <hc:TextBox x:Name="rawSourceBarCode" FontSize="40"  TextChanged="rawSourceBarCode_TextChanged" Width="600" Height="100" Margin="0,0,0,0" hc:InfoElement.ShowClearButton="True"/>
+                                            <TextBlock Text="原条码号:" FontSize="40" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                                            <hc:TextBox x:Name="rawSourceBarCode" FontSize="40"  TextChanged="rawSourceBarCode_TextChanged" Width="600" Height="100" Margin="0,0,0,0" hc:InfoElement.ShowClearButton="True" />
                                             <Button  Click="rawSourceBarCodeClear_Click" HorizontalAlignment="Right" Height="100" Panel.ZIndex="1" Width="100" Margin="-100,0,0,0"  Grid.Column="5" Grid.Row="2">
-                                                <Image Source="..\Resources\cancel.png"/>
+                                                <Image Source="..\Resources\cancel.png" />
                                             </Button>
                                         </StackPanel>
 
                                         <StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="2" HorizontalAlignment="Center" Margin="5">
-                                            <TextBlock Text="移库料箱:" FontSize="40" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                                            <hc:TextBox x:Name="removeSourceBox" FontSize="40"  TextChanged="removeSourceBox_TextChanged" Width="600" Height="100" Margin="0,0,0,0" hc:InfoElement.ShowClearButton="True"/>
+                                            <TextBlock Text="移库料箱:" FontSize="40" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                                            <hc:TextBox x:Name="removeSourceBox" FontSize="40"  TextChanged="removeSourceBox_TextChanged" Width="600" Height="100" Margin="0,0,0,0" hc:InfoElement.ShowClearButton="True" />
                                             <Button Click="removeSourceBoxClear_Click" HorizontalAlignment="Right" Height="100" Panel.ZIndex="1" Width="100" Margin="-100,0,0,0"  Grid.Column="5" Grid.Row="2">
-                                                <Image Source="..\Resources\cancel.png"/>
+                                                <Image Source="..\Resources\cancel.png" />
                                             </Button>
                                         </StackPanel>
 
-
                                         <StackPanel Orientation="Horizontal" Grid.Row="2" Grid.Column="2" Grid.ColumnSpan="2" HorizontalAlignment="Center" Margin="5">
-                                            <TextBlock Text="移库条码:" FontSize="40" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                                            <hc:TextBox x:Name="removeSourceBarCode" FontSize="40"  TextChanged="removeSourceBarCode_TextChanged" Width="600" Height="100" Margin="0,0,0,0" hc:InfoElement.ShowClearButton="True"/>
+                                            <TextBlock Text="移库条码:" FontSize="40" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                                            <hc:TextBox x:Name="removeSourceBarCode" FontSize="40"  TextChanged="removeSourceBarCode_TextChanged" Width="600" Height="100" Margin="0,0,0,0" hc:InfoElement.ShowClearButton="True" />
                                             <Button  Click="removeSourceBarCodeClear_Click" HorizontalAlignment="Right" Height="100" Panel.ZIndex="1" Width="100" Margin="-100,0,0,0"  Grid.Column="5" Grid.Row="2">
-                                                <Image Source="..\Resources\cancel.png"/>
+                                                <Image Source="..\Resources\cancel.png" />
                                             </Button>
                                         </StackPanel>
 
                                         <StackPanel Orientation="Horizontal" Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" Margin="5">
-                                            <TextBlock Text="物料名称:" FontSize="40" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                                            <hc:TextBox x:Name="rawSourceMaterialName" FontSize="40"   Width="600" Height="100" Margin="0,0,0,0" hc:InfoElement.ShowClearButton="True"/>
+                                            <TextBlock Text="物料名称:" FontSize="40" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                                            <hc:TextBox x:Name="rawSourceMaterialName" FontSize="40"   Width="600" Height="100" Margin="0,0,0,0" hc:InfoElement.ShowClearButton="True" />
                                         </StackPanel>
                                         <StackPanel Orientation="Horizontal" Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" Margin="5">
-                                            <TextBlock Text="物料规格:" FontSize="40" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                                            <hc:TextBox x:Name="rawSourceMaterialSpec" FontSize="40"   Width="600" Height="100" Margin="0,0,0,0" hc:InfoElement.ShowClearButton="True"/>
+                                            <TextBlock Text="物料规格:" FontSize="40" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                                            <hc:TextBox x:Name="rawSourceMaterialSpec" FontSize="40"   Width="600" Height="100" Margin="0,0,0,0" hc:InfoElement.ShowClearButton="True" />
                                         </StackPanel>
 
                                         <StackPanel Orientation="Horizontal" Grid.Row="3" Grid.Column="2" Grid.ColumnSpan="2" HorizontalAlignment="Center" Margin="5">
-                                            <TextBlock Text="物料名称:" FontSize="40" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                                            <hc:TextBox x:Name="removeSourceMaterialName" FontSize="40"   Width="600" Height="100" Margin="0,0,0,0" hc:InfoElement.ShowClearButton="True"/>
+                                            <TextBlock Text="物料名称:" FontSize="40" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                                            <hc:TextBox x:Name="removeSourceMaterialName" FontSize="40"   Width="600" Height="100" Margin="0,0,0,0" hc:InfoElement.ShowClearButton="True" />
                                         </StackPanel>
 
-
                                         <StackPanel Orientation="Horizontal" Grid.Row="4" Grid.Column="2" Grid.ColumnSpan="2" HorizontalAlignment="Center" Margin="5">
-                                            <TextBlock Text="物料规格:" FontSize="40" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                                            <hc:TextBox x:Name="removeSourceMaterialSpec" FontSize="40"   Width="600" Height="100" Margin="0,0,0,0" hc:InfoElement.ShowClearButton="True"/>
+                                            <TextBlock Text="物料规格:" FontSize="40" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                                            <hc:TextBox x:Name="removeSourceMaterialSpec" FontSize="40"   Width="600" Height="100" Margin="0,0,0,0" hc:InfoElement.ShowClearButton="True" />
                                         </StackPanel>
 
-
                                         <StackPanel Orientation="Horizontal" Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" Margin="5">
-                                            <TextBlock Text="移库数量:" FontSize="40" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                                            <hc:TextBox x:Name="removeScan" FontSize="40"   Width="600" Height="100" Margin="0,0,0,0" hc:InfoElement.ShowClearButton="True"/>
-
+                                            <TextBlock Text="移库数量:" FontSize="40" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                                            <hc:TextBox x:Name="removeScan" FontSize="40"   Width="600" Height="100" Margin="0,0,0,0" hc:InfoElement.ShowClearButton="True" />
                                         </StackPanel>
                                         <StackPanel Orientation="Horizontal" Grid.Row="5" Grid.Column="2" Grid.ColumnSpan="2" HorizontalAlignment="Center" Margin="5">
-                                            <TextBlock Text="物料库存:" FontSize="40" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                                            <hc:TextBox x:Name="removeTotalStock" FontSize="40"   Width="600" Height="100" Margin="0,0,0,0" hc:InfoElement.ShowClearButton="True"/>
-
+                                            <TextBlock Text="物料库存:" FontSize="40" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                                            <hc:TextBox x:Name="removeTotalStock" FontSize="40"   Width="600" Height="100" Margin="0,0,0,0" hc:InfoElement.ShowClearButton="True" />
                                         </StackPanel>
-                                        <Button Content="确认移库" Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="4" Width="500" Height="150" FontSize="75" Background="#346DFF" Foreground="White" Click="btnRemoveConfirmBox_Click"/>
+                                        <Button Content="确认移库" Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="4" Width="500" Height="150" FontSize="75" Background="#346DFF" Foreground="White" Click="btnRemoveConfirmBox_Click" />
 
                                         <StackPanel Orientation="Horizontal" Grid.Row="7" Grid.Column="0" Grid.ColumnSpan="4" HorizontalAlignment="Left" Margin="100 0 0 0 ">
-                                            <TextBlock Text="提示信息:" FontSize="40" VerticalAlignment="Center" HorizontalAlignment="Left"/>
+                                            <TextBlock Text="提示信息:" FontSize="40" VerticalAlignment="Center" HorizontalAlignment="Left" />
                                             <TextBlock x:Name="RemoveMsg"    HorizontalAlignment="Left"  FontSize="40" Foreground="White" Width="1200" Height="60" Margin="10,0,0,0" />
                                         </StackPanel>
-
                                     </Grid>
                                 </TabItem>
                                 <TabItem x:Name="FirstFloorManager" Header="一楼接驳" Style="{StaticResource DefaultItem}"  FontSize="25" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="#213269"  Foreground="White" Width="160" Height="80"  Margin="5">
                                     <Grid Height="1100" Width="1700">
                                         <Grid.RowDefinitions>
-                                            <RowDefinition Height="*"/>
-                                            <RowDefinition Height="*"/>
+                                            <RowDefinition Height="*" />
+                                            <RowDefinition Height="*" />
                                         </Grid.RowDefinitions>
                                         <Border BorderBrush="White" BorderThickness="2">
-                                            <Grid >
+                                            <Grid>
                                                 <Grid.RowDefinitions>
-                                                    <RowDefinition Height="*"/>
-                                                    <RowDefinition Height="*"/>
-                                                    <RowDefinition Height="*"/>
+                                                    <RowDefinition Height="*" />
+                                                    <RowDefinition Height="*" />
+                                                    <RowDefinition Height="*" />
                                                 </Grid.RowDefinitions>
                                                 <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="*"/>
-                                                    <ColumnDefinition Width="*"/>
-                                                    <ColumnDefinition Width="*"/>
-                                                    <ColumnDefinition Width="*"/>
+                                                    <ColumnDefinition Width="*" />
+                                                    <ColumnDefinition Width="*" />
+                                                    <ColumnDefinition Width="*" />
+                                                    <ColumnDefinition Width="*" />
                                                 </Grid.ColumnDefinitions>
-                                                <TextBlock Text="托盘库内托盘数量:" FontSize="75" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Column="0" Grid.ColumnSpan="2"/>
-                                                <TextBlock x:Name="DDJEmptyCount"  FontSize="75" VerticalAlignment="Center" HorizontalAlignment="Left" Grid.Column="2" Grid.ColumnSpan="2"/>
-                                                <Button x:Name="OneIn" Background="#346DFF" Foreground="White" Content="入一个空托盘" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center" Width="500" Height="150" FontSize="75" Click="OneIn_Click"/>
-                                                <Button Background="#346DFF" Foreground="White" Content="修改" Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center" Width="300" Height="150" FontSize="75" Click="UpdateEmpty_Click"/>
-                                                <Button x:Name="SomeIn" Background="#346DFF" Foreground="White" Content="入一螺空托盘" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center" Width="500" Height="150" FontSize="75" Click="SomeIn_Click"/>
-                                                <Button x:Name="OneOut" Background="#346DFF" Foreground="White" Content="出一个空托盘" Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center" Width="500" Height="150" FontSize="75" Click="OneOut_Click"/>
-                                                <Button x:Name="SomeOut" Background="#346DFF" Foreground="White" Content="出一螺空托盘" Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center" Width="500" Height="150" FontSize="75" Click="SomeOut_Click"/>
+                                                <TextBlock Text="托盘库内托盘数量:" FontSize="75" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Column="0" Grid.ColumnSpan="2" />
+                                                <TextBlock x:Name="DDJEmptyCount"  FontSize="75" VerticalAlignment="Center" HorizontalAlignment="Left" Grid.Column="2" Grid.ColumnSpan="2" />
+                                                <Button x:Name="OneIn" Background="#346DFF" Foreground="White" Content="入一个空托盘" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center" Width="500" Height="150" FontSize="75" Click="OneIn_Click" />
+                                                <Button Background="#346DFF" Foreground="White" Content="修改" Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center" Width="300" Height="150" FontSize="75" Click="UpdateEmpty_Click" />
+                                                <Button x:Name="SomeIn" Background="#346DFF" Foreground="White" Content="入一螺空托盘" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center" Width="500" Height="150" FontSize="75" Click="SomeIn_Click" />
+                                                <Button x:Name="OneOut" Background="#346DFF" Foreground="White" Content="出一个空托盘" Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center" Width="500" Height="150" FontSize="75" Click="OneOut_Click" />
+                                                <Button x:Name="SomeOut" Background="#346DFF" Foreground="White" Content="出一螺空托盘" Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center" Width="500" Height="150" FontSize="75" Click="SomeOut_Click" />
                                             </Grid>
                                         </Border>
                                         <Border Grid.Row="1" BorderBrush="White" BorderThickness="2" Height="300">
                                             <Grid>
                                                 <Grid.RowDefinitions>
-                                                    <RowDefinition Height='*'/>
-                                                    <RowDefinition Height='*'/>
+                                                    <RowDefinition Height='*' />
+                                                    <RowDefinition Height='*' />
                                                 </Grid.RowDefinitions>
-                                                <TextBlock Text="一楼接驳位确认入库(托盘上次绑定物料与这次相同需确认)" FontSize="50" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                                                <TextBlock Text="一楼接驳位确认入库(托盘上次绑定物料与这次相同需确认)" FontSize="50" VerticalAlignment="Center" HorizontalAlignment="Center" />
                                                 <StackPanel Orientation="Horizontal" Grid.Row="1" HorizontalAlignment="Center">
-                                                    <TextBlock Text="RFID:" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="50" Margin="10"/>
-                                                    <TextBlock x:Name="firstRFID" Width="500" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="50" Margin="20,0,0,0"/>
-                                                    <Button x:Name="querenruku" Content="确认入库" Background="#346DFF" Foreground="White" Width="150" Height="75" FontSize="30" Margin="30" Click="querenruku_Click"/>
+                                                    <TextBlock Text="RFID:" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="50" Margin="10" />
+                                                    <TextBlock x:Name="firstRFID" Width="500" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="50" Margin="20,0,0,0" />
+                                                    <Button x:Name="querenruku" Content="确认入库" Background="#346DFF" Foreground="White" Width="150" Height="75" FontSize="30" Margin="30" Click="querenruku_Click" />
                                                 </StackPanel>
                                             </Grid>
                                         </Border>
@@ -2886,11 +2809,11 @@
                                 Width="40"
                                 Height="35"
                                 Margin="60,0,0,0"
-                                Source="..\Resources\chanpintiaoma.png" Visibility="Visible"/>
-                                                    <TextBlock Text="PLC交互信息" Foreground="White" FontSize="20" Width="150" Height="40" Margin="10,10,80,0"/>
+                                Source="..\Resources\chanpintiaoma.png" Visibility="Visible" />
+                                                    <TextBlock Text="PLC交互信息" Foreground="White" FontSize="20" Width="150" Height="40" Margin="10,10,80,0" />
                                                     <!--<Button  Content="刷新" FontSize="25" Foreground="White" Height="50"  Width="132" Click="btnRefreshPlc_Click">
-                                                        <Button.Template >
-                                                            <ControlTemplate TargetType="{x:Type Button}" >
+                                                        <Button.Template>
+                                                            <ControlTemplate TargetType="{x:Type Button}">
                                                                 <Border BorderBrush="{TemplateBinding Control.BorderBrush}" BorderThickness="1" CornerRadius="4,4,4,4">
                                                                     <Border.Background>#346DFF</Border.Background>
                                                                     <ContentPresenter Content="{TemplateBinding ContentControl.Content}" HorizontalAlignment="Center" VerticalAlignment="Center" ></ContentPresenter>
@@ -2902,121 +2825,120 @@
                                                 <Border Background="#213269" BorderBrush="Silver" BorderThickness="2" CornerRadius="10" Width="700" Height="550" Margin="0,5,0,0">
                                                     <Grid x:Name="JBW">
                                                         <Grid.ColumnDefinitions>
-                                                            <ColumnDefinition Width="1.5*"/>
-                                                            <ColumnDefinition Width="2*"/>
-                                                            <ColumnDefinition Width="*"/>
-                                                            <ColumnDefinition Width="*"/>
+                                                            <ColumnDefinition Width="1.5*" />
+                                                            <ColumnDefinition Width="2*" />
+                                                            <ColumnDefinition Width="*" />
+                                                            <ColumnDefinition Width="*" />
                                                         </Grid.ColumnDefinitions>
                                                         <Grid.RowDefinitions>
-                                                            <RowDefinition Height="*"/>
-                                                            <RowDefinition Height="*"/>
-                                                            <RowDefinition Height="*"/>
-                                                            <RowDefinition Height="*"/>
-                                                            <RowDefinition Height="*"/>
-                                                            <RowDefinition Height="*"/>
-                                                            <RowDefinition Height="*"/>
+                                                            <RowDefinition Height="*" />
+                                                            <RowDefinition Height="*" />
+                                                            <RowDefinition Height="*" />
+                                                            <RowDefinition Height="*" />
+                                                            <RowDefinition Height="*" />
+                                                            <RowDefinition Height="*" />
+                                                            <RowDefinition Height="*" />
                                                         </Grid.RowDefinitions>
-                                                        <TextBlock Text="接驳位" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.ColumnSpan="6" FontSize="40"/>
-                                                        <TextBlock Text="RFID" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1" Grid.Row="1" FontSize="25"/>
-                                                        <TextBlock Text="到位" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="2" Grid.Row="1" FontSize="25"/>
-                                                        <TextBlock Text="去向" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="3" Grid.Row="1" FontSize="25"/>
-                                                        <TextBlock Text="一楼接驳位" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="0" Grid.Row="2" FontSize="25"/>
-                                                        <TextBlock x:Name="RFID001" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1" Grid.Row="2" FontSize="25"/>
-                                                        <TextBlock x:Name="linesignal01" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="2" Grid.Row="2" FontSize="25"/>
-                                                        <TextBlock x:Name="wcsrun01" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="3" Grid.Row="2" FontSize="25"/>
+                                                        <TextBlock Text="接驳位" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.ColumnSpan="6" FontSize="40" />
+                                                        <TextBlock Text="RFID" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1" Grid.Row="1" FontSize="25" />
+                                                        <TextBlock Text="到位" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="2" Grid.Row="1" FontSize="25" />
+                                                        <TextBlock Text="去向" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="3" Grid.Row="1" FontSize="25" />
+                                                        <TextBlock Text="一楼接驳位" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="0" Grid.Row="2" FontSize="25" />
+                                                        <TextBlock x:Name="RFID001" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1" Grid.Row="2" FontSize="25" />
+                                                        <TextBlock x:Name="linesignal01" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="2" Grid.Row="2" FontSize="25" />
+                                                        <TextBlock x:Name="wcsrun01" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="3" Grid.Row="2" FontSize="25" />
 
-                                                        <TextBlock Text="二楼接驳位" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="0" Grid.Row="3" FontSize="25"/>
-                                                        <TextBlock x:Name="RFID002" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1" Grid.Row="3" FontSize="25"/>
-                                                        <TextBlock x:Name="linesignal02" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="2" Grid.Row="3" FontSize="25"/>
-                                                        <TextBlock x:Name="wcsrun02" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="3" Grid.Row="3" FontSize="25"/>
+                                                        <TextBlock Text="二楼接驳位" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="0" Grid.Row="3" FontSize="25" />
+                                                        <TextBlock x:Name="RFID002" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1" Grid.Row="3" FontSize="25" />
+                                                        <TextBlock x:Name="linesignal02" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="2" Grid.Row="3" FontSize="25" />
+                                                        <TextBlock x:Name="wcsrun02" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="3" Grid.Row="3" FontSize="25" />
 
-                                                        <TextBlock Text="三楼接驳位" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="0" Grid.Row="4" FontSize="25"/>
-                                                        <TextBlock x:Name="RFID003" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1" Grid.Row="4" FontSize="25"/>
-                                                        <TextBlock x:Name="linesignal03" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="2" Grid.Row="4" FontSize="25"/>
-                                                        <TextBlock x:Name="wcsrun03" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="3" Grid.Row="4" FontSize="25"/>
+                                                        <TextBlock Text="三楼接驳位" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="0" Grid.Row="4" FontSize="25" />
+                                                        <TextBlock x:Name="RFID003" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1" Grid.Row="4" FontSize="25" />
+                                                        <TextBlock x:Name="linesignal03" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="2" Grid.Row="4" FontSize="25" />
+                                                        <TextBlock x:Name="wcsrun03" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="3" Grid.Row="4" FontSize="25" />
 
-                                                        <TextBlock Text="四楼接驳位" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="0" Grid.Row="5" FontSize="25"/>
-                                                        <TextBlock x:Name="RFID004" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1" Grid.Row="5" FontSize="25"/>
-                                                        <TextBlock x:Name="linesignal04" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="2" Grid.Row="5" FontSize="25"/>
-                                                        <TextBlock x:Name="wcsrun04" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="3" Grid.Row="5" FontSize="25"/>
+                                                        <TextBlock Text="四楼接驳位" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="0" Grid.Row="5" FontSize="25" />
+                                                        <TextBlock x:Name="RFID004" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1" Grid.Row="5" FontSize="25" />
+                                                        <TextBlock x:Name="linesignal04" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="2" Grid.Row="5" FontSize="25" />
+                                                        <TextBlock x:Name="wcsrun04" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="3" Grid.Row="5" FontSize="25" />
 
-                                                        <TextBlock Text="五楼接驳位" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="0" Grid.Row="6" FontSize="25"/>
-                                                        <TextBlock x:Name="RFID005" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1" Grid.Row="6" FontSize="25"/>
-                                                        <TextBlock x:Name="linesignal05" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="2" Grid.Row="6" FontSize="25"/>
-                                                        <TextBlock x:Name="wcsrun05" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="3" Grid.Row="6" FontSize="25"/>
+                                                        <TextBlock Text="五楼接驳位" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="0" Grid.Row="6" FontSize="25" />
+                                                        <TextBlock x:Name="RFID005" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1" Grid.Row="6" FontSize="25" />
+                                                        <TextBlock x:Name="linesignal05" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="2" Grid.Row="6" FontSize="25" />
+                                                        <TextBlock x:Name="wcsrun05" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="3" Grid.Row="6" FontSize="25" />
                                                     </Grid>
-
                                                 </Border>
                                                 <Border Background="#213269" BorderBrush="Silver" BorderThickness="2" CornerRadius="10" Width="700" Height="350" Margin="0,30,0,0">
                                                     <Grid x:Name="UXX">
                                                         <Grid.ColumnDefinitions>
-                                                            <ColumnDefinition Width="*"/>
-                                                            <ColumnDefinition Width="2*"/>
-                                                            <ColumnDefinition Width="*"/>
+                                                            <ColumnDefinition Width="*" />
+                                                            <ColumnDefinition Width="2*" />
+                                                            <ColumnDefinition Width="*" />
                                                         </Grid.ColumnDefinitions>
                                                         <Grid.RowDefinitions>
-                                                            <RowDefinition Height="*"/>
-                                                            <RowDefinition Height="*"/>
-                                                            <RowDefinition Height="*"/>
+                                                            <RowDefinition Height="*" />
+                                                            <RowDefinition Height="*" />
+                                                            <RowDefinition Height="*" />
                                                         </Grid.RowDefinitions>
-                                                        <TextBlock Text="五楼U型线" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.ColumnSpan="3" FontSize="40"/>
-                                                        <TextBlock Text="允许放" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="0" Grid.Row="1" FontSize="25"/>
-                                                        <TextBlock Text="允许取" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="2" Grid.Row="1" FontSize="25"/>
-                                                        <TextBlock Text="RFID" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1" Grid.Row="1" FontSize="25"/>
-                                                        <TextBlock x:Name="isput" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="0" Grid.Row="2" FontSize="25"/>
-                                                        <TextBlock x:Name="isarrive" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="2" Grid.Row="2" FontSize="25"/>
-                                                        <TextBlock x:Name="RFID5001" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1" Grid.Row="2" FontSize="25"/>
+                                                        <TextBlock Text="五楼U型线" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.ColumnSpan="3" FontSize="40" />
+                                                        <TextBlock Text="允许放" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="0" Grid.Row="1" FontSize="25" />
+                                                        <TextBlock Text="允许取" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="2" Grid.Row="1" FontSize="25" />
+                                                        <TextBlock Text="RFID" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1" Grid.Row="1" FontSize="25" />
+                                                        <TextBlock x:Name="isput" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="0" Grid.Row="2" FontSize="25" />
+                                                        <TextBlock x:Name="isarrive" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="2" Grid.Row="2" FontSize="25" />
+                                                        <TextBlock x:Name="RFID5001" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1" Grid.Row="2" FontSize="25" />
                                                     </Grid>
                                                 </Border>
                                             </StackPanel>
                                             <StackPanel Orientation="Vertical" VerticalAlignment="Center" Margin="100,5,0,0" Width="800">
                                                 <Grid Height="1000">
                                                     <Grid.RowDefinitions>
-                                                        <RowDefinition Height="*"/>
-                                                        <RowDefinition Height="*"/>
-                                                        <RowDefinition Height="*"/>
+                                                        <RowDefinition Height="*" />
+                                                        <RowDefinition Height="*" />
+                                                        <RowDefinition Height="*" />
                                                     </Grid.RowDefinitions>
                                                     <Border BorderBrush="White" BorderThickness="2" Grid.Row="1" CornerRadius="10"  Margin="5,5,5,5">
-                                                        <Grid >
+                                                        <Grid>
                                                             <Grid.RowDefinitions>
-                                                                <RowDefinition Height="*"/>
-                                                                <RowDefinition Height="*"/>
+                                                                <RowDefinition Height="*" />
+                                                                <RowDefinition Height="*" />
                                                             </Grid.RowDefinitions>
-                                                            <TextBlock Text="二楼托盘库出入口" Foreground="White" FontSize="35" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                                                            <TextBlock Text="二楼托盘库出入口" Foreground="White" FontSize="35" VerticalAlignment="Center" HorizontalAlignment="Center" />
                                                             <Grid Grid.Row="1" x:Name="XBRK">
                                                                 <Grid.ColumnDefinitions>
-                                                                    <ColumnDefinition Width="*"/>
-                                                                    <ColumnDefinition Width="*"/>
-                                                                    <ColumnDefinition Width="*"/>
+                                                                    <ColumnDefinition Width="*" />
+                                                                    <ColumnDefinition Width="*" />
+                                                                    <ColumnDefinition Width="*" />
                                                                 </Grid.ColumnDefinitions>
                                                                 <Grid.RowDefinitions>
-                                                                    <RowDefinition Height="*"/>
-                                                                    <RowDefinition Height="*"/>
+                                                                    <RowDefinition Height="*" />
+                                                                    <RowDefinition Height="*" />
                                                                 </Grid.RowDefinitions>
                                                                 <TextBlock Text="入口叫料" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="30" Grid.Column="0" />
                                                                 <TextBlock Text="出口到位" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="30" Grid.Column="1" />
                                                                 <TextBlock Text="出口RFID" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="30" Grid.Column="2" />
-                                                                <TextBlock x:Name="AgvPut" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="30" Grid.Row="1" Grid.Column="0"/>
-                                                                <TextBlock x:Name="AgvGet" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="30" Grid.Row="1" Grid.Column="1"/>
-                                                                <TextBlock x:Name="RFID2001" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="30" Grid.Row="1" Grid.Column="2"/>
+                                                                <TextBlock x:Name="AgvPut" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="30" Grid.Row="1" Grid.Column="0" />
+                                                                <TextBlock x:Name="AgvGet" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="30" Grid.Row="1" Grid.Column="1" />
+                                                                <TextBlock x:Name="RFID2001" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="30" Grid.Row="1" Grid.Column="2" />
                                                             </Grid>
                                                         </Grid>
                                                     </Border>
                                                     <Border BorderBrush="White" Visibility="Collapsed" Grid.Row="1" BorderThickness="2" CornerRadius="10"  Margin="5">
-                                                        <Grid >
+                                                        <Grid>
                                                             <Grid.RowDefinitions>
-                                                                <RowDefinition Height="*"/>
-                                                                <RowDefinition Height="*"/>
+                                                                <RowDefinition Height="*" />
+                                                                <RowDefinition Height="*" />
                                                             </Grid.RowDefinitions>
-                                                            <TextBlock Text="二楼废料区" Foreground="White" FontSize="35" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                                                            <TextBlock Text="二楼废料区" Foreground="White" FontSize="35" VerticalAlignment="Center" HorizontalAlignment="Center" />
                                                             <Grid Grid.Row="1">
                                                                 <Grid.ColumnDefinitions>
-                                                                    <ColumnDefinition Width="*"/>
-                                                                    <ColumnDefinition Width="*"/>
+                                                                    <ColumnDefinition Width="*" />
+                                                                    <ColumnDefinition Width="*" />
                                                                 </Grid.ColumnDefinitions>
                                                                 <Grid.RowDefinitions>
-                                                                    <RowDefinition Height="*"/>
-                                                                    <RowDefinition Height="*"/>
+                                                                    <RowDefinition Height="*" />
+                                                                    <RowDefinition Height="*" />
                                                                 </Grid.RowDefinitions>
                                                                 <TextBlock Text="到位信号" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="30" Grid.Column="0" />
                                                                 <TextBlock Text="RFID" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="30" Grid.Column="2" />
@@ -3026,51 +2948,51 @@
                                                     <Border BorderBrush="White" Grid.Row="0" BorderThickness="2" CornerRadius="10"  Margin="5">
                                                         <Grid x:Name="TSJ">
                                                             <Grid.ColumnDefinitions>
-                                                                <ColumnDefinition Width="*"/>
-                                                                <ColumnDefinition Width="*"/>
-                                                                <ColumnDefinition Width="*"/>
-                                                                <ColumnDefinition Width="*"/>
-                                                                <ColumnDefinition Width="1.2*"/>
+                                                                <ColumnDefinition Width="*" />
+                                                                <ColumnDefinition Width="*" />
+                                                                <ColumnDefinition Width="*" />
+                                                                <ColumnDefinition Width="*" />
+                                                                <ColumnDefinition Width="1.2*" />
                                                             </Grid.ColumnDefinitions>
                                                             <Grid.RowDefinitions>
-                                                                <RowDefinition Height="*"/>
-                                                                <RowDefinition Height="*"/>
-                                                                <RowDefinition Height="*"/>
+                                                                <RowDefinition Height="*" />
+                                                                <RowDefinition Height="*" />
+                                                                <RowDefinition Height="*" />
                                                             </Grid.RowDefinitions>
-                                                            <TextBlock Text="提升机" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="40" Grid.ColumnSpan="6"/>
-                                                            <TextBlock Text="当前楼层" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="0" Grid.Row="1" FontSize="25"/>
-                                                            <TextBlock Text="目的楼层" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1" Grid.Row="1" FontSize="25"/>
-                                                            <TextBlock Text="提升机状态" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="2" Grid.Row="1" FontSize="25"/>
-                                                            <TextBlock Text="MES屏蔽" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="3" Grid.Row="1" FontSize="25"/>
-                                                            <TextBlock Text="货物到位状态" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="4" Grid.Row="1" FontSize="25"/>
-                                                            <TextBlock x:Name="currentfloor06" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="0" Grid.Row="2" FontSize="25"/>
-                                                            <TextBlock x:Name="targetfloor06" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1" Grid.Row="2" FontSize="25"/>
-                                                            <TextBlock x:Name="equipstate06" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="2" Grid.Row="2" FontSize="25"/>
-                                                            <TextBlock x:Name="mesclose" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="3" Grid.Row="2" FontSize="25"/>
-                                                            <TextBlock x:Name="hoistertrayin06" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="4" Grid.Row="2" FontSize="25"/>
+                                                            <TextBlock Text="提升机" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="40" Grid.ColumnSpan="6" />
+                                                            <TextBlock Text="当前楼层" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="0" Grid.Row="1" FontSize="25" />
+                                                            <TextBlock Text="目的楼层" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1" Grid.Row="1" FontSize="25" />
+                                                            <TextBlock Text="提升机状态" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="2" Grid.Row="1" FontSize="25" />
+                                                            <TextBlock Text="MES屏蔽" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="3" Grid.Row="1" FontSize="25" />
+                                                            <TextBlock Text="货物到位状态" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="4" Grid.Row="1" FontSize="25" />
+                                                            <TextBlock x:Name="currentfloor06" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="0" Grid.Row="2" FontSize="25" />
+                                                            <TextBlock x:Name="targetfloor06" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1" Grid.Row="2" FontSize="25" />
+                                                            <TextBlock x:Name="equipstate06" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="2" Grid.Row="2" FontSize="25" />
+                                                            <TextBlock x:Name="mesclose" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="3" Grid.Row="2" FontSize="25" />
+                                                            <TextBlock x:Name="hoistertrayin06" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="4" Grid.Row="2" FontSize="25" />
                                                         </Grid>
                                                     </Border>
 
                                                     <Border BorderBrush="White" Grid.Row="2" BorderThickness="2" CornerRadius="10"  Margin="5">
-                                                        <Grid >
+                                                        <Grid>
                                                             <Grid.RowDefinitions>
-                                                                <RowDefinition Height="*"/>
-                                                                <RowDefinition Height="*"/>
+                                                                <RowDefinition Height="*" />
+                                                                <RowDefinition Height="*" />
                                                             </Grid.RowDefinitions>
-                                                            <TextBlock Text="三楼翻转机" Foreground="White" FontSize="35" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                                                            <TextBlock Text="三楼翻转机" Foreground="White" FontSize="35" VerticalAlignment="Center" HorizontalAlignment="Center" />
                                                             <Grid Grid.Row="1" x:Name="FZJ">
                                                                 <Grid.ColumnDefinitions>
-                                                                    <ColumnDefinition Width="*"/>
-                                                                    <ColumnDefinition Width="*"/>
+                                                                    <ColumnDefinition Width="*" />
+                                                                    <ColumnDefinition Width="*" />
                                                                 </Grid.ColumnDefinitions>
                                                                 <Grid.RowDefinitions>
-                                                                    <RowDefinition Height="*"/>
-                                                                    <RowDefinition Height="*"/>
+                                                                    <RowDefinition Height="*" />
+                                                                    <RowDefinition Height="*" />
                                                                 </Grid.RowDefinitions>
                                                                 <TextBlock Text="翻转机允许放" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="30" Grid.Column="0" />
                                                                 <TextBlock Text="翻转机空托盘" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="30" Grid.Column="1" />
-                                                                <TextBlock x:Name="putTray" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="0" Grid.Row="2" FontSize="25"/>
-                                                                <TextBlock x:Name="getTray" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="2" Grid.Row="2" FontSize="25"/>
+                                                                <TextBlock x:Name="putTray" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="0" Grid.Row="2" FontSize="25" />
+                                                                <TextBlock x:Name="getTray" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="2" Grid.Row="2" FontSize="25" />
                                                             </Grid>
                                                         </Grid>
                                                     </Border>
@@ -3079,8 +3001,8 @@
                                         </StackPanel>
                                     </StackPanel>
                                 </TabItem>
-                                <TabItem  x:Name="AgvManager" Header="Agv信息" Style="{StaticResource DefaultItem}"  FontSize="25" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="#213269"  Foreground="White" Width="160" Height="80"  Margin="5" >
-                                    <DataGrid 
+                                <TabItem  x:Name="AgvManager" Header="Agv信息" Style="{StaticResource DefaultItem}"  FontSize="25" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="#213269"  Foreground="White" Width="160" Height="80"  Margin="5">
+                                    <DataGrid
                                         x:Name="AgvDataGrid"
                                         AlternationCount="2"
                                         AutoGenerateColumns="False"
@@ -3094,8 +3016,7 @@
                                         IsReadOnly="True"
                                         LoadingRow="dgData_LoadingRow"
                                         RowHeaderWidth="0"
-                                        SelectionMode="Single" FontSize="16" HorizontalAlignment="Left" Height="1100" Width="1700" Margin="0,0,0,10" 
-                                        >
+                                        SelectionMode="Single" FontSize="16" HorizontalAlignment="Left" Height="1100" Width="1700" Margin="0,0,0,10">
                                         <DataGrid.Columns>
                                             <DataGridTemplateColumn
 Width="100"
@@ -3178,7 +3099,6 @@ IsReadOnly="True">
                                   FontSize="20"
                                   Header="报警信息"
                                   IsReadOnly="True" />
-
                                         </DataGrid.Columns>
                                         <DataGrid.CellStyle>
                                             <Style TargetType="{x:Type DataGridCell}">
@@ -3186,7 +3106,6 @@ IsReadOnly="True">
                                                 <Setter Property="Foreground" Value="White" />
                                                 <Setter Property="HorizontalContentAlignment" Value="Center" />
                                             </Style>
-
                                         </DataGrid.CellStyle>
                                         <DataGrid.RowStyle>
                                             <Style TargetType="{x:Type DataGridRow}">
@@ -3212,22 +3131,21 @@ IsReadOnly="True">
                                                 <Setter Property="FontSize" Value="30" />
                                             </Style>
                                         </DataGrid.ColumnHeaderStyle>
-
                                     </DataGrid>
                                 </TabItem>
-                                <TabItem x:Name="AuthManager" Header="权限控制" Style="{StaticResource DefaultItem}"  FontSize="25" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="#213269"  Foreground="White" Width="160" Height="100"  Margin="5" >
+                                <TabItem x:Name="AuthManager" Header="权限控制" Style="{StaticResource DefaultItem}"  FontSize="25" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="#213269"  Foreground="White" Width="160" Height="100"  Margin="5">
                                     <Grid Height="1100" Width="1700">
                                         <Grid.RowDefinitions>
-                                            <RowDefinition Height="auto"/>
-                                            <RowDefinition Height="*"/>
+                                            <RowDefinition Height="auto" />
+                                            <RowDefinition Height="*" />
                                         </Grid.RowDefinitions>
                                         <StackPanel Orientation="Horizontal">
-                                            <TextBlock Text="用户名:" Margin="10" FontSize="30" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                                            <TextBox x:Name="LoginName" Margin="10" Width="200" Height="50" VerticalAlignment="Center"/>
-                                            <Button x:Name="SelectUser" Content="搜索" Width="100" Margin="10" Height="50" FontSize="25" Foreground="White" Background="#346DFF" Click="SelectUser_Click"/>
-                                            <Button x:Name="AddUser" Content="添加" Width="100" Margin="10" Height="50" FontSize="25" Foreground="White" Background="#346DFF" Click="AddUser_Click"/>
+                                            <TextBlock Text="用户名:" Margin="10" FontSize="30" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                                            <TextBox x:Name="LoginName" Margin="10" Width="200" Height="50" VerticalAlignment="Center" />
+                                            <Button x:Name="SelectUser" Content="搜索" Width="100" Margin="10" Height="50" FontSize="25" Foreground="White" Background="#346DFF" Click="SelectUser_Click" />
+                                            <Button x:Name="AddUser" Content="添加" Width="100" Margin="10" Height="50" FontSize="25" Foreground="White" Background="#346DFF" Click="AddUser_Click" />
                                         </StackPanel>
-                                        <DataGrid 
+                                        <DataGrid
                                                Grid.Row="1"
                                                AlternationCount="2"
                                                AutoGenerateColumns="False"
@@ -3243,8 +3161,7 @@ IsReadOnly="True">
                                                SelectionMode="Single"
                                                x:Name="UserData"
                                                LoadingRow="dgData_LoadingRow"
-                                            MinRowHeight="50" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
-                                            >
+                                            MinRowHeight="50" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                                             <DataGrid.Columns>
                                                 <DataGridTemplateColumn
                                                     Width="100"
@@ -3303,8 +3220,8 @@ IsReadOnly="True">
                                                     <DataGridTemplateColumn.CellTemplate>
                                                         <DataTemplate>
                                                             <StackPanel Orientation="Horizontal">
-                                                                <Button Content="删除" Style="{StaticResource ButtonPrimary}" FontSize="25" Width="125" Height="75" Click="deleteUser"/>
-                                                                <Button Content="绑定菜单" Style="{StaticResource ButtonPrimary}" FontSize="25" Width="125" Height="75" Click="SelectUserRole"/>
+                                                                <Button Content="删除" Style="{StaticResource ButtonPrimary}" FontSize="25" Width="125" Height="75" Click="deleteUser" />
+                                                                <Button Content="绑定菜单" Style="{StaticResource ButtonPrimary}" FontSize="25" Width="125" Height="75" Click="SelectUserRole" />
                                                             </StackPanel>
                                                         </DataTemplate>
                                                     </DataGridTemplateColumn.CellTemplate>
@@ -3316,13 +3233,12 @@ IsReadOnly="True">
                                                     <Setter Property="Foreground" Value="White" />
                                                     <Setter Property="HorizontalContentAlignment" Value="Center" />
                                                 </Style>
-
                                             </DataGrid.CellStyle>
                                             <DataGrid.RowStyle>
                                                 <Style TargetType="{x:Type DataGridRow}">
                                                     <Setter Property="Background" Value="#213269" />
                                                     <Setter Property="Foreground" Value="White" />
-                                                    <Setter Property="Height" Value="65"/>
+                                                    <Setter Property="Height" Value="65" />
                                                 </Style>
                                             </DataGrid.RowStyle>
                                             <DataGrid.RowHeaderStyle>
@@ -3370,9 +3286,9 @@ IsReadOnly="True">
                         FontSize="25"
                         Foreground="White"
                         HorizontalContentAlignment="Center"
-                        VerticalContentAlignment="Center"/>
+                        VerticalContentAlignment="Center" />
                     </StackPanel>
-                    <StackPanel Orientation="Horizontal" Margin="-100,0,0,0" >
+                    <StackPanel Orientation="Horizontal" Margin="-100,0,0,0">
                         <Image
                         Width="40"
                         Height="40"
@@ -3384,7 +3300,7 @@ IsReadOnly="True">
                         Margin="25,20,0,0"
                         FontSize="30"
                             Width="255"
-                        Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                        Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center" />
                         <Image
                         Width="40"
                         Height="40"
@@ -3396,19 +3312,15 @@ IsReadOnly="True">
                         Margin="20,20,0,0"
                         FontSize="30"
                             Width="170"
-                        Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-                        <Button Content="打开键盘" Background="#346DFF" Foreground="White" Width="150" Height="75" FontSize="25" Click="Button_Click"/>
-                        <Button Content="最小化" Background="#346DFF" Foreground="White" Width="100" Margin="20,0,0,0" Height="75" FontSize="25" Click="WindowHidden_Click"/>
-                        <Button Content="退出" Background="#346DFF" Foreground="White" Width="100" Margin="20,0,0,0" Height="75" FontSize="25" Click="WindowClose_Click"/>
+                        Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                        <Button Content="打开键盘" Background="#346DFF" Foreground="White" Width="150" Height="75" FontSize="25" Click="Button_Click" />
+                        <Button Content="最小化" Background="#346DFF" Foreground="White" Width="100" Margin="20,0,0,0" Height="75" FontSize="25" Click="WindowHidden_Click" />
+                        <Button Content="退出" Background="#346DFF" Foreground="White" Width="100" Margin="20,0,0,0" Height="75" FontSize="25" Click="WindowClose_Click" />
                         <Button Content="提升机报警记录" x:Name="HoistWarnInfoButton" Background="#346DFF" Foreground="White" Width="200" Margin="20,0,0,0" Height="75" FontSize="25" Click="HoistWarnInfoButton_Click" />
-                        <Button Content="提升机异常处理" x:Name="HoistWarnHandlerButton" Background="#346DFF" Foreground="White" Width="200" Margin="20,0,0,0" Height="75" FontSize="25" Click="HoistWarnHandlerButton_Click"  />
+                        <Button Content="提升机异常处理" x:Name="HoistWarnHandlerButton" Background="#346DFF" Foreground="White" Width="200" Margin="20,0,0,0" Height="75" FontSize="25" Click="HoistWarnHandlerButton_Click" />
                     </StackPanel>
                 </StackPanel>
             </Grid>
-
         </Grid>
-
     </Grid>
-
-
-</Window>
+</Window>
\ No newline at end of file
diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
index 256d042..f783ab7 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
@@ -53,8 +53,6 @@ namespace Khd.Core.Wpf.Form
     /// </summary>
     public partial class FormBoardT : Window
     {
-
-      
         private List<long> productIds = new List<long>() { 231, 531, 521 };
         public static long? UserId = 1;
         public static readonly JcSnowId _jcSnowId = new JcSnowId();
@@ -69,30 +67,35 @@ namespace Khd.Core.Wpf.Form
         private SerialPortModel serialPortModel;
         private SerialPortModel virtualSerialPortModel;
         private SerialPortHelper serialPortHelper;
-        List<BasePlcpoint> basePlcpoints = new List<BasePlcpoint>();
-        object timerjilu;
-        Dictionary<long, bool> SelectedItem = new Dictionary<long, bool>();
-        Dictionary<long, bool> InSelectedItem = new Dictionary<long, bool>();
-        List<long?> CallSelectedItem = new List<long?>();
+        private List<BasePlcpoint> basePlcpoints = new List<BasePlcpoint>();
+        private object timerjilu;
+        private Dictionary<long, bool> SelectedItem = new Dictionary<long, bool>();
+        private Dictionary<long, bool> InSelectedItem = new Dictionary<long, bool>();
+        private List<long?> CallSelectedItem = new List<long?>();
         public List<MesBaseBarcodeInfo> barcodeLsit = new List<MesBaseBarcodeInfo>();
         private int pageCount = 15;
         private object updateLock = new object();
         private readonly List<LocationDto> locationDtos = new List<LocationDto>();
         private ObservableCollection<SelectItemModel> itemsControlItems;
+
         //消息提示弹窗
-        private MessageBoxWindow messageBoxWindow ;
+        private MessageBoxWindow messageBoxWindow;
+
         //3楼向其他楼层输出托盘流程时，AGV把托盘放置到接驳位后，在调度界面增加"托盘入轿厢等待确认"提示信息
-        int systemRunTimerCount = 0;
-        System.Timers.Timer systemRunTimer = new System.Timers.Timer(1000 * 60);
+        private int systemRunTimerCount = 0;
+
+        private System.Timers.Timer systemRunTimer = new System.Timers.Timer(1000 * 60);
 
         //人工叫料选中类
         public class SelectItemModel
         {
             //料箱位置id
             public long baseLocationId { get; set; }
+
             //托盘号
             public string palletInfoCode { get; set; }
         }
+
         private void ScanMessage()
         {
             while (true)
@@ -124,6 +127,7 @@ namespace Khd.Core.Wpf.Form
         }
 
         private string selectedId;
+
         //FormShowSelect formSelect;
         // public static int WeekNo = CommonHelper.WeekOfYear(DateTime.Now, new System.Globalization.CultureInfo("zh-CN"));
         public FormBoardT(IHost host)
@@ -139,9 +143,6 @@ namespace Khd.Core.Wpf.Form
             systemRunTimer.Start();
         }
 
-
-
-       
         /// <summary>
         /// 3楼向其他楼层输出托盘流程时，AGV把托盘放置到接驳位后，在调度界面增加"托盘入轿厢等待确认"提示信息
         /// 计算任务等待时长
@@ -156,27 +157,24 @@ namespace Khd.Core.Wpf.Form
                 using var scope = _host.Services.CreateScope();
                 var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
                 // 给提升机已经下发入库指令，判断超时4分钟
-                var task = dbContext.WcsTask.Where(t => t.nextPointId == 6 && t.taskStatus==2).FirstOrDefault();
-               
+                var task = dbContext.WcsTask.Where(t => t.nextPointId == 6 && t.taskStatus == 2).FirstOrDefault();
+
                 if (task != null)
                 {
-                    
-                    if (systemRunTimerCount++ == 4 )
+                    if (systemRunTimerCount++ == 4)
                     {
                         Dispatcher.Invoke(() =>
                         {
-                        messageBoxWindow = new MessageBoxWindow($"{task.fromFloorNo}楼下发入库指令，超过5分钟未反馈，请前往{task.fromFloorNo}楼点击蓝色确认按钮，或排查提升机故障");
-                        messageBoxWindow.Show();
-
+                            messageBoxWindow = new MessageBoxWindow($"{task.fromFloorNo}楼下发入库指令，超过5分钟未反馈，请前往{task.fromFloorNo}楼点击蓝色确认按钮，或排查提升机故障");
+                            messageBoxWindow.Show();
                         });
- 
                     }
                 }
                 else
                 {
                     systemRunTimerCount = 0;
                     // 如果 task 为空并且窗口是可见的，关闭窗口
-                    if (messageBoxWindow !=null)
+                    if (messageBoxWindow != null)
                     {
                         Dispatcher.Invoke(() =>
                         {
@@ -187,16 +185,13 @@ namespace Khd.Core.Wpf.Form
                         systemRunTimerCount = 0;
                     }
                 }
-
             }
             catch (Exception ex)
             {
                 HandyControl.Controls.MessageBox.Error($"计算系统运行时长异常:{ex.Message}");
-           
             }
         }
 
-
         /// <summary>
         /// 页面加载事件
         /// </summary>
@@ -255,7 +250,6 @@ namespace Khd.Core.Wpf.Form
                             SystemData.PlcDic.TryAdd(plcConfig.Code, plc);
                         }
                     };
-
                 });
                 GetMenu();
                 GetTask();
@@ -321,7 +315,7 @@ namespace Khd.Core.Wpf.Form
 
                 try
                 {
-                   string ip =  NetworkHelper.GetFirstLocalIPv4Address();
+                    string ip = NetworkHelper.GetFirstLocalIPv4Address();
                     if ("192.168.2.26".Equals(ip))
                     {
                         // 获取所有可用的串口名称
@@ -337,7 +331,6 @@ namespace Khd.Core.Wpf.Form
                         //serialPortHelper = new SerialPortHelper();
                         //serialPortHelper.OpenVirtualMyConn(virtualSerialPortModel);
 
-
                         serialPortModel = new SerialPortModel();
                         serialPortModel.PortName = "COM1";
                         serialPortModel.BaudRate = 9600;
@@ -349,22 +342,13 @@ namespace Khd.Core.Wpf.Form
                         Thread scanThread = new Thread(ScanMessage);
                         scanThread.IsBackground = true;
                         scanThread.Start();
-
-
-                     
-
                     }
-
-
-
-
                 }
                 catch (Exception ex)
                 {
                     HandyControl.Controls.MessageBox.Error("条码枪连接失败");
                 }
 
-
                 Task.Run(() =>
                 {
                     using var scope = _host.Services.CreateScope();
@@ -382,13 +366,11 @@ namespace Khd.Core.Wpf.Form
                         }
                         catch
                         {
-
                         }
                         Thread.Sleep(3000);
                     }
                 });
 
-
                 try
                 {
                     GetPersonCallMaterialData();
@@ -441,11 +423,8 @@ namespace Khd.Core.Wpf.Form
             {
                 HandyControl.Controls.MessageBox.Error(ex.Message);
             }
-
         }
 
-
-
         private void TaskOrderTimer(object? obj)
         {
             while (true)
@@ -456,7 +435,6 @@ namespace Khd.Core.Wpf.Form
                 }
                 catch
                 {
-
                 }
                 Thread.Sleep(1000 * 20);
             }
@@ -490,12 +468,11 @@ namespace Khd.Core.Wpf.Form
             }
             catch
             {
-
             }
         }
 
-
         #region 库位状态可视化
+
         private void InitializeData(int rowPosition)
         {
             try
@@ -508,7 +485,7 @@ namespace Khd.Core.Wpf.Form
                 var allLocationLists = dbContext.WmsBaseLocation.Where(x => x.warehouseId == 512 && x.locRow == rowPosition).ToList();
                 // 修改排序逻辑 - 按层号降序排列，然后按列号升序排列
                 allLocationLists = allLocationLists.OrderByDescending(x => x.layerNum).ThenBy(x => x.locColumn).ToList();
-                
+
                 //在库里的库位
                 var inLocationList = allLocationLists.Where(x => x.ContainerStatus == "1").Select(x => x.locationCode).ToList();
                 //在库里有库存的库位
@@ -572,7 +549,8 @@ namespace Khd.Core.Wpf.Form
                 InitializeData(int.Parse(tag.ToString()));
             }
         }
-        #endregion
+
+        #endregion 库位状态可视化
 
         private void ReturnOrderTimer(object? obj)
         {
@@ -602,7 +580,6 @@ namespace Khd.Core.Wpf.Form
                         List<WmsRawReturn> wmsRawReturnList = wmsRawReturns.Where(x => x.endStationCode == wcsTask.currPointNo).ToList();
                         if (wmsRawReturnList != null && wmsRawReturnList.Count > 0)
                         {
-
                             List<long?> materialIds = wmsRawReturnList.Select(t => t.materialId).ToList();
                             List<MesBaseMaterialInfo> mesBaseMaterialInfos = dbContext.MesBaseMaterialInfo.Where(t => materialIds.Contains(t.MaterialId)).ToList();
 
@@ -685,7 +662,6 @@ namespace Khd.Core.Wpf.Form
                 }
                 catch
                 {
-
                 }
                 Thread.Sleep(2000);
             }
@@ -750,11 +726,10 @@ namespace Khd.Core.Wpf.Form
                     //    });
                     //}
 
-
-
                     if (!string.IsNullOrEmpty(baseEquip.endStationCode))
                     {
                         #region 待测试
+
                         //找出本工位的申请单
                         List<WmsRawOutstock> RawOutstocks = wmsRawOutstocks.Where(t => baseEquip.endStationCode.Contains(t.endStationCode)).ToList();
 
@@ -789,7 +764,6 @@ namespace Khd.Core.Wpf.Form
                                 PalletInfoCode = g.Key.palletInfoCode,
                                 //携带总可用库存
                                 canUseAmount = g.Sum(x => x.totalAmount) - g.Sum(x => x.frozenAmount),
-                              
                             })
                             .ToList();
 
@@ -819,12 +793,10 @@ namespace Khd.Core.Wpf.Form
                         }
                         catch
                         {
-
                         }
                         List<long?> materialIds = RawOutstocks.Select(t => t.materialId).ToList();
                         List<MesBaseMaterialInfo> mesBaseMaterialInfos = dbContext.MesBaseMaterialInfo.Where(t => materialIds.Contains(t.MaterialId)).ToList();
 
-
                         var orderNumber = from r in result
                                           from m in mesBaseMaterialInfos
                                           where r.MaterialId == m.MaterialId
@@ -841,7 +813,7 @@ namespace Khd.Core.Wpf.Form
                                               ApplyTime = r.ApplyTime,
                                           };
 
-                        #endregion
+                        #endregion 待测试
 
                         //List<WcsTask> wcsTasks = dbContext.WcsTask.Where(t => t.taskType == 30).Where(t => orderIds.Contains(t.orderId)).ToList();
 
@@ -857,7 +829,6 @@ namespace Khd.Core.Wpf.Form
                         //    });
                         //List<WmsRawOutstock> endStationCodeOutRaw = wmsRawOutstocks.Where(t => t.endStationCode == baseEquip.endStationCode).ToList();
 
-
                         //List<long?> materialIds = endStationCodeOutRaw.Select(t => t.materialId).ToList();
                         //List<MesBaseMaterialInfo> mesBaseMaterialInfos = dbContext.MesBaseMaterialInfo.Where(t => materialIds.Contains(t.MaterialId)).ToList();
                         //var bill = endStationCodeOutRaw.GroupBy(t => new { t.materialId, t.materialBatch, t.saleOrderId })
@@ -881,7 +852,7 @@ namespace Khd.Core.Wpf.Form
                         //                      outstockAmount = a.outstockAmount,
                         //                      materialSpec = c.MaterialSpec,
                         //                      realOutstockAmount = a.realOutstockAmount,
-                        //                      thisOutAmount = b.thisOutAmount, 
+                        //                      thisOutAmount = b.thisOutAmount,
                         //                      isSendOver = a.outstockAmount <= (a.realOutstockAmount + b.thisOutAmount) ? "已出完" : "未出完"
                         //                  };
 
@@ -909,13 +880,12 @@ namespace Khd.Core.Wpf.Form
                 }
                 catch
                 {
-
                 }
                 Thread.Sleep(1000);
             }
         }
 
-        Dictionary<string, string> agvDic = new Dictionary<string, string>
+        private Dictionary<string, string> agvDic = new Dictionary<string, string>
         {
             {"6011","五楼潜伏" },
             {"2034","五楼叉车" },
@@ -923,6 +893,7 @@ namespace Khd.Core.Wpf.Form
             {"2032","三楼叉车" },
             {"2033","二楼叉车" },
         };
+
         private void AgvStatus()
         {
             using var scope = _host.Services.CreateScope();
@@ -963,11 +934,9 @@ namespace Khd.Core.Wpf.Form
                 }
                 catch
                 {
-
                 }
                 Thread.Sleep(3000);
             }
-
         }
 
         private void ddjTimer()
@@ -1028,7 +997,6 @@ namespace Khd.Core.Wpf.Form
                 }
                 catch
                 {
-
                 }
                 Thread.Sleep(3000);
             }
@@ -1043,7 +1011,6 @@ namespace Khd.Core.Wpf.Form
             }
             catch
             {
-
             }
         }
 
@@ -1074,8 +1041,8 @@ namespace Khd.Core.Wpf.Form
         {
             System.Environment.Exit(System.Environment.ExitCode);
         }
-        public int i = 0;
 
+        public int i = 0;
 
         /// <summary>
         /// 查询任务
@@ -1167,6 +1134,7 @@ namespace Khd.Core.Wpf.Form
                 this.LoadMaterial0.Items.Refresh();
             });
         }
+
         /// <summary>
         /// 删除任务
         /// </summary>
@@ -1205,11 +1173,10 @@ namespace Khd.Core.Wpf.Form
                 }
                 else
                 {
-
                 }
-
             }
         }
+
         /// <summary>
         /// 完成任务
         /// </summary>
@@ -1232,6 +1199,7 @@ namespace Khd.Core.Wpf.Form
                 GetTask();
             }
         }
+
         /// <summary>
         /// 查询设备信息
         /// </summary>
@@ -1239,7 +1207,6 @@ namespace Khd.Core.Wpf.Form
         /// <param name="e"></param>
         private void btnGetEquip_Click(object sender, RoutedEventArgs e)
         {
-
             using var scope = _host.Services.CreateScope();
             using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
             var equipCode = lba_ThrifTtitle3.Text;
@@ -1252,6 +1219,7 @@ namespace Khd.Core.Wpf.Form
                 HandyControl.Controls.MessageBox.Show("未查询到数据");
             }
         }
+
         /// <summary>
         /// 查询库存信息
         /// </summary>
@@ -1265,6 +1233,7 @@ namespace Khd.Core.Wpf.Form
             locationDtos.Clear();
             GetBaseLocations();
         }
+
         /// <summary>
         /// 获取库位信息
         /// </summary>
@@ -1337,6 +1306,7 @@ namespace Khd.Core.Wpf.Form
                 return;
             }
         }
+
         ///// <summary>
         ///// 查询指令信息
         ///// </summary>
@@ -1447,7 +1417,6 @@ namespace Khd.Core.Wpf.Form
         //    }
         //    catch
         //    {
-
         //    }
         //}
         /// <summary>
@@ -1492,7 +1461,6 @@ namespace Khd.Core.Wpf.Form
         //    }
         //    catch
         //    {
-
         //    }
 
         //}
@@ -1663,10 +1631,9 @@ namespace Khd.Core.Wpf.Form
             //}
             //catch
             //{
-
             //}
-
         }
+
         /// <summary>
         /// 退出程序
         /// </summary>
@@ -1691,6 +1658,7 @@ namespace Khd.Core.Wpf.Form
                 System.Environment.Exit(System.Environment.ExitCode);
             }
         }
+
         /// <summary>
         /// 获取聚焦打开键盘
         /// </summary>
@@ -1714,6 +1682,7 @@ namespace Khd.Core.Wpf.Form
                 HandyControl.Controls.MessageBox.Error("打开软键盘时出错: " + ex.Message);
             }
         }
+
         /// <summary>
         /// 失去焦点,关闭软键盘
         /// </summary>
@@ -1735,6 +1704,7 @@ namespace Khd.Core.Wpf.Form
                 HandyControl.Controls.MessageBox.Error("打开软键盘时出错: " + ex.Message);
             }
         }
+
         /// <summary>
         /// 背负式小车确认完成
         /// </summary>
@@ -1769,7 +1739,6 @@ namespace Khd.Core.Wpf.Form
                                 MessageBoxResult messageBoxResult1 = HandyControl.Controls.MessageBox.Show("本次出库任务是否捡料完成？", "提示信息", MessageBoxButton.YesNo, MessageBoxImage.Information);
                                 if (messageBoxResult1 == MessageBoxResult.Yes)
                                 {
-
                                 }
                                 //MessageBoxResult messageBoxResult1 = HandyControl.Controls.MessageBox.Show("是否需要背负式小车返回？", "提示信息", MessageBoxButton.YesNoCancel, MessageBoxImage.Information);
                                 //if (messageBoxResult1 == MessageBoxResult.Yes)
@@ -1802,9 +1771,7 @@ namespace Khd.Core.Wpf.Form
                                     baseEquip.endStationCode = string.Empty;
                                     baseEquip.ud3 = null;
                                     dbContext.Update(baseEquip);
-
                                 }
-
                             }
                             else
                             {
@@ -1822,8 +1789,7 @@ namespace Khd.Core.Wpf.Form
                         }
                         else if (wcsCmd.taskType == 48)//返库
                         {
-                          
-                            WmsRawReturn? wmsRawReturn = dbContext.WmsRawReturn.Where(t => t.endStationCode == wcsCmd.currPointNo && t.executeStatus!="2").FirstOrDefault();
+                            WmsRawReturn? wmsRawReturn = dbContext.WmsRawReturn.Where(t => t.endStationCode == wcsCmd.currPointNo && t.executeStatus != "2").FirstOrDefault();
                             if (wmsRawReturn != null)
                             {
                                 wmsRawReturn.executeStatus = "2";
@@ -1841,13 +1807,13 @@ namespace Khd.Core.Wpf.Form
                         HandyControl.Controls.MessageBox.Success("背负式Agv任务确认完成成功");
                     }
                 }
-
             }
             catch (Exception ex)
             {
                 HandyControl.Controls.MessageBox.Error(ex.Message);
             }
         }
+
         /// <summary>
         /// 获取到所有控件
         /// </summary>
@@ -1858,10 +1824,8 @@ namespace Khd.Core.Wpf.Form
             // 获取当前选中的TabItem
             var selectedTabItem = TabControl.SelectedItem as TabItem;
 
-
             //if (selectedTabItem != null && selectedTabItem.Name == "TaskManager")
             //{  //任务界面
-
             //    GetTask();
             //}
             if (selectedTabItem != null && selectedTabItem.Name == "CallPersonManager")
@@ -1874,6 +1838,7 @@ namespace Khd.Core.Wpf.Form
                 GetInvertoryData();
             }
         }
+
         /// <summary>
         /// 添加任务
         /// </summary>
@@ -1884,6 +1849,7 @@ namespace Khd.Core.Wpf.Form
             AddTask addTask = new AddTask(_host);
             addTask.ShowDialog();
         }
+
         ///// <summary>
         ///// 清除RFID
         ///// </summary>
@@ -1925,13 +1891,11 @@ namespace Khd.Core.Wpf.Form
         //            }
         //            else
         //            {
-
         //            }
         //        }
         //    }
         //    catch
         //    {
-
         //    }
 
         //}
@@ -1974,10 +1938,8 @@ namespace Khd.Core.Wpf.Form
             {
                 HandyControl.Controls.MessageBox.Error(ex.Message);
             }
-
         }
 
-
         /// <summary>
         /// 打开任务历史记录界面
         /// </summary>
@@ -1989,18 +1951,13 @@ namespace Khd.Core.Wpf.Form
             {
                 TaskHistoryWindow taskHistoryWindow = new TaskHistoryWindow(_host);
                 taskHistoryWindow.ShowDialog();
-
-
             }
             catch (Exception ex)
             {
                 HandyControl.Controls.MessageBox.Error(ex.Message);
             }
-
         }
 
-
-
         /// <summary>
         /// 单选
         /// </summary>
@@ -2013,6 +1970,7 @@ namespace Khd.Core.Wpf.Form
                 SelectedItem[Currentselected.objid] = checkbox.IsChecked ?? false;
             }
         }
+
         /// <summary>
         /// 单选
         /// </summary>
@@ -2020,7 +1978,6 @@ namespace Khd.Core.Wpf.Form
         /// <param name="e"></param>
         private void CheckPersonBox_Click(object sender, RoutedEventArgs e)
         {
-
             if (sender is CheckBox checkbox)
             {
                 dynamic Currentselected = PersonCallMaterial.SelectedItem;
@@ -2045,14 +2002,12 @@ namespace Khd.Core.Wpf.Form
                             baseLocationId = Currentselected.baseLocationId,
                             palletInfoCode = Currentselected.palletInfoCode
                         });
-
                     }
                 }
                 else
                 {
                     CallSelectedItem.Remove(Currentselected.baseLocationId);
 
-
                     // 删除选中项
                     SelectItemModel model = itemsControlItems.FirstOrDefault(x => x.baseLocationId == Currentselected.baseLocationId);
                     if (model != null)
@@ -2060,10 +2015,6 @@ namespace Khd.Core.Wpf.Form
                         itemsControlItems.Remove(model);
                     }
                 }
-
-
-
-
             }
         }
 
@@ -2086,6 +2037,7 @@ namespace Khd.Core.Wpf.Form
                 itemsControlItems.Remove(itemToRemove);
             }
         }
+
         /// <summary>
         /// 刷新
         /// </summary>
@@ -2213,7 +2165,6 @@ namespace Khd.Core.Wpf.Form
                                         }
                                         catch
                                         {
-
                                         }
                                     }
                                 }
@@ -2226,8 +2177,8 @@ namespace Khd.Core.Wpf.Form
                 }
                 Thread.Sleep(3000);
             }
-
         }
+
         /// <summary>
         /// 开始任务
         /// </summary>
@@ -2254,9 +2205,9 @@ namespace Khd.Core.Wpf.Form
             }
             catch
             {
-
             }
         }
+
         /// <summary>
         /// 页码改变时
         /// </summary>
@@ -2266,6 +2217,7 @@ namespace Khd.Core.Wpf.Form
         {
             GetBaseLocations();
         }
+
         /// <summary>
         /// 物料名称
         /// </summary>
@@ -2283,6 +2235,7 @@ namespace Khd.Core.Wpf.Form
             //}
             //MaterialSpec.Items.Refresh();
         }
+
         /// <summary>
         /// 入库扫描
         /// </summary>
@@ -2297,7 +2250,6 @@ namespace Khd.Core.Wpf.Form
         {
             try
             {
-
                 if (!string.IsNullOrEmpty(txtInBox.Text) && !string.IsNullOrEmpty(txtInBarCode.Text))
                 {
                     using var scope = _host.Services.CreateScope();
@@ -2441,14 +2393,12 @@ namespace Khd.Core.Wpf.Form
                         totalMessage = newRawStock.totalAmount;
                     }
 
-
                     txtInBox.Focus();
                     MsgText.Text = $"入库成功!当前库存:{totalMessage}";
                     this.txtInStoreRemark.Text = string.Empty;
                     txtInBox.Text = string.Empty;
                     txtInBarCode.Text = string.Empty;
                     txtInScan.Text = string.Empty;
-
                 }
                 else
                 {
@@ -2470,6 +2420,7 @@ namespace Khd.Core.Wpf.Form
         {
             this.rawSourceBox.Text = string.Empty;
         }
+
         private void removeSourceBoxClear_Click(object sender, RoutedEventArgs e)
         {
             this.removeSourceBox.Text = string.Empty;
@@ -2484,6 +2435,7 @@ namespace Khd.Core.Wpf.Form
         {
             this.removeSourceBarCode.Text = string.Empty;
         }
+
         /// <summary>
         /// 入库扫描
         /// </summary>
@@ -2513,8 +2465,7 @@ namespace Khd.Core.Wpf.Form
                         return;
                     }
 
-                    
-                    WmsRawReturn? wmsRawReturn = dbContext.WmsRawReturn.Where(t => t.endStationCode == task.currPointNo && t.executeStatus !="2").FirstOrDefault();
+                    WmsRawReturn? wmsRawReturn = dbContext.WmsRawReturn.Where(t => t.endStationCode == task.currPointNo && t.executeStatus != "2").FirstOrDefault();
                     //if (wmsRawReturn == null)
                     //{
                     //    var result = MessageBox.Show("当前物料不在退出申请单中，确定还要入库吗？", "确认入库", MessageBoxButton.YesNo, MessageBoxImage.Question);
@@ -2641,6 +2592,7 @@ namespace Khd.Core.Wpf.Form
                 txtReturnMsg.Text = ("入库失败");
             }
         }
+
         /// <summary>
         /// 入库容器改变
         /// </summary>
@@ -2650,7 +2602,6 @@ namespace Khd.Core.Wpf.Form
         {
             try
             {
-
                 string containerCode = txtInBox.Text;
                 if (containerCode.Length >= 1)
                 {
@@ -2678,9 +2629,9 @@ namespace Khd.Core.Wpf.Form
             }
             catch
             {
-
             }
         }
+
         /// <summary>
         /// 入库条码改变
         /// </summary>
@@ -2692,17 +2643,16 @@ namespace Khd.Core.Wpf.Form
             {
                 materialName.Text = string.Empty;
                 materialSpec.Text = string.Empty;
+                txtInUnit.Text = string.Empty;
                 string barCode = txtInBarCode.Text;
-                if (barCode.Length < 19) return;
 
+                if (barCode.Length < 19) return;
 
                 using var scope = _host.Services.CreateScope();
                 using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
 
                 if (!string.IsNullOrEmpty(barCode))
                 {
-
-
                     var material = dbContext.MesBaseBarcodeInfo.FirstOrDefault(t => t.barcodeInfo == barCode);
                     if (material == null)
                     {
@@ -2723,6 +2673,12 @@ namespace Khd.Core.Wpf.Form
                         }
                         else
                         {
+                            //显示单位信息
+                            var mesBaseUnitInfo = dbContext.MesBaseUnitInfo.FirstOrDefault(t => t.ErpId == mesBaseMaterialInfo.MaterialUnitId);
+                            if (mesBaseUnitInfo != null)
+                            {
+                                txtInUnit.Text = mesBaseUnitInfo.UnitName;
+                            }
 
                             txtInScan.Text = (material.batchFlag == "1") ? "" : "1.00";
                             materialName.Text = mesBaseMaterialInfo.MaterialName;
@@ -2742,7 +2698,6 @@ namespace Khd.Core.Wpf.Form
             }
             catch
             {
-
             }
         }
 
@@ -2775,9 +2730,9 @@ namespace Khd.Core.Wpf.Form
             }
             catch
             {
-
             }
         }
+
         /// <summary>
         /// 出库条码改变
         /// </summary>
@@ -2787,7 +2742,6 @@ namespace Khd.Core.Wpf.Form
         {
             try
             {
-              
                 string barCode = txtReturnBarCode.Text;
                 if (barCode.Length < 19) return;
 
@@ -2815,7 +2769,6 @@ namespace Khd.Core.Wpf.Form
                         }
                         else
                         {
-
                             txtReturnScan.Text = (material.batchFlag == "1") ? "" : "1.00";
                             this.returnGG.Text = mesBaseMaterialInfo.MaterialSpec;
                             this.returnMaterialName.Text = mesBaseMaterialInfo.MaterialName;
@@ -2834,9 +2787,9 @@ namespace Khd.Core.Wpf.Form
             }
             catch
             {
-
             }
         }
+
         /// <summary>
         /// 出库容器改变
         /// </summary>
@@ -2873,9 +2826,9 @@ namespace Khd.Core.Wpf.Form
             }
             catch
             {
-
             }
         }
+
         /// <summary>
         /// 出库条码改变
         /// </summary>
@@ -2916,8 +2869,6 @@ namespace Khd.Core.Wpf.Form
                                 txtOutScan.Text = string.Empty;
                                 txtOutBarCode.Focus();
                             }
-
-
                             else
                             {
                                 var materialInfo = dbContext.MesBaseMaterialInfo.FirstOrDefault(t => t.MaterialId == wmsRawStock.materialId);
@@ -2953,9 +2904,9 @@ namespace Khd.Core.Wpf.Form
             }
             catch
             {
-
             }
         }
+
         /// <summary>
         /// 出库扫描
         /// </summary>
@@ -3002,11 +2953,9 @@ namespace Khd.Core.Wpf.Form
                         }
                         catch
                         {
-
                         }
                         if (wmsRawOutstocks.Count > 0)
                         {
-
                             wmsRawOutstocks = wmsRawOutstocks.OrderBy(t => list[0] == t.endStationCode ? 0 : 99).ToList();
                             decimal? sum = wmsRawOutstocks.Sum(t => (t.outstockAmount - t.realOutstockAmount));
                             if (outScan > sum)
@@ -3091,14 +3040,14 @@ namespace Khd.Core.Wpf.Form
                                 if (wmsRawStock.totalAmount == 0)
                                 {
                                     dbContext.WmsRawStock.Remove(wmsRawStock);
-
                                 }
                                 else
                                 {
                                     dbContext.WmsRawStock.Update(wmsRawStock);
-
                                 }
+
                                 #region 插入rawOutstock
+
                                 string timeStamp = DateTime.Now.ToString("yyyyMMddHHmmss");
                                 WmsRawOutstock newWmsRawOutstock = new WmsRawOutstock();
                                 newWmsRawOutstock.taskCode = timeStamp + "CTU" + Random.Shared.Next(10, 99);
@@ -3122,7 +3071,9 @@ namespace Khd.Core.Wpf.Form
                                 newWmsRawOutstock.endTime = DateTime.Now;
                                 dbContext.WmsRawOutstock.Add(newWmsRawOutstock);
                                 dbContext.SaveChanges();
-                                #endregion
+
+                                #endregion 插入rawOutstock
+
                                 //if (mesBaseBarcodeInfo != null)
                                 //{
                                 //    WmsRawOutstockDetail wmsProductOutstockDetail = new WmsRawOutstockDetail()
@@ -3149,7 +3100,6 @@ namespace Khd.Core.Wpf.Form
                                 //    dbContext.WmsRawOutstockDetail.Add(wmsProductOutstockDetail);
                                 //}
                                 // dbContext.SaveChanges();
-
                             }
                             else
                             {
@@ -3177,10 +3127,11 @@ namespace Khd.Core.Wpf.Form
                 {
                     scanOutMsg.Text = "请先扫描容器号和条码!";
                 }
+
                 #region 原逻辑
+
                 //if (!string.IsNullOrEmpty(txtOutBox.Text) && !string.IsNullOrEmpty(txtOutBarCode.Text))
                 //{
-
                 //    var wmsRawStock = dbContext.WmsRawStock
                 //        .FirstOrDefault(t => t.instockBatch == txtOutBarCode.Text && t.palletInfoCode == txtOutBox.Text);
                 //    if (wmsRawStock == null)
@@ -3376,13 +3327,15 @@ namespace Khd.Core.Wpf.Form
                 //{
                 //    scanOutMsg.Text = "请先扫描容器号和条码!";
                 //}
-                #endregion
+
+                #endregion 原逻辑
             }
             catch (Exception ex)
             {
                 scanOutMsg.Text = "出库失败" + ex;
             }
         }
+
         /// <summary>
         /// 搜索
         /// </summary>
@@ -3394,6 +3347,7 @@ namespace Khd.Core.Wpf.Form
             CallSelectedItem.Clear();
             GetPersonCallMaterialData();
         }
+
         /// <summary>
         /// 获取人员呼叫的物料数据
         /// </summary>
@@ -3421,7 +3375,6 @@ namespace Khd.Core.Wpf.Form
                .WhereIf(materialIds.Count > 0, t => materialIds.Contains(t.materialId))
                .ToList();
 
-
                 var groupWmsRawStock = wmsRawStocks.GroupBy(t => new { t.materialId, t.palletInfoCode }).Select(t =>
                     new
                     {
@@ -3441,7 +3394,7 @@ namespace Khd.Core.Wpf.Form
                 //    totalAmount = string.Join("\n", t.Select(x => x.totalAmount)),
                 //    frozenAmount = string.Join("\n", t.Select(x => x.frozenAmount)),
                 //    materialId = string.Join("\n", t.Select(x => x.materialId)),
-                //}).ToList(); 
+                //}).ToList();
                 var palletInfoCodes = groupWmsRawStock.Select(t => t.palletInfoCode).Distinct().ToList();
                 var wmsBaseLocations = dbContext.WmsBaseLocation
                     .Where(t => t.ContainerStatus == "1")
@@ -3472,8 +3425,6 @@ namespace Khd.Core.Wpf.Form
                                IsSelected = CallSelectedItem.Contains(a.locationId)
                            };
 
-
-
                 var bills = bill.GroupBy(t => new { t.baseLocationId, t.palletInfoCode, t.locationCode, t.IsSelected })
                     .Select(t => new
                     {
@@ -3503,9 +3454,9 @@ namespace Khd.Core.Wpf.Form
             }
             catch
             {
-
             }
         }
+
         /// <summary>
         /// 页码改变时
         /// </summary>
@@ -3515,6 +3466,7 @@ namespace Khd.Core.Wpf.Form
         {
             GetPersonCallMaterialData();
         }
+
         /// <summary>
         /// 页码改变时
         /// </summary>
@@ -3524,6 +3476,7 @@ namespace Khd.Core.Wpf.Form
         {
             GetInvertoryData();
         }
+
         /// <summary>
         /// 开始盘点
         /// </summary>
@@ -3575,7 +3528,6 @@ namespace Khd.Core.Wpf.Form
                                 // 盘点指定型号的物料库存的库位
                                 locationCodeList = dbContext.WmsRawStock.Where(t => t.warehouseId == 512 && materialIds.Contains((long)t.materialId)).Select(x => x.locationCode).Distinct().ToList();
                             }
-
                         }
                         //所有满足条件的需要盘库的库位
                         var wmsBaseLocations = dbContext.WmsBaseLocation
@@ -3729,7 +3681,6 @@ namespace Khd.Core.Wpf.Form
             GetInvertoryData();
         }
 
-
         /// <summary>
         /// 结束盘点
         /// </summary>
@@ -3761,6 +3712,7 @@ namespace Khd.Core.Wpf.Form
                 Console.WriteLine(ex.Message);
             }
         }
+
         /// <summary>
         /// 查看盘点详情界面
         /// </summary>
@@ -3800,6 +3752,7 @@ namespace Khd.Core.Wpf.Form
                     //}
 
                     #region 出库创建taskmanual，如果有之前的出库任务， 弹框提示有未完成的出库任务，是否继续出库，如果继续，删除之前的出库任务
+
                     var removeList = dbContext.WcsTask.Where(x => x.taskType == 30 && x.taskStatus == 6).ToList();
                     if (removeList.Count > 0)
                     {
@@ -3817,9 +3770,8 @@ namespace Khd.Core.Wpf.Form
                             return;
                         }
                     }
-                    #endregion
-
 
+                    #endregion 出库创建taskmanual，如果有之前的出库任务， 弹框提示有未完成的出库任务，是否继续出库，如果继续，删除之前的出库任务
 
                     var wmsBaseLocation = dbContext.WmsBaseLocation
                         .Where(t => t.locationStatus == "1")
@@ -3870,11 +3822,9 @@ namespace Khd.Core.Wpf.Form
                         HandyControl.Controls.MessageBox.Error($"没有足够的空箱库位库位，剩余空库位数量为{wmsBaseLocation.Count}!");
                     }
                 }
-
             }
             catch
             {
-
             }
         }
 
@@ -3908,7 +3858,6 @@ namespace Khd.Core.Wpf.Form
 
                 var wmsBaseLocation = dbContext.WmsBaseLocation.Where(t => t.warehouseId == 512 && t.ContainerStatus == "1").Where(t => idList.Contains(t.locationId)).ToList();
 
-
                 StringBuilder stringBuilder = new StringBuilder();
                 stringBuilder.AppendLine("确认出库:");
                 foreach (var item in wmsBaseLocation)
@@ -3918,8 +3867,8 @@ namespace Khd.Core.Wpf.Form
                 MessageBoxResult MessageBoxResult = HandyControl.Controls.MessageBox.Show(stringBuilder.ToString(), "提示", MessageBoxButton.YesNo);
                 if (MessageBoxResult == MessageBoxResult.Yes)
                 {
-
                     #region 出库创建taskmanual，如果有之前的出库任务， 弹框提示有未完成的出库任务，是否继续出库，如果继续，删除之前的出库任务
+
                     var removeList = dbContext.WcsTask.Where(x => x.taskType == 30 && x.taskStatus == 6).ToList();
                     if (removeList.Count > 0)
                     {
@@ -3938,8 +3887,7 @@ namespace Khd.Core.Wpf.Form
                         }
                     }
 
-
-                    var removeTaskManualList = dbContext.WcsTaskManual.Where(x => x.taskType == 30 ).ToList();
+                    var removeTaskManualList = dbContext.WcsTaskManual.Where(x => x.taskType == 30).ToList();
                     if (removeTaskManualList.Count > 0)
                     {
                         StringBuilder stringContainers = new StringBuilder();
@@ -3957,9 +3905,7 @@ namespace Khd.Core.Wpf.Form
                         }
                     }
 
-
-                    #endregion
-
+                    #endregion 出库创建taskmanual，如果有之前的出库任务， 弹框提示有未完成的出库任务，是否继续出库，如果继续，删除之前的出库任务
 
                     List<WcsTaskManual> addList = new List<WcsTaskManual>();
                     foreach (var item in wmsBaseLocation)
@@ -3985,17 +3931,15 @@ namespace Khd.Core.Wpf.Form
                             fromFloorNo = 5,
                             useFlag = 1
                         });
-                       // item.ContainerStatus = "2";
+                        // item.ContainerStatus = "2";
                         //item.locationStatus = "6";
-                    //    dbContext.Update(item);
+                        //    dbContext.Update(item);
                     }
                     if (addList.Count < 6)
                     {
                         var messageBoxResult = HandyControl.Controls.MessageBox.Show($"已创建{addList.Count}个料箱的任务，是否需要创建出空箱的任务？", "提示", MessageBoxButton.YesNo, MessageBoxImage.Question);
                         if (messageBoxResult == MessageBoxResult.Yes)
                         {
-     
-
                             EmptyCountForm emptyCountForm = new(1, 6 - addList.Count);
                             emptyCountForm.ShowDialog();
                             if (EmptyCountForm.IsSelect)
@@ -4094,7 +4038,6 @@ namespace Khd.Core.Wpf.Form
                 }
                 catch
                 {
-
                 }
             }
         }
@@ -4133,7 +4076,7 @@ namespace Khd.Core.Wpf.Form
                                         select t1.location_id locationId,
                                                t1.container_code containerCode,
                                                t1.location_code locationCode
-                               
+
                                         from wms_base_location t1
                                         left join wms_raw_stock t2
                                         on t1.location_code=t2.location_code
@@ -4142,7 +4085,6 @@ namespace Khd.Core.Wpf.Form
                                         order by t1.loc_column,t1.loc_row
                                 ");
 
-
                         var wmsLocation = dbContext.WmsBaseLocation.FirstOrDefault(t => t.locationId == idList[0] && t.locationStatus == "1");
                         if (wmsLocation == null)
                         {
@@ -4269,7 +4211,6 @@ namespace Khd.Core.Wpf.Form
             }
             catch
             {
-
             }
         }
 
@@ -4306,7 +4247,6 @@ namespace Khd.Core.Wpf.Form
             }
             catch
             {
-
             }
         }
 
@@ -4314,7 +4254,6 @@ namespace Khd.Core.Wpf.Form
         {
             try
             {
-
                 BasePlcpoint basePlcpoint = SystemData.BasePlcpoints.First(t => t.plcpointNo == "canReceive");
                 SystemData.PlcDic[1].WriteToPoint(basePlcpoint.plcpointAddress, "1", basePlcpoint.plcpointLength.ToString());
                 MsgText.Text = "一键收料发送成功";
@@ -4369,11 +4308,11 @@ namespace Khd.Core.Wpf.Form
 
         private void Button_Click(object sender, RoutedEventArgs e)
         {
-
             TextBoxGetFocus();
         }
 
         #region 清除按钮
+
         private void barClear_Click(object sender, RoutedEventArgs e)
         {
             txtInBarCode.Text = string.Empty;
@@ -4394,7 +4333,6 @@ namespace Khd.Core.Wpf.Form
             txtOutBarCode.Text = string.Empty;
         }
 
-
         private void boxReturnClear_Click(object sender, RoutedEventArgs e)
         {
             txtReturnBox.Text = string.Empty;
@@ -4404,9 +4342,11 @@ namespace Khd.Core.Wpf.Form
         {
             txtReturnBarCode.Text = string.Empty;
         }
-        #endregion
+
+        #endregion 清除按钮
 
         #region 托盘库进出
+
         private void OneIn_Click(object sender, RoutedEventArgs e)
         {
             try
@@ -4616,7 +4556,6 @@ namespace Khd.Core.Wpf.Form
                     HandyControl.Controls.MessageBox.Show("检测到外侧有托盘，无法出堆垛机");
                 }
             }
-
             catch (Exception ex)
             {
                 if (ex is PlcException)
@@ -4637,9 +4576,11 @@ namespace Khd.Core.Wpf.Form
                 LogManager.Error(ex);
             }
         }
-        #endregion
+
+        #endregion 托盘库进出
 
         #region 修改托盘库
+
         private void UpdateEmpty_Click(object sender, RoutedEventArgs e)
         {
             try
@@ -4662,10 +4603,10 @@ namespace Khd.Core.Wpf.Form
             }
             catch
             {
-
             }
         }
-        #endregion
+
+        #endregion 修改托盘库
 
         private void WindowHidden_Click(object sender, RoutedEventArgs e)
         {
@@ -4734,10 +4675,6 @@ namespace Khd.Core.Wpf.Form
                     HandyControl.Controls.MessageBox.Show("请先检查废料口袋子抓夹是否没有释放!");
                     return;
                 }
-
-
-
-             
             }
             catch (Exception ex)
             {
@@ -4757,14 +4694,15 @@ namespace Khd.Core.Wpf.Form
             {
                 HandyControl.Controls.MessageBox.Show("有任务正在执行，请等待任务完成后再执行此操作!");
                 return;
-            }else if (baseEquip.equipStatus == 1)
+            }
+            else if (baseEquip.equipStatus == 1)
             {
                 HandyControl.Controls.MessageBox.Show("废料区有托盘，请先移走!");
                 return;
             }
             else
             {
-                var startEquip = dbContext.BaseEquip.FirstOrDefault(t => t.equipType == 20 && t.equipStatus == 1 && t.emptyCount == 1 && t.useFlag == 1 && t.ud3=="1");
+                var startEquip = dbContext.BaseEquip.FirstOrDefault(t => t.equipType == 20 && t.equipStatus == 1 && t.emptyCount == 1 && t.useFlag == 1 && t.ud3 == "1");
                 if (startEquip == null)
                 {
                     MessageBox.Show("二楼未找到一个托盘的库位，请前往一楼调取");
@@ -4875,12 +4813,12 @@ namespace Khd.Core.Wpf.Form
                 using var scope = _host.Services.CreateScope();
                 using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
                 BaseEquip baseEquip = dbContext.BaseEquip.First(t => t.objid == equip.objid);
-                if (baseEquip.objid ==38)
+                if (baseEquip.objid == 38)
                 {
                     HandyControl.Controls.MessageBox.Show("废料区禁止直接出到楼层，请点击  废料区出托盘到周转区 按钮");
                     return;
                 }
-                if (baseEquip.ud3 !="2")
+                if (baseEquip.ud3 != "2")
                 {
                     HandyControl.Controls.MessageBox.Show("不是废料禁止出到1楼或3楼");
                     return;
@@ -4925,6 +4863,7 @@ namespace Khd.Core.Wpf.Form
                 }
             }
         }
+
         /// <summary>
         /// 任务完成
         /// </summary>
@@ -4932,7 +4871,6 @@ namespace Khd.Core.Wpf.Form
         /// <param name="e"></param>
         private void taskCompeleted_Click(object sender, RoutedEventArgs e)
         {
-
         }
 
         private void querenruku_Click(object sender, RoutedEventArgs e)
@@ -4979,7 +4917,6 @@ namespace Khd.Core.Wpf.Form
             }
             catch
             {
-
             }
         }
 
@@ -5007,7 +4944,6 @@ namespace Khd.Core.Wpf.Form
         /// <param name="e"></param>
         private void AddUser_Click(object sender, RoutedEventArgs e)
         {
-
         }
 
         private void GetMenu()
@@ -5055,7 +4991,6 @@ namespace Khd.Core.Wpf.Form
             }
             catch
             {
-
             }
         }
 
@@ -5074,7 +5009,6 @@ namespace Khd.Core.Wpf.Form
         {
             InventoryMaterialWindow window = new InventoryMaterialWindow(_host);
             window.ShowDialog();
-
         }
 
         private void GetInvertoryData()
@@ -5109,7 +5043,6 @@ namespace Khd.Core.Wpf.Form
                         StartContent = t.CheckStatus == "0" ? "开始盘点" : "继续盘点",
                         StartEnable = t.CheckStatus == "2" ? false : true,
                         EndEnable = t.CheckStatus == "2" ? false : true,
-
                     });
 
                 this.InventoryMaterial.Items.Refresh();
@@ -5120,7 +5053,6 @@ namespace Khd.Core.Wpf.Form
             }
             catch
             {
-
             }
         }
 
@@ -5136,6 +5068,7 @@ namespace Khd.Core.Wpf.Form
             SelectOutRawForm selectOutRawForm = new SelectOutRawForm(this._host, "", 1);
             selectOutRawForm.ShowDialog();
         }
+
         //选择退库
         private void SelectReturnBtn_Click(object sender, RoutedEventArgs e)
         {
@@ -5171,7 +5104,6 @@ namespace Khd.Core.Wpf.Form
             }
             catch
             {
-
             }
         }
 
@@ -5200,6 +5132,7 @@ namespace Khd.Core.Wpf.Form
         }
 
         #region 移库方法
+
         private void rawSourceBox_TextChanged(object sender, RoutedEventArgs e)
         {
             if (this.rawSourceBox.Text.Length >= 1 && this.rawSourceBox.Text.Length < 15)
@@ -5214,7 +5147,6 @@ namespace Khd.Core.Wpf.Form
                 //WcsTask? wcsTask = dbContext.WcsTask.Where(t => t.containerNo == this.rawSourceBox.Text).FirstOrDefault();
                 //if (wcsTask == null)
                 //{
-
                 //    this.RemoveMsg.Text = $"未找到该托盘{this.rawSourceBox.Text}的移库任务!";
                 //    this.rawSourceBox.Text = "";
                 //    return;
@@ -5242,7 +5174,6 @@ namespace Khd.Core.Wpf.Form
             string barCode = rawSourceBarCode.Text;
             try
             {
-
                 using var scope = _host.Services.CreateScope();
                 using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
 
@@ -5291,18 +5222,14 @@ namespace Khd.Core.Wpf.Form
             }
         }
 
-
-
         private void removeSourceBox_TextChanged(object sender, RoutedEventArgs e)
         {
             if (this.rawSourceBox.Text.Length >= 15)
             {
                 removeSourceBarCode.Focus();
             }
-
         }
 
-
         private void removeSourceBarCode_TextChanged(object sender, RoutedEventArgs e)
         {
             if (this.removeSourceBarCode.Text.Length < 19)
@@ -5315,7 +5242,6 @@ namespace Khd.Core.Wpf.Form
             string barCode = removeSourceBarCode.Text;
             try
             {
-
                 using var scope = _host.Services.CreateScope();
                 using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
 
@@ -5349,7 +5275,6 @@ namespace Khd.Core.Wpf.Form
                     {
                         removeSourceMaterialName.Text = mesBaseMaterialInfo.MaterialName;
                         removeSourceMaterialSpec.Text = mesBaseMaterialInfo.MaterialSpec;
-
                     }
                 }
                 //判断目标库位是否有该物料
@@ -5398,7 +5323,6 @@ namespace Khd.Core.Wpf.Form
                 return;
             }
 
-
             using var scope = _host.Services.CreateScope();
             using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
 
@@ -5417,7 +5341,6 @@ namespace Khd.Core.Wpf.Form
 
             try
             {
-
                 WmsBaseLocation removeLocation = dbContext.WmsBaseLocation.Where(t => t.containerCode == this.removeSourceBox.Text).First();
                 WmsBaseLocation sourceLocation = dbContext.WmsBaseLocation.Where(t => t.containerCode == this.rawSourceBox.Text).First();
 
@@ -5436,7 +5359,7 @@ namespace Khd.Core.Wpf.Form
                 }
                 //判断目标库位是否有该物料
                 WmsRawStock? removeStock = dbContext.WmsRawStock.Where(t => t.instockBatch == this.removeSourceBarCode.Text && t.palletInfoCode == this.removeSourceBox.Text).FirstOrDefault();
-              //  WmsRawStock? removeStock = dbContext.WmsRawStock.Where(t => t.instockBatch == this.removeSourceBarCode.Text).FirstOrDefault();
+                //  WmsRawStock? removeStock = dbContext.WmsRawStock.Where(t => t.instockBatch == this.removeSourceBarCode.Text).FirstOrDefault();
                 if (removeStock != null)
                 {
                     sourceWmsRawStock.totalAmount -= decimal.Parse(this.removeScan.Text);
@@ -5480,6 +5403,7 @@ namespace Khd.Core.Wpf.Form
                 }
 
                 #region 插入移库记录
+
                 WmsMove wmsMove = new WmsMove();
                 wmsMove.MoveId = Global.SnowId.NextId();
                 wmsMove.TaskCode = Global.SnowId.NextId().ToString();
@@ -5519,7 +5443,8 @@ namespace Khd.Core.Wpf.Form
 
                 dbContext.WmsMove.Add(wmsMove);
                 dbContext.WmsMoveDetail.Add(wmsMoveDetail);
-                #endregion
+
+                #endregion 插入移库记录
 
                 dbContext.SaveChanges();
 
@@ -5539,8 +5464,7 @@ namespace Khd.Core.Wpf.Form
             }
         }
 
-        #endregion
-
+        #endregion 移库方法
 
         private void OutEnter(object sender, KeyEventArgs e)
         {
@@ -5549,7 +5473,6 @@ namespace Khd.Core.Wpf.Form
                 // 触发按钮的点击事件
                 OutRaw();
             }
-
         }
 
         private void LocationPersonBox_Click(object sender, RoutedEventArgs e)
@@ -5602,7 +5525,6 @@ namespace Khd.Core.Wpf.Form
                     locationDtos.Clear();
                     GetBaseLocations();
                     HandyControl.Controls.MessageBox.Show("锁定成功!");
-
                 }
                 catch
                 {
@@ -5640,7 +5562,6 @@ namespace Khd.Core.Wpf.Form
                     locationDtos.Clear();
                     GetBaseLocations();
                     HandyControl.Controls.MessageBox.Show("解锁成功!");
-
                 }
                 catch
                 {
@@ -5649,7 +5570,6 @@ namespace Khd.Core.Wpf.Form
             }
         }
 
-
         /// <summary>
         /// 取消预调度
         /// </summary>
@@ -5677,7 +5597,6 @@ namespace Khd.Core.Wpf.Form
             DrawLocaitons();
         }
 
-      
         private List<WmsBaseLocation> GetLocations()
         {
             try
@@ -5797,13 +5716,9 @@ namespace Khd.Core.Wpf.Form
                                 };
                             }
 
-
-
                             button.Click += OnLocationButton_Click;
                             Grid.SetColumn(button, location.locColumn.Value - 1);
 
-                            
-
                             if (list[0] == 231)
                             {
                                 Grid.SetRow(button, -(location.locRow.Value - row.Value) + 2);
@@ -5827,8 +5742,8 @@ namespace Khd.Core.Wpf.Form
                             }
                             else
                             {
-
                                 #region 五楼4、5行颠倒
+
                                 if (location.warehouseId == 511)
                                 {
                                     int locRow = location.locRow.Value;
@@ -5847,7 +5762,8 @@ namespace Khd.Core.Wpf.Form
                                     Grid.SetRow(button, -(location.locRow.Value - row.Value));
                                 }
                                 //  Grid.SetRow(button, -(location.locRow.Value - row.Value));
-                                #endregion
+
+                                #endregion 五楼4、5行颠倒
 
                                 if (list[0] == 311)
                                 {
@@ -5879,9 +5795,7 @@ namespace Khd.Core.Wpf.Form
             }
             catch
             {
-
             }
-
         }
 
         private void OnLocationButton_Click(object sender, RoutedEventArgs e)
@@ -6027,7 +5941,6 @@ namespace Khd.Core.Wpf.Form
             GetInvertoryData();
         }
 
-
         /// <summary>
         /// 提升机报警信息查询
         /// </summary>
@@ -6048,8 +5961,6 @@ namespace Khd.Core.Wpf.Form
         {
             HoistWarnHandlerWindow window = new HoistWarnHandlerWindow(_host);
             window.ShowDialog();
-           
         }
     }
-}
-
+}
\ No newline at end of file