From 12b7053a2f17c35fe1e00cd60a2a53630c70825f Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Mon, 29 Jul 2024 19:31:22 +0800
Subject: [PATCH] =?UTF-8?q?change-=E4=BC=98=E5=8C=96=E6=89=AB=E6=8F=8F?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E7=95=8C=E9=9D=A2=E8=BE=93=E5=85=A5=E6=A1=86?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=B7=B3=E8=BD=AC=20add-=E5=90=8C=E4=B8=80?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=E4=BA=A7=E5=93=81=E5=8F=AF=E4=BB=A5=E7=BB=A7?=
 =?UTF-8?q?=E7=BB=AD=E5=85=A5=E5=BA=93=E5=8A=A0=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Khd.Core.Wpf/Form/FormBoardT.xaml    |   9 +-
 src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs | 143 ++++++++++++++++-------
 2 files changed, 104 insertions(+), 48 deletions(-)

diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
index 21f22a3..eab5973 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
@@ -1924,25 +1924,28 @@
                                                         <RowDefinition Height="167*"/>
                                                         <RowDefinition Height="83*"/>
                                                     </Grid.RowDefinitions>
-                                                    <TextBlock Text="扫描入库" Foreground="White" FontSize="50" Grid.ColumnSpan="6"  HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                                    <TextBlock Text="扫描入库"  FontSize="50" Grid.ColumnSpan="6"  HorizontalAlignment="Center" VerticalAlignment="Center"/>
                                                     <TextBlock Text="扫描料箱号:" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75"/>
                                                     <TextBlock Text="扫描条码号:" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75"/>
                                                     <TextBlock Text="入库数量:" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75"/>
-                                                    <hc:TextBox x:Name="txtInBox" hc:InfoElement.ShowClearButton="True" FontSize="50" LostFocus="txtInBox_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="130"  Grid.Row="1" Grid.Column="3" Grid.ColumnSpan="3"/>
+                                                    <hc:TextBox x:Name="txtInBox" hc:InfoElement.ShowClearButton="True" FontSize="50" LostFocus="txtInBox_TextChanged" TextChanged="txtInBox_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="130"  Grid.Row="1" Grid.Column="3" Grid.ColumnSpan="3"/>
                                                     <Button Click="barClear_Click" HorizontalAlignment="Right" Height="100" Panel.ZIndex="1" Width="100" Margin="0,0,130,0"  Grid.Column="5" Grid.Row="2">
                                                         <Image Source="..\Resources\cancel.png"/>
                                                     </Button>
                                                     <Button Click="boxClear_Click" HorizontalAlignment="Right" Height="100" Panel.ZIndex="1" Width="100" Margin="0,0,130,0"  Grid.Column="5" Grid.Row="1">
                                                         <Image Source="..\Resources\cancel.png"/>
                                                     </Button>
-                                                    <hc:TextBox x:Name="txtInBarCode" hc:InfoElement.ShowClearButton="True" FontSize="50" LostFocus="txtInBarCode_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="130"  Grid.Row="2" Grid.Column="3" Grid.ColumnSpan="3"/>
+                                                    <hc:TextBox x:Name="txtInBarCode" hc:InfoElement.ShowClearButton="True" FontSize="50" LostFocus="txtInBarCode_TextChanged" TextChanged="txtInBarCode_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="130"  Grid.Row="2" Grid.Column="3" Grid.ColumnSpan="3"/>
                                                     <hc:TextBox x:Name="txtInScan" FontSize="50" IsReadOnly="True" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="130"  Grid.Row="3" Grid.Column="3" Grid.ColumnSpan="3" />
                                                     <Button Content="确认入库" Grid.Row="4" Grid.ColumnSpan="6" Width="500" Height="100" FontSize="50" Background="#346DFF" Foreground="White" Click="InRawBaseLocaltion_Click"/>
                                                     <Button Content="一键收料" Grid.Row="5" Grid.ColumnSpan="6" Width="500" Height="100" FontSize="50" Background="#346DFF" Foreground="White" Click="callPlc_Click"/>
+                                                    <TextBlock  Grid.Row="6" Text="提示信息:"  HorizontalAlignment="Center"  Grid.Column="1" Grid.ColumnSpan="1" Width="250" Height="100" FontSize="50"  Foreground="White" />
+                                                    <TextBlock x:Name="MsgText"  Grid.Row="6"  FontSize="40" Grid.ColumnSpan="5" Width="800" Height="60"   Foreground="White" HorizontalAlignment="Right" />
                                                     <Button Content="执行CTU入库任务" Visibility="Hidden" Click="btnCtuInConfirmBox_Click" Grid.Row="5" Grid.ColumnSpan="6" Width="500" Height="100" FontSize="50" Background="#346DFF" Foreground="White"/>
                                                 </Grid>
                                             </StackPanel>
                                         </StackPanel>
+                                      
                                     </StackPanel>
                                 </TabItem>
                                 <TabItem   x:Name="ScanReturnManager" Header="扫描退库" Style="{StaticResource DefaultItem}"  FontSize="25" HorizontalContentAlignment="Center" Background="#213269" VerticalContentAlignment="Center"   Foreground="White" Width="160" Height="100" Margin="5">
diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
index 5e71d4a..d469002 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
@@ -12,6 +12,7 @@ using Khd.Core.Wpf.Scan;
 using Khd.Core.Wpf.TaskForm;
 using Masuit.Tools;
 using Masuit.Tools.Logging;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Newtonsoft.Json;
@@ -1463,69 +1464,107 @@ namespace Khd.Core.Wpf.Form
                 {
                     using var scope = _host.Services.CreateScope();
                     using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
+                    decimal amount = decimal.Parse(txtInScan.Text);
+                    if (amount <= 0)
+                    {
+                        MessageBox.Show("入库数量需大于0");
+                        return;
+                    }
                     var material = dbContext.MesBaseBarcodeInfo.FirstOrDefault(t => t.barcodeInfo == txtInBarCode.Text);
+                    
                     var container = dbContext.WmsBaseLocation.FirstOrDefault(t => t.containerCode == txtInBox.Text && t.warehouseId == 512);
                     List<WmsRawStock> wmsRawStocks = dbContext.WmsRawStock
                         .Where(t => txtInBarCode.Text == t.instockBatch)
                         .Where(t => t.warehouseFloor == 5 && t.warehouseId == 512).ToList();
-                    if (wmsRawStocks.Count > 0)
-                    {
-                        MessageBox.Show($"该条码已入库!料箱号为{wmsRawStocks.First().palletInfoCode},库位号为{wmsRawStocks.First().locationCode}");
-                        txtInBarCode.Text = string.Empty;
-                        txtInScan.Text = string.Empty;
-                        return;
-                    }
                     if (container == null)
                     {
-                        MessageBox.Show("未查询到该容器!");
+                        MsgText.Text = "未查询到该容器!";
+                        txtInBox.Focus();
                         txtInBox.Text = string.Empty;
+                        txtInBarCode.Text = string.Empty;
+                        txtInScan.Text = string.Empty;
+
                         return;
                     }
                     if (material == null)
                     {
-                        MessageBox.Show("未查询到该条码内容!");
+                        MsgText.Text = "未查询到该条码内容!";
+                        txtInBox.Text = string.Empty;
                         txtInBarCode.Text = string.Empty;
                         txtInScan.Text = string.Empty;
+                        txtInBox.Focus();
                         return;
                     }
-                    var newRawStock = new WmsRawStock()
+
+                    if (wmsRawStocks.Count > 0)
                     {
-                        materialId = material.materialId,
-                        supplierId = material.manufacturerId,
-                        instockBatch = txtInBarCode.Text,
-                        locationCode = container.locationCode,
-                        stockType = "1",
-                        palletInfoCode = container.containerCode,
-                        totalAmount = material.batchFlag == "1" ? material.amount : 1,
-                        activeFlag = "1",
-                        occupyAmount = 0,
-                        completeFlag = "1",
-                        frozenAmount = 0,
-                        instockDate = System.DateTime.Now,
-                        rawStockId = Global.SnowId.NextId(),
-                        saleOrderId = material.saleOrderId == null ? 0 : material.saleOrderId,
-                        warehouseFloor = 5,
-                        warehouseId = 512,
-                        createBy = "扫描入库",
-                        createDate = System.DateTime.Now,
-                        safeFlag = material.safeFlag
-                    };
-                    dbContext.WmsRawStock.Add(newRawStock);
-                    dbContext.SaveChanges();
-                    MessageBox.Show("入库成功!");
+                        if (material.batchFlag != "1")
+                        {
+                            MsgText.Text = $"该条码已入库!料箱号为{wmsRawStocks.First().palletInfoCode},库位号为{wmsRawStocks.First().locationCode}";
+                            txtInBox.Text = string.Empty;
+                            txtInBarCode.Text = string.Empty;
+                            txtInScan.Text = string.Empty;
+                            txtInBox.Focus();
+                            return;
+                        }
+                        else
+                        {
+                            WmsRawStock wmsRawStock = wmsRawStocks.FirstOrDefault();
+                            wmsRawStock.totalAmount += amount;
+                            dbContext.WmsRawStock.Update(wmsRawStock);
+                            dbContext.SaveChanges();
+                        }
+
+                    }
+                    else
+                    {
+                        var newRawStock = new WmsRawStock()
+                        {
+                            materialId = material.materialId,
+                            supplierId = material.manufacturerId,
+                            instockBatch = txtInBarCode.Text,
+                            locationCode = container.locationCode,
+                            stockType = "1",
+                            palletInfoCode = container.containerCode,
+                            totalAmount = material.batchFlag == "1" ? amount : 1,
+                            activeFlag = "1",
+                            occupyAmount = 0,
+                            completeFlag = "1",
+                            frozenAmount = 0,
+                            instockDate = System.DateTime.Now,
+                            rawStockId = Global.SnowId.NextId(),
+                            saleOrderId = material.saleOrderId == null ? 0 : material.saleOrderId,
+                            warehouseFloor = 5,
+                            warehouseId = 512,
+                            createBy = "扫描入库",
+                            createDate = System.DateTime.Now,
+                            safeFlag = material.safeFlag
+                        };
+                        dbContext.WmsRawStock.Add(newRawStock);
+                        dbContext.SaveChanges();
+                    }
+                  
+                
+                    txtInBox.Focus();
+                    MsgText.Text = "入库成功!";
+                    txtInBox.Text = string.Empty;
                     txtInBarCode.Text = string.Empty;
                     txtInScan.Text = string.Empty;
                     txtInBarCode.Focus();
                 }
                 else
                 {
-                    MessageBox.Show("请先扫描容器号和条码!");
+                    MsgText.Text ="请先扫描容器号和条码!";
                 }
             }
             catch (Exception ex)
             {
                 LogManager.Error(ex);
-                MessageBox.Show("入库失败");
+                txtInBox.Text = string.Empty;
+                txtInBarCode.Text = string.Empty;
+                txtInScan.Text = string.Empty;
+                MsgText.Text = "入库失败";
+                txtInBarCode.Focus();
             }
         }
 
@@ -1622,7 +1661,11 @@ namespace Khd.Core.Wpf.Form
         {
             try
             {
+               
                 string containerCode = txtInBox.Text;
+                if (containerCode.Length >= 1) MsgText.Text = string.Empty;
+                    if (containerCode.Length < 15)
+                    return;
                 if (!string.IsNullOrEmpty(containerCode))
                 {
                     using var scope = _host.Services.CreateScope();
@@ -1630,7 +1673,7 @@ namespace Khd.Core.Wpf.Form
                     var container = dbContext.WmsBaseLocation.FirstOrDefault(t => t.containerCode == containerCode && t.warehouseId == 512);
                     if (container == null)
                     {
-                        MessageBox.Show($"未查询到该容器{txtInBox.Text}!");
+                        MsgText.Text = $"未查询到该容器{txtInBox.Text}!";
                         txtInBox.Text = string.Empty;
                         txtInBox.Focus();
                     }
@@ -1654,15 +1697,22 @@ namespace Khd.Core.Wpf.Form
         {
             try
             {
+
                 string barCode = txtInBarCode.Text;
+                if (barCode.Length < 19) return;
+
+              
+                using var scope = _host.Services.CreateScope();
+                using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
+               
                 if (!string.IsNullOrEmpty(barCode))
                 {
-                    using var scope = _host.Services.CreateScope();
-                    using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
+
+                    
                     var material = dbContext.MesBaseBarcodeInfo.FirstOrDefault(t => t.barcodeInfo == barCode);
                     if (material == null)
                     {
-                        MessageBox.Show("未查询到该条码内容!");
+                        MsgText.Text = "未查询到该条码内容!";
                         txtInBarCode.Text = string.Empty;
                         txtInScan.Text = string.Empty;
                         txtInBarCode.Focus();
@@ -1672,14 +1722,17 @@ namespace Khd.Core.Wpf.Form
                         var mesBaseMaterialInfo = dbContext.MesBaseMaterialInfo.FirstOrDefault(t => t.MaterialId == material.materialId);
                         if (mesBaseMaterialInfo == null)
                         {
-                            MessageBox.Show("未查询到该条码绑定的物料信息!");
+                            MsgText.Text = "未查询到该条码绑定的物料信息!";
                             txtInBarCode.Text = string.Empty;
                             txtInScan.Text = string.Empty;
                             txtInBarCode.Focus();
                         }
                         else
                         {
-                            txtInScan.Text = (material.batchFlag == "1" ? material.amount : 1).ToString();
+                           
+                            txtInScan.Text = (material.batchFlag == "1") ? "0.00" : "1.00";
+                            
+                           
                             if (mesBaseMaterialInfo.BatchFlag == "0")
                             {
                                 txtInScan.IsReadOnly = true;
@@ -1714,7 +1767,7 @@ namespace Khd.Core.Wpf.Form
                     var container = dbContext.WmsBaseLocation.FirstOrDefault(t => t.containerCode == containerCode && t.warehouseId == 512);
                     if (container == null)
                     {
-                        MessageBox.Show($"未查询到该容器{txtOutBox.Text}!");
+                        MsgText.Text = $"未查询到该容器{txtOutBox.Text}!";
                         txtOutBox.Text = string.Empty;
                         txtOutBox.Focus();
                     }
@@ -1749,7 +1802,7 @@ namespace Khd.Core.Wpf.Form
                         var wmsRawStock = dbContext.WmsRawStock.FirstOrDefault(t => t.instockBatch == barCode && t.palletInfoCode == containerCode);
                         if (wmsRawStock == null)
                         {
-                            MessageBox.Show("未在该容器中查询到该条码!");
+                            MsgText.Text = "未在该容器中查询到该条码!";
                             txtOutBarCode.Text = string.Empty;
                             txtOutScan.Text = string.Empty;
                             txtOutBarCode.Focus();
@@ -1759,7 +1812,7 @@ namespace Khd.Core.Wpf.Form
                             var mesBaseMaterialInfo = dbContext.MesBaseBarcodeInfo.FirstOrDefault(t => t.materialId == wmsRawStock.materialId);
                             if (mesBaseMaterialInfo == null)
                             {
-                                MessageBox.Show("未查询到该条码绑定的物料信息!");
+                                MsgText.Text = "未查询到该条码绑定的物料信息!";
                                 txtOutBarCode.Text = string.Empty;
                                 txtOutScan.Text = string.Empty;
                                 txtOutBarCode.Focus();
@@ -1783,7 +1836,7 @@ namespace Khd.Core.Wpf.Form
                 {
                     if (!string.IsNullOrEmpty(barCode))
                     {
-                        MessageBox.Show("请先扫描容器号!");
+                        MsgText.Text = "请先扫描容器号!";
                         txtOutBarCode.Text = string.Empty;
                         txtOutScan.Text = string.Empty;
                     }