From 01477ab160b5ab3036b8253630a536ec7ac01d0a Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Tue, 26 Nov 2024 14:03:54 +0800
Subject: [PATCH] =?UTF-8?q?change-=E9=80=80=E5=BA=93=E5=BD=93=E6=88=90?=
 =?UTF-8?q?=E6=97=A0=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=8F=8A=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E5=BA=93=E5=AD=98=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
index a92ed44..d1364e1 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
@@ -2972,7 +2972,7 @@
                                                                 <RowDefinition Height="*"/>
                                                                 <RowDefinition Height="*"/>
                                                             </Grid.RowDefinitions>
-                                                            <TextBlock Text="二楼小包出入口" Foreground="White" FontSize="35" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                                                            <TextBlock Text="二楼托盘库出入口" Foreground="White" FontSize="35" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                                                             <Grid Grid.Row="1" x:Name="XBRK">
                                                                 <Grid.ColumnDefinitions>
                                                                     <ColumnDefinition Width="*"/>
diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
index 31b5158..a9410a3 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
@@ -2529,12 +2529,14 @@ namespace Khd.Core.Wpf.Form
                             frozenAmount = 0,
                             instockDate = System.DateTime.Now,
                             rawStockId = Global.SnowId.NextId(),
-                            saleOrderId = material.saleOrderId == null ? 0 : material.saleOrderId,
+                            // 退库当成无销售订单
+                            saleOrderId = 0,
                             warehouseFloor = 5,
                             warehouseId = 512,
                             createBy = "扫描退库",
                             createDate = System.DateTime.Now,
-                            safeFlag = material.safeFlag
+                            // 当成安全库存
+                            safeFlag = "1",
                         };
                         dbContext.WmsRawStock.Add(newRawStock);
                         message = newRawStock.totalAmount;