From b601236464e7ec448278354c1eb3805ee9b38215 Mon Sep 17 00:00:00 2001
From: zhangxy <xuanyu9708>
Date: Thu, 7 Aug 2025 16:23:18 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=89=8B=E5=8A=A8=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SlnMesnac.WPF/Page/MannulResignBoxWindow.xaml  |  2 ++
 .../Page/MannulResignBoxWindow.xaml.cs         | 18 ++++++++++++------
 .../ViewModel/DeviceMonitorViewModel.cs        |  4 ++++
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/SlnMesnac.WPF/Page/MannulResignBoxWindow.xaml b/SlnMesnac.WPF/Page/MannulResignBoxWindow.xaml
index 1b345b2..ad236a1 100644
--- a/SlnMesnac.WPF/Page/MannulResignBoxWindow.xaml
+++ b/SlnMesnac.WPF/Page/MannulResignBoxWindow.xaml
@@ -49,5 +49,7 @@
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
             Click="ConfirmButton_Click" />
+        <TextBlock HorizontalAlignment="Left" Margin="59,10,0,0" Grid.Row="2" Foreground="Red" TextWrapping="Wrap" Text="注意：&#x0D;1.该功能为将库位信息直接写入数据库，并解锁该库位，非必要不要轻易使用！&#x0D; &#x0D; 2.使用手动入库前请务必结合平板确认现场库位信息，并保证小车不处于运行状态！" FontSize="17" VerticalAlignment="Top" Height="218" Width="194"/>
+        <CheckBox x:Name="ForceWrite_CheckBox" Content="强制写入" Foreground="Red" HorizontalAlignment="Left" Margin="527,0,0,0" Grid.Row="2" VerticalAlignment="Center"/>
     </Grid>
 </Window>
\ No newline at end of file
diff --git a/SlnMesnac.WPF/Page/MannulResignBoxWindow.xaml.cs b/SlnMesnac.WPF/Page/MannulResignBoxWindow.xaml.cs
index f0ec205..472145a 100644
--- a/SlnMesnac.WPF/Page/MannulResignBoxWindow.xaml.cs
+++ b/SlnMesnac.WPF/Page/MannulResignBoxWindow.xaml.cs
@@ -69,11 +69,17 @@ namespace SlnMesnac.WPF.Page
                 MessageBox.Show("请输入入库库位");
                 return;
             }
-            if (startCode == BoxCode)
+
+
+            if(BoxCode !="" && BoxCode != null)
             {
-                MessageBox.Show("请检查格式！");
-                return;
+                if (startCode == BoxCode || BoxCode.Substring(0,10) != "SHS0000000" || BoxCode.Length !=12)
+                {
+                    MessageBox.Show("请检查格式！");
+                    return;
+                }
             }
+            
 
             if (startCode == "异常库位3066")
             {
@@ -81,10 +87,10 @@ namespace SlnMesnac.WPF.Page
             }
 
             WmsBaseLocation? startLocation = SqlSugarClient.Queryable<WmsBaseLocation>().Where(it => it.LocationCode == startCode).First();
-            WmsPalletInfo? wmsPalletInfo = SqlSugarClient.Queryable<WmsPalletInfo>().InnerJoin<WmsBaseLocation>((x,y) => x.Amount == 0 && y.LocationCode == startCode).First();
+            WmsPalletInfo? wmsPalletInfo = SqlSugarClient.Queryable<WmsPalletInfo>().InnerJoin<WmsBaseLocation>((x,y) => x.Amount >= 0 && y.LocationCode == startCode && y.ContainerCode.Length>1 ).First();
 
-            if (wmsPalletInfo == null) {
-                MessageBox.Show("起点库位托盘未清空,无法入库！请检查！");
+            if (wmsPalletInfo != null && ForceWrite_CheckBox.IsChecked == false) {
+                MessageBox.Show("目标库位托盘未清空,无法入库！请检查！若需强制入库，请勾选右侧强制入库选项！");
                 return;
             }  
 
diff --git a/SlnMesnac.WPF/ViewModel/DeviceMonitorViewModel.cs b/SlnMesnac.WPF/ViewModel/DeviceMonitorViewModel.cs
index 581a706..e895de2 100644
--- a/SlnMesnac.WPF/ViewModel/DeviceMonitorViewModel.cs
+++ b/SlnMesnac.WPF/ViewModel/DeviceMonitorViewModel.cs
@@ -58,6 +58,10 @@ namespace SlnMesnac.WPF.ViewModel
             {
                 isProcessing = true;
                 await LoadRfidDataAsync();
+            }
+            catch (Exception ex)
+            {
+
             }
             finally
             {