From 0c16b9532b43d596d3b09d7473171b01110cecb8 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Fri, 22 Nov 2024 16:11:27 +0800
Subject: [PATCH] =?UTF-8?q?fix-=E9=80=80=E5=BA=93=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Khd.Core.Wpf/Form/FormBoardT.xaml    | 19 ++++++--------
 src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs | 32 ++++++++++++------------
 2 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
index 6b568f3..0446bea 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
@@ -2276,7 +2276,7 @@
                                                                 ElementStyle="{StaticResource dgCell}"
                                                                 Width="2*"
                                                                 />
-                                                                
+
                                                             </DataGrid.Columns>
                                                             <DataGrid.CellStyle>
                                                                 <Style TargetType="{x:Type DataGridCell}">
@@ -2320,7 +2320,7 @@
                                                     <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="2" Grid.ColumnSpan="6">
                                                         <TextBlock Text="扫描料箱号:" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50"/>
                                                         <Grid>
-                                                            <hc:TextBox hc:InfoElement.ShowClearButton="True" x:Name="txtReturnBox" FontSize="50" LostFocus="txtReturnBox_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="90"  Grid.Row="2" Grid.Column="3" Grid.ColumnSpan="3"/>
+                                                            <hc:TextBox hc:InfoElement.ShowClearButton="True" x:Name="txtReturnBox" FontSize="50" TextChanged="txtReturnBox_TextChanged"   Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="90"  Grid.Row="2" Grid.Column="3" Grid.ColumnSpan="3"/>
                                                             <Button Click="boxReturnClear_Click" HorizontalAlignment="Right" Height="75" Panel.ZIndex="1" Width="100" Margin="0,0,0,0"  Grid.Column="5" Grid.Row="2">
                                                                 <Image Source="..\Resources\cancel.png"/>
                                                             </Button>
@@ -2330,7 +2330,7 @@
                                                     <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="3" Grid.ColumnSpan="6">
                                                         <TextBlock Text="扫描条码号:" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50"/>
                                                         <Grid>
-                                                            <hc:TextBox hc:InfoElement.ShowClearButton="True" x:Name="txtReturnBarCode" FontSize="50" LostFocus="txtReturnBarCode_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="90"  Grid.Row="3" Grid.Column="3" Grid.ColumnSpan="3"/>
+                                                            <hc:TextBox hc:InfoElement.ShowClearButton="True" x:Name="txtReturnBarCode" FontSize="50" TextChanged="txtReturnBarCode_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="90"  Grid.Row="3" Grid.Column="3" Grid.ColumnSpan="3"/>
                                                             <Button Click="barReturnClear_Click" HorizontalAlignment="Right" Height="75" Panel.ZIndex="1" Width="100" Margin="0,0,0,0"  Grid.Column="5" Grid.Row="3">
                                                                 <Image Source="..\Resources\cancel.png"/>
                                                             </Button>
@@ -2362,12 +2362,9 @@
                                                     </StackPanel>
                                                     <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="7" Grid.ColumnSpan="6">
                                                         <TextBlock Text="提示信息:" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50"/>
-                                                        <Grid>
-                                                            <Grid.ColumnDefinitions>
-                                                                <ColumnDefinition Width="313*"/>
-                                                                <ColumnDefinition Width="467*"/>
-                                                            </Grid.ColumnDefinitions>
-                                                            <TextBlock x:Name="txtReturnbox" Margin="50,0,0,0"  HorizontalAlignment="Left" VerticalAlignment="Center" Height="90" Grid.ColumnSpan="2" />
+                                                        <Grid Width="1125" >
+
+                                                            <TextBlock x:Name="txtReturnMsg" Margin="50,0,0,0"  VerticalAlignment="Center" FontSize="40" HorizontalAlignment="Left"  Height="90" Width="1065" />
                                                         </Grid>
                                                     </StackPanel>
                                                 </Grid>
@@ -3147,7 +3144,7 @@ IsReadOnly="True">
                                 FontSize="20"
                                 Header="同步时间"
                                 IsReadOnly="True" />
-                                                <DataGridTextColumn
+                                            <DataGridTextColumn
                                   Width="250*"
                                   Binding="{Binding Status}"
                                   CanUserSort="False"
@@ -3155,7 +3152,7 @@ IsReadOnly="True">
                                   FontSize="20"
                                   Header="报警信息"
                                   IsReadOnly="True" />
-                                           
+
                                         </DataGrid.Columns>
                                         <DataGrid.CellStyle>
                                             <Style TargetType="{x:Type DataGridCell}">
diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
index e72d951..6db1e77 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
@@ -2418,20 +2418,20 @@ namespace Khd.Core.Wpf.Form
                     WcsTask? task = dbContext.WcsTask.Where(t => t.nextPointId == baseEquip.objid).FirstOrDefault();
                     if (task == null)
                     {
-                        txtReturnbox.Text = ("未查询到退库任务!");
+                        txtReturnMsg.Text = ("未查询到退库任务!");
                         return;
                     }
                     var material = dbContext.MesBaseBarcodeInfo.FirstOrDefault(t => t.barcodeInfo == txtReturnBarCode.Text);
                     if (material == null)
                     {
-                        txtReturnbox.Text = ("未查询到该条码内容!");
+                        txtReturnMsg.Text = ("未查询到该条码内容!");
                         txtReturnBarCode.Text = string.Empty;
                         txtReturnBarCode.Focus();
                         return;
                     }
 
                     
-                    WmsRawReturn? wmsRawReturn = dbContext.WmsRawReturn.Where(t => t.endStationCode == task.currPointNo && t.materialId == material.materialId).FirstOrDefault();
+                    WmsRawReturn? wmsRawReturn = dbContext.WmsRawReturn.Where(t => t.endStationCode == task.currPointNo && t.executeStatus !="2").FirstOrDefault();
                     //if (wmsRawReturn == null)
                     //{
                     //    var result = MessageBox.Show("当前物料不在退出申请单中，确定还要入库吗？", "确认入库", MessageBoxButton.YesNo, MessageBoxImage.Question);
@@ -2449,14 +2449,14 @@ namespace Khd.Core.Wpf.Form
                         .Where(t => t.warehouseFloor == 5 && t.warehouseId == 512).ToList();
                     if (wmsRawStocks.Count > 0 && material.batchFlag != "1")
                     {
-                        txtReturnbox.Text = ($"该条码已入库,非批次!料箱号为{wmsRawStocks.First().palletInfoCode},库位号为{wmsRawStocks.First().locationCode}");
+                        txtReturnMsg.Text = ($"该条码已入库,非批次!料箱号为{wmsRawStocks.First().palletInfoCode},库位号为{wmsRawStocks.First().locationCode}");
                         txtReturnBarCode.Text = string.Empty;
                         txtReturnBox.Text = string.Empty;
                         return;
                     }
                     if (container == null)
                     {
-                        txtReturnbox.Text = ("未查询到该容器!");
+                        txtReturnMsg.Text = ("未查询到该容器!");
                         txtReturnBox.Text = string.Empty;
                         return;
                     }
@@ -2467,7 +2467,7 @@ namespace Khd.Core.Wpf.Form
                     }
                     catch
                     {
-                        txtReturnbox.Text = ("请输入正确的数量");
+                        txtReturnMsg.Text = ("请输入正确的数量");
                         return;
                     }
                     if (wmsRawReturn != null)
@@ -2484,14 +2484,13 @@ namespace Khd.Core.Wpf.Form
                         WmsRawReturnDetail? wmsRawReturnDetail = new WmsRawReturnDetail();
                         wmsRawReturnDetail.RawReturnId = (long)wmsRawReturn.rawReturnId;
                         wmsRawReturnDetail.LocationCode = container.locationCode;
-                        wmsRawReturnDetail.MaterialBarcode = txtInBarCode.Text;
+                        wmsRawReturnDetail.MaterialBarcode = txtReturnBarCode.Text;
                         wmsRawReturnDetail.MaterialId = (long)material.materialId;
                         wmsRawReturnDetail.InstockBatch = material.batchCode;
                         wmsRawReturnDetail.MaterialProductionDate = material.productionDate;
-                        wmsRawReturnDetail.PlanAmount = wmsRawReturn.planAmount;
-                        wmsRawReturnDetail.ReturnAmount = wmsRawReturn.returnAmount;
+                        wmsRawReturnDetail.PlanAmount = amount;
+                        wmsRawReturnDetail.ReturnAmount = amount;
                         wmsRawReturnDetail.ExecuteStatus = "2";
-                        wmsRawReturnDetail.ReturnAmount = wmsRawReturn.returnAmount;
                         wmsRawReturnDetail.ReturnPerson = "WPF";
                         wmsRawReturnDetail.ReturnTime = DateTime.Now;
                         wmsRawReturnDetail.ReturnWay = "2";
@@ -2537,24 +2536,24 @@ namespace Khd.Core.Wpf.Form
                     }
 
                     dbContext.SaveChanges();
-                    txtReturnbox.Text = ($"退库成功!,当前库存{message}");
+                    txtReturnMsg.Text = ($"退库成功!,当前库存{message}");
                     txtReturnBarCode.Text = string.Empty;
                     txtReturnBox.Text = string.Empty;
                     returnMaterialName.Text = string.Empty;
                     returnGG.Text = string.Empty;
                     txtReturnScan.Text = string.Empty;
 
-                    txtReturnBarCode.Focus();
+                    txtReturnBox.Focus();
                 }
                 else
                 {
-                    txtReturnbox.Text = ("请先扫描容器号和条码!");
+                    txtReturnMsg.Text = ("请先扫描容器号和条码!");
                 }
             }
             catch (Exception ex)
             {
                 LogManager.Error(ex);
-                txtReturnbox.Text = ("入库失败");
+                txtReturnMsg.Text = ("入库失败");
             }
         }
         /// <summary>
@@ -2699,7 +2698,7 @@ namespace Khd.Core.Wpf.Form
         {
             try
             {
-                txtReturnbox.Text = "";
+              
                 string barCode = txtReturnBarCode.Text;
                 if (barCode.Length < 19) return;
 
@@ -2722,7 +2721,7 @@ namespace Khd.Core.Wpf.Form
                         {
                             txtReturnBarCode.Text = string.Empty;
                             txtReturnScan.Text = string.Empty;
-                            txtReturnbox.Text = "未查询到该条码绑定的物料信息!";
+                            txtReturnMsg.Text = "未查询到该条码绑定的物料信息!";
                             txtReturnBarCode.Focus();
                         }
                         else
@@ -2731,6 +2730,7 @@ namespace Khd.Core.Wpf.Form
                             txtReturnScan.Text = (material.batchFlag == "1") ? "" : "1.00";
                             this.returnGG.Text = mesBaseMaterialInfo.MaterialSpec;
                             this.returnMaterialName.Text = mesBaseMaterialInfo.MaterialName;
+                            this.txtReturnScan.Focus();
                             if (mesBaseMaterialInfo.BatchFlag == "0")
                             {
                                 txtReturnScan.IsReadOnly = true;