From 8405d6a397240df0a09a658988b2df45163d9b1c Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Fri, 8 Nov 2024 17:27:21 +0800
Subject: [PATCH] change

---
 SlnMesnac.Business/ProdCompletionBusiness.cs  | 12 +++-----
 .../service/Impl/WmsOutStockServiceImpl.cs    |  2 +-
 SlnMesnac.WPF/Page/BaseConfigInfoPage.xaml    |  6 ++--
 SlnMesnac.WPF/Page/BaseConfigInfoPage.xaml.cs | 21 +++++++++-----
 SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs     | 28 ++++++++++---------
 SlnMesnac.WPF/Page/ManualDeliveryWindow.xaml  |  3 +-
 .../Page/ManualDeliveryWindow.xaml.cs         |  8 ++++++
 7 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/SlnMesnac.Business/ProdCompletionBusiness.cs b/SlnMesnac.Business/ProdCompletionBusiness.cs
index 0b3743c..11c0d8b 100644
--- a/SlnMesnac.Business/ProdCompletionBusiness.cs
+++ b/SlnMesnac.Business/ProdCompletionBusiness.cs
@@ -285,15 +285,11 @@ namespace SlnMesnac.Business
                         Thread.Sleep(3000);
                         continue;
                     }
-                    // plc.writeStringByAddress(GetPlcAddressByConfigKey("2楼码垛出口RFID条码地址"), "JYHB01010125", 12);
-
-
                    
 
                     if (!plc.readBoolByAddress(GetPlcAddressByConfigKey("2楼小包出口到位信号")))
                     {
-                        // _logger.LogInformation("等待小包出口信号触发......");
-                        // 清空RFID
+                       
                         plc.writeStringByAddress(GetPlcAddressByConfigKey("2楼码垛出口RFID条码地址"), "", 12);
                         Thread.Sleep(5000);
                         continue;
@@ -357,7 +353,7 @@ namespace SlnMesnac.Business
                         continue;
                     }
 
-                    RefreshMessage($"2F小包出口读取到RFID条码{epcStr},开始绑定流程:");
+                    RefreshMessage($"2F小包出口读取到RFID条码{epcStr},开始入库:");
 
                     _mesProductPlanService.GetStartedProdPlan(out MesProductPlanDto productPlanDto);
                     if (productPlanDto == null)
@@ -382,8 +378,8 @@ namespace SlnMesnac.Business
                     UpdatePlanInfoAndOrder(productPlanDto);
 
 
-                    // 删除正在使用的数据库托盘号
-                    List<RealPalletTask> realPalletList = _realPalletTaskService.Query(x => x.PalletCode == epcStr);
+                    // 删除所有数据库托盘号
+                    List<RealPalletTask> realPalletList = _realPalletTaskService.Query();
                     if (realPalletList != null && realPalletList.Count > 0)
                     {
                         sqlSugarClient.AsTenant().GetConnection("mes").Deleteable(realPalletList).ExecuteCommand();
diff --git a/SlnMesnac.Repository/service/Impl/WmsOutStockServiceImpl.cs b/SlnMesnac.Repository/service/Impl/WmsOutStockServiceImpl.cs
index 612d502..17e86d4 100644
--- a/SlnMesnac.Repository/service/Impl/WmsOutStockServiceImpl.cs
+++ b/SlnMesnac.Repository/service/Impl/WmsOutStockServiceImpl.cs
@@ -48,7 +48,7 @@ namespace SlnMesnac.Repository.service.Impl
         {
             try
             {
-                return base._rep.GetFirst(x => x.planCode == planCode);
+                return base._rep.GetFirst(x => x.planCode == planCode && x.executeStatus!="2");
             }
             catch (Exception ex)
             {
diff --git a/SlnMesnac.WPF/Page/BaseConfigInfoPage.xaml b/SlnMesnac.WPF/Page/BaseConfigInfoPage.xaml
index 8290138..3b7787e 100644
--- a/SlnMesnac.WPF/Page/BaseConfigInfoPage.xaml
+++ b/SlnMesnac.WPF/Page/BaseConfigInfoPage.xaml
@@ -20,7 +20,7 @@
 
                 <Button Content="鏌�  璇�" FontSize="16" Style="{StaticResource BUTTON_AGREE}"  Width="120" Height="35" Background="#007DFA" BorderBrush="#007DFA" Margin="20,0,10,0" Command="{Binding QuerySearchCommand}" CommandParameter="{Binding Text, ElementName=queryParam}" />
 
-                <Button Content="閲�  缃�" FontSize="16" Style="{StaticResource BUTTON_AGREE}"  Width="120" Height="35" Background="#007DFA" BorderBrush="#007DFA" Margin="20,0,10,0" Command="{Binding ResetSearchCommand}" />
+                <Button Content="閲�  缃�" FontSize="16" Visibility="Collapsed" Style="{StaticResource BUTTON_AGREE}"  Width="120" Height="35" Background="#007DFA" BorderBrush="#007DFA" Margin="20,0,10,0" Command="{Binding ResetSearchCommand}" />
 
             </StackPanel>
         </Border>
@@ -43,7 +43,7 @@
                 <TextBox Text="{Binding SelectedItem.IsFlag, ElementName=dgvMH}" x:Name="ConfigFlag" Foreground="White" FontSize="18" Width="200" Height="35"/>
 
                 <!--<Button Content="淇濆瓨" FontSize="16" Style="{StaticResource BUTTON_AGREE}"  Width="120" Height="35" Background="#007DFA" BorderBrush="#007DFA" Margin="20,0,10,0" Command="{Binding QuerySearchCommand}" CommandParameter="{Binding Text, ElementName=queryParam}" />-->
-                <Button Content="娣诲姞" FontSize="16" Style="{StaticResource BUTTON_AGREE}" Width="120" Height="35" Background="#007DFA" BorderBrush="#007DFA" Margin="20,0,10,0" Click="SaveButton_Click" />
+                <Button Content="娣诲姞" FontSize="16" Style="{StaticResource BUTTON_AGREE}" Visibility="Collapsed" Width="120" Height="35" Background="#007DFA" BorderBrush="#007DFA" Margin="20,0,10,0" Click="SaveButton_Click" />
                 <Button Content="淇敼" FontSize="16" Style="{StaticResource BUTTON_AGREE}" Width="120" Height="35" Background="#007DFA" BorderBrush="#007DFA" Margin="20,0,10,0" Click="EditButton_Click" />
 
             </StackPanel>
@@ -68,7 +68,7 @@
                         <DataGridTemplateColumn.CellTemplate>
                             <DataTemplate>
                                 <StackPanel Orientation="Horizontal">
-                                    <Button Content="鍒犻櫎" CommandParameter="{Binding ConfigId}" Background="Red" Foreground="White" Margin="10,0,0,0" Height="25" BorderBrush="Red" BorderThickness="0" Width="100" Command="{Binding DataContext.DeleteCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}"/>
+                                    <Button Content="鍒犻櫎" CommandParameter="{Binding ConfigId}"  Visibility="Collapsed" Background="Red" Foreground="White" Margin="10,0,0,0" Height="25" BorderBrush="Red" BorderThickness="0" Width="100" Command="{Binding DataContext.DeleteCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}"/>
                                 </StackPanel>
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
diff --git a/SlnMesnac.WPF/Page/BaseConfigInfoPage.xaml.cs b/SlnMesnac.WPF/Page/BaseConfigInfoPage.xaml.cs
index 6bf674c..023621d 100644
--- a/SlnMesnac.WPF/Page/BaseConfigInfoPage.xaml.cs
+++ b/SlnMesnac.WPF/Page/BaseConfigInfoPage.xaml.cs
@@ -41,13 +41,20 @@ namespace SlnMesnac.WPF.Page
 
         private void EditButton_Click(object sender, RoutedEventArgs e)
         {
-            string configId = ConfigId.Text;
-            string configKey = ConfigKey.Text;
-            string configName = ConfigName.Text;
-            string configValue = ConfigValue.Text;
-            string configFlag = ConfigFlag.Text;
-            // 璋冪敤 ViewModel 涓殑鏂规硶骞朵紶閫掑弬鏁�
-            ViewModel.Edit(configId,configKey, configName, configValue, configFlag);
+            var result = MessageBox.Show("纭淇敼鍚�","纭妗�", MessageBoxButton.YesNo, MessageBoxImage.Question);
+
+            if (result == MessageBoxResult.Yes)
+            {
+                string configId = ConfigId.Text;
+                string configKey = ConfigKey.Text;
+                string configName = ConfigName.Text;
+                string configValue = ConfigValue.Text;
+                string configFlag = ConfigFlag.Text;
+                // 璋冪敤 ViewModel 涓殑鏂规硶骞朵紶閫掑弬鏁�
+                ViewModel.Edit(configId, configKey, configName, configValue, configFlag);
+            }
+   
+           
         }
     }
 }
diff --git a/SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs b/SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs
index 9083ad5..7b10f7d 100644
--- a/SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs
+++ b/SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs
@@ -838,13 +838,13 @@ namespace SlnMesnac.WPF.Page
                     if (unpackStatus)
                     {
                         recipeManageCache.SystemStatus = "1";
-                        App.Current.Dispatcher.BeginInvoke((Action)(() =>
-                        {
-                            StartButton.IsEnabled = true;
-                        }));
+                      
                         MessageBoxAndLog("涓�閿惎鍔ㄦ墍鏈夋満鍣ㄦ垚鍔�!");
-
                     }
+                    App.Current.Dispatcher.BeginInvoke((Action)(() =>
+                    {
+                        StartButton.IsEnabled = true;
+                    }));
 
                 });
             }
@@ -853,9 +853,9 @@ namespace SlnMesnac.WPF.Page
                 Application.Current.Dispatcher.Invoke(() =>
                 {
                     Msg.MsgShow($"涓�閿惎鍔ㄥ紓甯�:{ex.Message}", 2, 5);
+                    StartButton.IsEnabled = true;
                 });
-                
-                StartButton.IsEnabled = true;
+
             }
         }
 
@@ -896,13 +896,14 @@ namespace SlnMesnac.WPF.Page
                             runtime.ConfigValue = timeRangeSet.ConfigValue;
                             _configInfoBusiness.UpdateConfigInfo(runtime);
 
-                            App.Current.Dispatcher.BeginInvoke((Action)(() =>
-                            {
-                                StopButton.IsEnabled = true;
-                            }));
-
                         }
 
+                        App.Current.Dispatcher.BeginInvoke((Action)(() =>
+                        {
+                            StopButton.IsEnabled = true;
+                        }));
+
+
                     });
                     #endregion
 
@@ -912,9 +913,10 @@ namespace SlnMesnac.WPF.Page
                     Application.Current.Dispatcher.Invoke(() =>
                     {
                         Msg.MsgShow($"涓�閿仠姝�:{ex.Message}", 2, 5);
+                        StopButton.IsEnabled = true;
                     });
                 
-                    StopButton.IsEnabled = true;
+                  
                 }
             }
         }
diff --git a/SlnMesnac.WPF/Page/ManualDeliveryWindow.xaml b/SlnMesnac.WPF/Page/ManualDeliveryWindow.xaml
index 8759796..836d71b 100644
--- a/SlnMesnac.WPF/Page/ManualDeliveryWindow.xaml
+++ b/SlnMesnac.WPF/Page/ManualDeliveryWindow.xaml
@@ -6,7 +6,8 @@
         xmlns:local="clr-namespace:SlnMesnac.WPF.Page"
         xmlns:local1="clr-namespace:SlnMesnac.WPF.Converter.ProdMgmt"
         mc:Ignorable="d" Topmost="True"
-        Title="鎶曟枡绠＄悊" Height="750" Width="1000" Background="White" Name="window" WindowStartupLocation="CenterOwner">
+        Title="鎶曟枡绠＄悊" Height="750" Width="1000" Background="White" Name="window" WindowStartupLocation="CenterOwner"
+        StateChanged="Window_StateChanged">
     <Control.Resources>
         <local1:PlanStatusConverter x:Key="PlanStatusConverter" />
         <local1:PlanAmountConverter x:Key="PlanAmountConverter" />
diff --git a/SlnMesnac.WPF/Page/ManualDeliveryWindow.xaml.cs b/SlnMesnac.WPF/Page/ManualDeliveryWindow.xaml.cs
index d515f64..f1ad78b 100644
--- a/SlnMesnac.WPF/Page/ManualDeliveryWindow.xaml.cs
+++ b/SlnMesnac.WPF/Page/ManualDeliveryWindow.xaml.cs
@@ -26,5 +26,13 @@ namespace SlnMesnac.WPF.Page
 
             this.DataContext = new ManualDeliveryViewModel();
         }
+
+        private void Window_StateChanged(object sender, EventArgs e)
+        {
+            if (this.WindowState == WindowState.Minimized)
+            {
+                this.Close(); // 褰撶獥鍙ｆ渶灏忓寲鏃跺叧闂獥鍙�
+            }
+        }
     }
 }