。

src/Khd.Core.Wpf/Form/FormBoardT.xaml

@@ -2325,14 +2325,6 @@
                                                                     Width="*"
                                                                     ElementStyle="{StaticResource dgCell}"
                                                                     />
-
-                                                                <!--<DataGridTextColumn
-                                                                     Header="箱体携带数量"
-                                                                     Binding="{Binding thisOutAmount}"
-                                                                     ElementStyle="{StaticResource dgCell}"                                                                  
-                                                                     Width="3*"
-                                                                     />-->
-
                                                                 <DataGridTemplateColumn
                                                    Width="3*" 
                                                    CanUserSort="False"
@@ -2345,8 +2337,6 @@
                                                                     </DataGridTemplateColumn.CellTemplate>
                                                                 </DataGridTemplateColumn>
 
-
-
                                                             </DataGrid.Columns>
                                                             <DataGrid.CellStyle>
                                                                 <Style TargetType="{x:Type DataGridCell}">
@@ -2360,7 +2350,7 @@
                                                                 <Style TargetType="{x:Type DataGridRow}">
                                                                     <Setter Property="Background" Value="Transparent" />
                                                                     <Setter Property="Foreground" Value="White" />
-                                                                   
+                                                                    <Setter Property="Height" Value="Auto" />
                                                                 </Style>
                                                             </DataGrid.RowStyle>
                                                             <DataGrid.RowHeaderStyle>

src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs

@@ -335,7 +335,8 @@ namespace Khd.Core.Wpf.Form
                 }
 
                 LocationsControl.ItemsSource = locations;
-            }catch (Exception ex)
+            }
+            catch (Exception ex)
             {
                 MessageBox.Show(ex.Message);
             }
@@ -349,7 +350,7 @@ namespace Khd.Core.Wpf.Form
                 var location = button.DataContext as Location;
                 if (location != null)
                 {
-                    StockWindow window = new StockWindow(_host,location.LocationId);
+                    StockWindow window = new StockWindow(_host, location.LocationId);
                     window.Show();
                     // MessageBox.Show(location.LocationId.ToString());
                 }
@@ -475,7 +476,7 @@ namespace Khd.Core.Wpf.Form
                     string nowStationCode = baseEquip.endStationCode;
                     Dispatcher.Invoke(() =>
                     {
-                        this.OutOrder.Text =   "当前:"+nowStationCode+"\n" +"待出库单：\n" + list.Distinct().Join("\n");
+                        this.OutOrder.Text = "当前:" + nowStationCode + "\n" + "待出库单：\n" + list.Distinct().Join("\n");
                     });
 
 
@@ -1451,7 +1452,8 @@ namespace Khd.Core.Wpf.Form
                 {
                     if (wcsCmd.taskType == 32)//领料
                     {
-                        if(count>)
+                        if (count > 0)
+                        {
                             MessageBoxResult messageBoxResult = HandyControl.Controls.MessageBox.Show("是否需要背负式小车返回？", "提示信息", MessageBoxButton.YesNoCancel, MessageBoxImage.Information);
                             if (messageBoxResult == MessageBoxResult.Yes)
                             {
@@ -1464,7 +1466,7 @@ namespace Khd.Core.Wpf.Form
                                 dbContext.Add(wcsTaskLog);
                                 dbContext.Add(wcsTask);
                             }
-                        else if (messageBoxResult == MessageBoxResult.Cancel)
+                            else
                             {
                                 BaseEquip baseEquip = dbContext.BaseEquip.First(t => t.objid == 10);
                                 baseEquip.endStationCode = string.Empty;
@@ -1473,6 +1475,18 @@ namespace Khd.Core.Wpf.Form
                                 dbContext.SaveChanges();
                                 return;
                             }
+
+                        }
+                        else
+                        {
+                            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)
                         {
                             wcsCmd.taskStatus = 4;
@@ -2426,6 +2440,9 @@ namespace Khd.Core.Wpf.Form
         {
             try
             {
+
+
+
                 if (!string.IsNullOrEmpty(txtOutBox.Text) && !string.IsNullOrEmpty(txtOutBarCode.Text))
                 {
                     using var scope = _host.Services.CreateScope();
@@ -2508,6 +2525,15 @@ namespace Khd.Core.Wpf.Form
                             }
                             else
                             {
+                                // 没有申请单
+                                // 如果选中了出库单，并且无需要出库的申请单，则禁止出库
+                                BaseEquip baseEquip = dbContext.BaseEquip.First(t => t.objid == 10);
+                                if (!string.IsNullOrEmpty(baseEquip.endStationCode))
+                                {
+                                    scanOutMsg.Text = "申请单里该条码无需出库！";
+                                    return;
+                                }
+
                                     if (mesBaseBarcodeInfo.PurchaseOrderId == null)
                                     {
                                         wmsRawStock.totalAmount -= outScan;