From 1ca331b8fc54e0dd085ef97cc22c6e57a79c03bb Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Sat, 31 Aug 2024 16:31:31 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Khd.Core.Wpf/Form/FormBoardT.xaml    | 4 ++--
 src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
index fafdfa4..5c234b5 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
@@ -2294,7 +2294,7 @@
                                                                     Width="*"
                                                                     />
                                                                 <DataGridTextColumn
-                                                                    Header="物料描述"
+                                                                    Header="物料规格"
                                                                     Binding="{Binding materialSpec}"
                                                                     ElementStyle="{StaticResource dgCell}"
                                                                     Width="*"
@@ -2328,7 +2328,7 @@
                                                                 <DataGridTemplateColumn
                                                    Width="3*" 
                                                    CanUserSort="False"
-                                                   Header="箱体携带数量"
+                                                   Header="料箱携带数量"
                                                    IsReadOnly="True" >
                                                                     <DataGridTemplateColumn.CellTemplate>
                                                                         <DataTemplate>
diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
index 04dfc72..339ef8d 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
@@ -1435,7 +1435,7 @@ namespace Khd.Core.Wpf.Form
         {
             try
             {
-                MessageBoxResult messageBoxResult = HandyControl.Controls.MessageBox.Show("是否确认捡料完成？", "提示信息", MessageBoxButton.YesNoCancel, MessageBoxImage.Information);
+                MessageBoxResult messageBoxResult = HandyControl.Controls.MessageBox.Show("是否确认捡料完成？", "提示信息", MessageBoxButton.YesNo, MessageBoxImage.Information);
                 if (messageBoxResult == MessageBoxResult.Yes)
                 {
                     //剩余出库单
@@ -1475,8 +1475,7 @@ namespace Khd.Core.Wpf.Form
                                     baseEquip.endStationCode = string.Empty;
                                     baseEquip.ud3 = null;
                                     dbContext.Update(baseEquip);
-                                    dbContext.SaveChanges();
-
+                                   
                                 }
 
                             }
@@ -1487,7 +1486,7 @@ namespace Khd.Core.Wpf.Form
                                 baseEquip.ud3 = null;
                                 dbContext.Update(baseEquip);
                                 dbContext.SaveChanges();
-                                return;
+                               
                             }
 
                             if (wcsCmd.taskStatus == 3)