diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
index 07fec3b..acd2fe0 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
@@ -2266,7 +2266,9 @@
                                                         <RowDefinition Height="*"/>
                                                     </Grid.RowDefinitions>
                                                     <Border BorderBrush="White" BorderThickness="2"  Grid.ColumnSpan="1" Grid.Column="5" Grid.RowSpan="2" Margin="20 0 0 0">
+                                                        
                                                         <StackPanel Orientation="Vertical" >
+                                                           
                                                             <TextBlock x:Name="OutOrder" Background="Transparent" Grid.ColumnSpan="2" Grid.RowSpan="2" VerticalAlignment="Top" HorizontalAlignment="Center"/>
                                                             <TextBlock x:Name="thisOutEndStation" Background="Transparent" Grid.ColumnSpan="2" Grid.RowSpan="2" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="0,20,0,0"/>
                                                         </StackPanel>
diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
index fa42e6c..e3c7bd2 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
@@ -470,12 +470,15 @@ namespace Khd.Core.Wpf.Form
                         .ToList();
                     List<string> list = wmsRawOutstocks.Select(t => t.endStationCode).ToList();
                     List<long?> orderIds = wmsRawOutstocks.Select(t => t.rawOutstockId).ToList();
+
+                    BaseEquip baseEquip = dbContext.BaseEquip.First(t => t.objid == 10);
+                    string nowStationCode = baseEquip.endStationCode;
                     Dispatcher.Invoke(() =>
                     {
-                        this.OutOrder.Text = "待出库单：\n" + list.Distinct().Join("\n");
+                        this.OutOrder.Text =   "当前:"+nowStationCode+"\n" +"待出库单：\n" + list.Distinct().Join("\n");
                     });
 
-                    var baseEquip = dbContext.BaseEquip.First(t => t.objid == 10);
+                    
                     if (!string.IsNullOrEmpty(baseEquip.endStationCode))
                     {
                         #region 待测试
@@ -1431,12 +1434,11 @@ namespace Khd.Core.Wpf.Form
         {
             try
             {
+                //剩余出库单
+                int count =   OutTaskNumber.Items.Count;
                 using var scope = _host.Services.CreateScope();
                 using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
-                BaseEquip baseEquip = dbContext.BaseEquip.First(t => t.objid == 10);
-                baseEquip.endStationCode = string.Empty;
-                baseEquip.ud3 = null;
-                dbContext.Update(baseEquip);
+               
                 var wcsCmd = dbContext.WcsTask
                     .Where(t => t.taskStatus == 6 || t.taskStatus == 3)
                     .Where(t => t.nextPointId == 10)
@@ -1449,6 +1451,7 @@ namespace Khd.Core.Wpf.Form
                 {
                     if (wcsCmd.taskType == 32)//领料
                     {
+                        if(count>)
                         MessageBoxResult messageBoxResult = HandyControl.Controls.MessageBox.Show("是否需要背负式小车返回？", "提示信息", MessageBoxButton.YesNoCancel, MessageBoxImage.Information);
                         if (messageBoxResult == MessageBoxResult.Yes)
                         {
@@ -1463,6 +1466,11 @@ namespace Khd.Core.Wpf.Form
                         }
                         else if (messageBoxResult == MessageBoxResult.Cancel)
                         {
+                            BaseEquip baseEquip = dbContext.BaseEquip.First(t => t.objid == 10);
+                            baseEquip.endStationCode = string.Empty;
+                            baseEquip.ud3 = null;
+                            dbContext.Update(baseEquip);
+                            dbContext.SaveChanges();
                             return;
                         }
                         if (wcsCmd.taskStatus == 3)