From 6f101007329453039eef015569de9f4edffe773f Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Tue, 30 Jul 2024 10:52:41 +0800
Subject: [PATCH 1/9] .

---
 src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs | 35 ++++++++++++++----------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
index 8b89dcb..80225e7 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
@@ -107,23 +107,28 @@ namespace Khd.Core.Wpf.Form
         {
             try
             {
-                foreach (var plcConfig in SystemData.PlcConfigs)
+                //连接PLC
+                Task.Run(() =>
                 {
-                    if (!SystemData.PlcDic.Any(t => t.Key == plcConfig.Code))
+                    Thread.Sleep(2000);
+                    foreach (var plcConfig in SystemData.PlcConfigs)
                     {
-                        Plc.S7.Plc plc;
-                        plc = new Plc.S7.Plc(plcConfig.CpuType, plcConfig.IP, plcConfig.Port, plcConfig.Rack, plcConfig.Slot);
-                        //try
-                        //{
-                        //    plc.Open();
-                        //}
-                        //catch (Exception ex)
-                        //{
-                        //    LogManager.Error(ex);
-                        //}
-                        SystemData.PlcDic.TryAdd(plcConfig.Code, plc);
-                    }
-                };
+                        if (!SystemData.PlcDic.Any(t => t.Key == plcConfig.Code))
+                        {
+                            Plc.S7.Plc plc;
+                            plc = new Plc.S7.Plc(plcConfig.CpuType, plcConfig.IP, plcConfig.Port, plcConfig.Rack, plcConfig.Slot);
+                            try
+                            {
+                                plc.Open();
+                            }
+                            catch (Exception ex)
+                            {
+                                LogManager.Error(ex);
+                            }
+                            SystemData.PlcDic.TryAdd(plcConfig.Code, plc);
+                        }
+                    };
+                });
                 GetMenu();
 
                 DispatcherTimer dispatcherTimer = new DispatcherTimer();

From 7118418147bd500e3a55023a44b75662eb0d01a0 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Tue, 30 Jul 2024 11:30:28 +0800
Subject: [PATCH 2/9] .

---
 src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
index 80225e7..a2c83b1 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
@@ -1746,7 +1746,7 @@ namespace Khd.Core.Wpf.Form
                            
                             txtInScan.Text = (material.batchFlag == "1") ? "" : "1.00";
                             
-                           
+                             
                             if (mesBaseMaterialInfo.BatchFlag == "0")
                             {
                                 txtInScan.IsReadOnly = true;
@@ -1755,6 +1755,7 @@ namespace Khd.Core.Wpf.Form
                             {
                                 txtInScan.IsReadOnly = false;
                             }
+                            txtInScan.Focus();
                         }
                     }
                 }

From ba429012581e19a8797c8ad816bc92a82bba5301 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Tue, 30 Jul 2024 13:45:17 +0800
Subject: [PATCH 3/9] .

---
 src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
index a2c83b1..372d4de 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
@@ -1498,6 +1498,8 @@ namespace Khd.Core.Wpf.Form
 
                         return;
                     }
+                  
+
                     if (material == null)
                     {
                         MsgText.Text = "未查询到该条码内容!";
@@ -1690,6 +1692,11 @@ namespace Khd.Core.Wpf.Form
                         MsgText.Text = $"未查询到该容器{txtInBox.Text}!";
                         txtInBox.Text = string.Empty;
                         txtInBox.Focus();
+                    }else if(container.ContainerStatus == "1")
+                    {
+                        MsgText.Text = $"该容器已经在库里，请检查是否重复!";
+                        txtInBox.Text = string.Empty;
+                        txtInBox.Focus();
                     }
                     else
                     {

From 9522a33f9027e64895558ffdc604e008ecff498a Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Tue, 30 Jul 2024 15:17:29 +0800
Subject: [PATCH 4/9] =?UTF-8?q?change-=E4=BA=BA=E5=B7=A5=E5=8F=AB=E6=96=99?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2materiald=E6=9B=BF=E6=8D=A2=E6=88=90materialC?=
 =?UTF-8?q?ode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Khd.Core.Wpf/Form/FormBoardT.xaml    | 14 +++++++-------
 src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs |  4 +++-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
index e7af08a..56ad142 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
@@ -1640,7 +1640,7 @@
                                                     </DataGridTemplateColumn.CellTemplate>
                                                 </DataGridTemplateColumn>
                                                 <DataGridTextColumn
-                                                    Width="180*"
+                                                    Width="200*"
                                                     Binding="{Binding locationCode}"
                                                     CanUserSort="False"
                                                     ElementStyle="{StaticResource dgCell}"
@@ -1648,7 +1648,7 @@
                                                     Header="库位号"
                                                     IsReadOnly="True" />
                                                 <DataGridTextColumn
-                                                    Width="180*"
+                                                    Width="200*"
                                                     Binding="{Binding palletInfoCode}"
                                                     CanUserSort="False"
                                                     ElementStyle="{StaticResource dgCell}"
@@ -1656,15 +1656,15 @@
                                                     Header="料箱号"
                                                     IsReadOnly="True" />
                                                 <DataGridTextColumn
-                                                     Width="180*"
-                                                     Binding="{Binding materialId}"
+                                                     Width="200*"
+                                                     Binding="{Binding materialCode}"
                                                      CanUserSort="False"
                                                      ElementStyle="{StaticResource dgCell}"
                                                      FontSize="20"
-                                                     Header="物料Id"
+                                                     Header="物料编码"
                                                      IsReadOnly="True" />
                                                 <DataGridTemplateColumn
-                                                        Width="350*"
+                                                        Width="280*"
                                                         CanUserSort="False"
                                                         Header="物料名称"
                                                         IsReadOnly="True" >
@@ -1675,7 +1675,7 @@
                                                     </DataGridTemplateColumn.CellTemplate>
                                                 </DataGridTemplateColumn>
                                                 <DataGridTemplateColumn
-                                                   Width="350*"
+                                                   Width="300*"
                                                    CanUserSort="False"
                                                    Header="物料规格"
                                                    IsReadOnly="True" >
diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
index 372d4de..517630a 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
@@ -2035,7 +2035,7 @@ namespace Khd.Core.Wpf.Form
                         palletInfoCode = t.Key.palletInfoCode,
                         totalAmount = t.Sum(x => x.totalAmount),
                         frozenAmount = t.Sum(x => x.frozenAmount),
-                    });
+                    }); 
                 //.GroupBy(t => t.palletInfoCode)
                 //.Select(t => new
                 //{
@@ -2065,6 +2065,7 @@ namespace Khd.Core.Wpf.Form
                                materialId = b.materialId,
                                materialName = c.MaterialName,
                                materialSpec = c.MaterialSpec,
+                               materialCode = c.MaterialCode,
                                palletInfoCode = b.palletInfoCode,
                                //instockDate = b.instockDate,
                                totalAmount = b.totalAmount,
@@ -2081,6 +2082,7 @@ namespace Khd.Core.Wpf.Form
                         totalAmount = string.Join("\n", t.Select(x => x.totalAmount)),
                         frozenAmount = string.Join("\n", t.Select(x => x.frozenAmount)),
                         materialId = string.Join("\n", t.Select(x => x.materialId)),
+                        materialCode = string.Join("\n", t.Select(x => x.materialCode)),
                         materialName = string.Join("\n", t.Select(x => x.materialName[..(x.materialName.Length > 20 ? 20 : x.materialName.Length)])),
                         materialNameSrc = string.Join("\n", t.Select(x => x.materialName)),
                         materialSpec = string.Join("\n", t.Select(x => x.materialSpec[..(x.materialSpec.Length > 20 ? 20 : x.materialSpec.Length)])),

From b348146b126520b95c90e215c1e1a51decaf1ee4 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Tue, 30 Jul 2024 15:30:13 +0800
Subject: [PATCH 5/9] =?UTF-8?q?change-=E4=BA=BA=E5=B7=A5=E5=8F=AB=E6=96=99?=
 =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
index 517630a..8fd7ad8 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
@@ -2018,12 +2018,24 @@ namespace Khd.Core.Wpf.Form
                 using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
                 List<long?> materialIds = new List<long?>();
                 List<MesBaseMaterialInfo> materialInfos = new List<MesBaseMaterialInfo>();
-                if (!string.IsNullOrEmpty(MaterialName.Text))
+                //if (!string.IsNullOrEmpty(MaterialName.Text))
+                //{
+                //    materialInfos = dbContext.MesBaseMaterialInfo.Where(t => t.MaterialName.Contains(MaterialName.Text)).ToList();
+                //    materialIds = materialInfos.Select(t => t.MaterialId).ToList();
+                //}
+                string userInput = MaterialName.Text?.Replace(" ", "") ?? string.Empty;
+
+                if (!string.IsNullOrEmpty(userInput))
                 {
-                    materialInfos = dbContext.MesBaseMaterialInfo.Where(t => t.MaterialName.Contains(MaterialName.Text)).ToList();
+                    materialInfos = dbContext.MesBaseMaterialInfo
+                        .Where(t => t.MaterialName.Replace(" ", "").Contains(userInput) ||
+                                    t.MaterialCode.Replace(" ", "").Contains(userInput) ||
+                                    t.MaterialSpec.Replace(" ", "").Contains(userInput))
+                        .ToList();
                     materialIds = materialInfos.Select(t => t.MaterialId).ToList();
                 }
 
+
                 var wmsRawStocks = dbContext.WmsRawStock
                     .Where(t => t.warehouseId == 512)
                     .WhereIf(materialIds.Count > 0, t => materialIds.Contains(t.materialId))

From 7159b0e3dd19967c07e3774b3cc32612f38edc67 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Tue, 30 Jul 2024 18:14:32 +0800
Subject: [PATCH 6/9] =?UTF-8?q?add-=E6=89=AB=E6=8F=8F=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=B7=BB=E5=8A=A0=E7=89=A9=E6=96=99=E5=9E=8B?=
 =?UTF-8?q?=E5=8F=B7=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Khd.Core.Wpf/Form/FormBoardT.xaml    | 23 +++++++++++-------
 src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs | 31 ++++++++++++++++++------
 2 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
index 56ad142..340dd17 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
@@ -1919,28 +1919,33 @@
                                                         <RowDefinition Height="167*"/>
                                                         <RowDefinition Height="167*"/>
                                                         <RowDefinition Height="167*"/>
+                                                        <RowDefinition Height="167*"/>
                                                         <RowDefinition Height="166.667"/>
                                                         <RowDefinition Height="167*"/>
                                                         <RowDefinition Height="167*"/>
-                                                        <RowDefinition Height="83*"/>
+                                                        <RowDefinition Height="167*"/>
                                                     </Grid.RowDefinitions>
                                                     <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" TextChanged="txtInBox_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="130"  Grid.Row="1" Grid.Column="3" Grid.ColumnSpan="3"/>
+                                                    <TextBlock Text="物料名称:" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75"/>
+                                                    <TextBlock Text="物料规格:" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75"/>
+                                                    <TextBlock Text="入库数量:" Grid.Row="5" 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" TextChanged="txtInBox_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="100"  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" 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" />
+                                                    <hc:TextBox x:Name="txtInBarCode" hc:InfoElement.ShowClearButton="True" FontSize="50" LostFocus="txtInBarCode_TextChanged" TextChanged="txtInBarCode_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="100"  Grid.Row="2" Grid.Column="3" Grid.ColumnSpan="3"/>
+                                                    <hc:TextBox x:Name="materialName" IsReadOnly="True"  hc:InfoElement.ShowClearButton="True" FontSize="50"  Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="100"  Grid.Row="3" Grid.Column="3" Grid.ColumnSpan="3"/>
+                                                    <hc:TextBox x:Name="materialSpec" IsReadOnly="True" hc:InfoElement.ShowClearButton="True" FontSize="50"  Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="100"  Grid.Row="4" Grid.Column="3" Grid.ColumnSpan="3"/>
+                                                    <hc:TextBox x:Name="txtInScan" FontSize="50" IsReadOnly="True" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="100"  Grid.Row="5" Grid.Column="3" Grid.ColumnSpan="3" />
+                                                    <Button Content="确认入库" Grid.Row="6" Grid.ColumnSpan="6" Width="300" Height="100" FontSize="50" Background="#346DFF" Foreground="White" Click="InRawBaseLocaltion_Click"/>
+                                                    <Button Content="一键收料" Grid.Row="7" Grid.ColumnSpan="6" Width="300" Height="100" FontSize="50" Background="#346DFF" Foreground="White" Click="callPlc_Click" HorizontalAlignment="Right"/>
+                                                    <TextBlock  Grid.Row="7" Text="提示信息:"  HorizontalAlignment="Center"  Grid.Column="1" Grid.ColumnSpan="1" Width="250" Height="100" FontSize="50"  Foreground="White" />
+                                                    <TextBlock x:Name="MsgText"   Grid.Row="7"  FontSize="50" Grid.ColumnSpan="5" Width="800" Height="100"   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>
diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
index 8fd7ad8..960ec69 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
@@ -1495,7 +1495,8 @@ namespace Khd.Core.Wpf.Form
                         txtInBox.Text = string.Empty;
                         txtInBarCode.Text = string.Empty;
                         txtInScan.Text = string.Empty;
-
+                        materialName.Text = string.Empty;
+                        materialSpec.Text = string.Empty;
                         return;
                     }
                   
@@ -1506,6 +1507,8 @@ namespace Khd.Core.Wpf.Form
                         txtInBox.Text = string.Empty;
                         txtInBarCode.Text = string.Empty;
                         txtInScan.Text = string.Empty;
+                        materialName.Text = string.Empty;
+                        materialSpec.Text = string.Empty;
                         txtInBox.Focus();
                         return;
                     }
@@ -1518,6 +1521,8 @@ namespace Khd.Core.Wpf.Form
                             txtInBox.Text = string.Empty;
                             txtInBarCode.Text = string.Empty;
                             txtInScan.Text = string.Empty;
+                            materialName.Text = string.Empty;
+                            materialSpec.Text = string.Empty;
                             txtInBox.Focus();
                             return;
                         }
@@ -1566,7 +1571,9 @@ namespace Khd.Core.Wpf.Form
                     txtInBox.Text = string.Empty;
                     txtInBarCode.Text = string.Empty;
                     txtInScan.Text = string.Empty;
-                   
+                    materialName.Text = string.Empty;
+                    materialSpec.Text = string.Empty;
+
                 }
                 else
                 {
@@ -1579,7 +1586,9 @@ namespace Khd.Core.Wpf.Form
                 txtInBox.Text = string.Empty;
                 txtInBarCode.Text = string.Empty;
                 txtInScan.Text = string.Empty;
-                MsgText.Text = "入库失败";
+                materialName.Text = string.Empty;
+                materialSpec.Text = string.Empty;
+                MsgText.Text = "入库异常"+ ex;
                 txtInBarCode.Focus();
             }
         }
@@ -1679,7 +1688,12 @@ namespace Khd.Core.Wpf.Form
             {
                
                 string containerCode = txtInBox.Text;
-                if (containerCode.Length >= 1) MsgText.Text = string.Empty;
+                if (containerCode.Length >= 1)
+                {
+                    MsgText.Text = string.Empty;
+                    txtInScan.Text = string.Empty;
+                    
+                }
                     if (containerCode.Length < 15)
                     return;
                 if (!string.IsNullOrEmpty(containerCode))
@@ -1718,7 +1732,8 @@ namespace Khd.Core.Wpf.Form
         {
             try
             {
-
+                materialName.Text = string.Empty;
+                materialSpec.Text = string.Empty;
                 string barCode = txtInBarCode.Text;
                 if (barCode.Length < 19) return;
 
@@ -1750,10 +1765,10 @@ namespace Khd.Core.Wpf.Form
                         }
                         else
                         {
-                           
-                            txtInScan.Text = (material.batchFlag == "1") ? "" : "1.00";
                             
-                             
+                            txtInScan.Text = (material.batchFlag == "1") ? "" : "1.00";
+                            materialName.Text = mesBaseMaterialInfo.MaterialName;
+                            materialSpec.Text = mesBaseMaterialInfo.MaterialSpec;
                             if (mesBaseMaterialInfo.BatchFlag == "0")
                             {
                                 txtInScan.IsReadOnly = true;

From 1bc4554a955232b66b9b44f64ad51c8b8f44d956 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Tue, 30 Jul 2024 18:14:52 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
index 960ec69..f3f35bf 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
@@ -1691,8 +1691,7 @@ namespace Khd.Core.Wpf.Form
                 if (containerCode.Length >= 1)
                 {
                     MsgText.Text = string.Empty;
-                    txtInScan.Text = string.Empty;
-                    
+                    txtInScan.Text = string.Empty;  
                 }
                     if (containerCode.Length < 15)
                     return;

From 4d54a86f4881786551c3c4945f10041b8ef41fed Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Tue, 30 Jul 2024 18:37:37 +0800
Subject: [PATCH 8/9] =?UTF-8?q?change-=E4=BA=BA=E5=B7=A5=E5=8F=AB=E6=96=99?=
 =?UTF-8?q?=E4=BF=A1=E5=8F=B7=E9=A1=B5=E9=9D=A2=E6=9A=82=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 | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
index 340dd17..b284197 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
@@ -1572,6 +1572,7 @@
                                 <TabItem  x:Name="CallPersonManager" Header="人工叫料" Style="{StaticResource DefaultItem}"  FontSize="25" HorizontalContentAlignment="Center" Background="#213269" VerticalContentAlignment="Center"   Foreground="White" Width="160" Height="100" Margin="5">
                                     <Grid Height="1100" Width="1700">
                                         <Grid.RowDefinitions>
+                                            <RowDefinition Height="auto"/>
                                             <RowDefinition Height="auto"/>
                                             <RowDefinition Height="Auto"/>
                                             <RowDefinition Height="auto"/>
@@ -1581,13 +1582,16 @@
                                                 <TextBlock Text="物料名称:" FontSize="30" HorizontalAlignment="Center" VerticalAlignment="Center"/>
                                                 <TextBox x:Name="MaterialName" Width="200" Height="40" Margin="5,0,0,0" VerticalAlignment="Center"/>
                                                 <Button Content="搜索" Background="#346DFF" Foreground="White" FontSize="25" Height="50" Width="100" Margin="20,0,0,0" Click="SelectButton_Click"/>
-                                                <Button Content="出空箱" Background="#346DFF" Foreground="White" FontSize="25" Height="50" Width="100" Margin="20,0,0,0" Click="CallEmptyBtn_Click"/>
-                                                <Button Content="出选择料箱" Background="#346DFF" Foreground="White" FontSize="25" Height="50" Width="200" Margin="20,0,0,0" Click="CallTrayBtn_Click"/>
+                                                <Button Content="出空箱" HorizontalAlignment="Right" Background="#346DFF" Foreground="White" FontSize="25" Height="50" Width="100" Margin="20,0,0,0" Click="CallEmptyBtn_Click"/>
+                                                <Button Content="出选择料箱" HorizontalAlignment="Right" Background="#346DFF" Foreground="White" FontSize="25" Height="50" Width="200" Margin="20,0,0,0" Click="CallTrayBtn_Click"/>
                                             </StackPanel>
+                                        </Border>
+                                        <Border Grid.Row="1" Height="50" Background="#213269" BorderBrush="Silver" BorderThickness="2" CornerRadius="10"  Margin="0,5,0,0">
+                                           
                                         </Border>
                                         <DataGrid 
                                               Style="{StaticResource DataGridStyle}"
-                                              Grid.Row="1" AlternationCount="2"
+                                              Grid.Row="2" AlternationCount="2"
                                               AutoGenerateColumns="False"
                                               MinRowHeight="50"
                                               Background="#172557"

From babc9cfdbf515c7fb06dda4034167902b74ff4e9 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Wed, 31 Jul 2024 09:51:09 +0800
Subject: [PATCH 9/9] =?UTF-8?q?change-=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=B7=A5?=
 =?UTF-8?q?=E5=8F=AB=E6=96=99=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Khd.Core.Wpf/Form/FormBoardT.xaml    | 26 ++++++-
 src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs | 94 +++++++++++++++++++++++-
 src/Khd.Core.Wpf/appsettings.json        |  2 +
 3 files changed, 116 insertions(+), 6 deletions(-)

diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
index b284197..94f7010 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
@@ -1576,6 +1576,7 @@
                                             <RowDefinition Height="auto"/>
                                             <RowDefinition Height="Auto"/>
                                             <RowDefinition Height="auto"/>
+                                          
                                         </Grid.RowDefinitions>
                                         <Border Background="#213269" BorderBrush="Silver" BorderThickness="2" CornerRadius="10"  Margin="0,5,0,0">
                                             <StackPanel Orientation="Horizontal">
@@ -1586,8 +1587,25 @@
                                                 <Button Content="出选择料箱" HorizontalAlignment="Right" Background="#346DFF" Foreground="White" FontSize="25" Height="50" Width="200" Margin="20,0,0,0" Click="CallTrayBtn_Click"/>
                                             </StackPanel>
                                         </Border>
-                                        <Border Grid.Row="1" Height="50" Background="#213269" BorderBrush="Silver" BorderThickness="2" CornerRadius="10"  Margin="0,5,0,0">
-                                           
+                                        <Border Grid.Row="1" Height="100" Background="#213269" BorderThickness="2" CornerRadius="10" Margin="0,5,0,0">
+                                            <ItemsControl x:Name="itemsControl">
+                                                <ItemsControl.ItemsPanel>
+                                                    <ItemsPanelTemplate>
+                                                        <WrapPanel />
+                                                        <!-- 使项自动换行 -->
+                                                    </ItemsPanelTemplate>
+                                                </ItemsControl.ItemsPanel>
+                                                <ItemsControl.ItemTemplate>
+                                                    <DataTemplate>
+                                                        <Border  Margin="5" Padding="5">
+                                                            <StackPanel Orientation="Horizontal">
+                                                                <TextBlock Text="{Binding palletInfoCode}" VerticalAlignment="Center"/>
+                                                                <Button Content="删除" FontSize="15" Width="50"  Background="LightSkyBlue" Foreground="Red" Margin="0,0,10,0" Click="DeleteButton_Click" Tag="{Binding}"/>
+                                                            </StackPanel>
+                                                        </Border>
+                                                    </DataTemplate>
+                                                </ItemsControl.ItemTemplate>
+                                            </ItemsControl>
                                         </Border>
                                         <DataGrid 
                                               Style="{StaticResource DataGridStyle}"
@@ -1746,7 +1764,7 @@
                                                 </Style>
                                             </DataGrid.ColumnHeaderStyle>
                                         </DataGrid>
-                                        <hc:Pagination x:Name="Pagination2" Grid.Row="2" MaxWidth="1500" MaxPageCount="1"  Margin="0,0,0,15"  PageUpdated="Pagination2_PageUpdated" IsJumpEnabled="True"   HorizontalAlignment="Center" Width="339" />
+                                        <hc:Pagination x:Name="Pagination2"  Grid.Row="3" Height="50" MaxWidth="1500" MaxPageCount="1"  Margin="0,0,0,15"  PageUpdated="Pagination2_PageUpdated" IsJumpEnabled="True"   HorizontalAlignment="Center" Width="339" />
                                     </Grid>
                                 </TabItem>
                                 <TabItem  Visibility="Collapsed" x:Name="InventoryManager" Header="盘库任务" Style="{StaticResource DefaultItem}"  FontSize="25" HorizontalContentAlignment="Center" Background="#213269" VerticalContentAlignment="Center"   Foreground="White" Width="160" Height="100" Margin="5">
@@ -1903,7 +1921,7 @@
                                                 </Style>
                                             </DataGrid.ColumnHeaderStyle>
                                         </DataGrid>
-                                        <hc:Pagination x:Name="Pagination3" Grid.Row="2" MaxWidth="1500" MaxPageCount="1"  Margin="0,0,0,15"  PageUpdated="Pagination3_PageUpdated" IsJumpEnabled="True"   HorizontalAlignment="Center" Width="339" />
+                                        <hc:Pagination x:Name="Pagination3" Grid.Row="3" MaxWidth="1500" MaxPageCount="1"  Margin="0,0,0,15"  PageUpdated="Pagination3_PageUpdated" IsJumpEnabled="True"   HorizontalAlignment="Center" Width="339" />
                                     </Grid>
                                 </TabItem>
                                 <TabItem   x:Name="ScanInManager" 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 f3f35bf..1e2d31d 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
@@ -18,6 +18,7 @@ using Microsoft.Extensions.Hosting;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Data;
 using System.Diagnostics;
 using System.IO.Ports;
@@ -60,6 +61,20 @@ namespace Khd.Core.Wpf.Form
         private int pageCount = 15;
         private object updateLock = new object();
 
+
+        private ObservableCollection<SelectItemModel> itemsControlItems;
+
+        //人工叫料选中类
+        public class SelectItemModel
+        {
+            //料箱位置id
+            public long baseLocationId { get; set; }
+            //托盘号
+            public string palletInfoCode { get; set; }
+        }
+
+      
+
         private void ScanMessage()
         {
             while (true)
@@ -107,6 +122,10 @@ namespace Khd.Core.Wpf.Form
         {
             try
             {
+
+                itemsControlItems = new ObservableCollection<SelectItemModel>();
+                itemsControl.ItemsSource = itemsControlItems;
+
                 //连接PLC
                 Task.Run(() =>
                 {
@@ -1312,17 +1331,69 @@ namespace Khd.Core.Wpf.Form
         /// <param name="e"></param>
         private void CheckPersonBox_Click(object sender, RoutedEventArgs e)
         {
+            
             if (sender is CheckBox checkbox)
             {
                 dynamic Currentselected = PersonCallMaterial.SelectedItem;
                 if (checkbox.IsChecked != null && checkbox.IsChecked.Value)
                 {
+                    if(itemsControlItems!=null && itemsControlItems.Count >= 6)
+                    {
+                        MessageBox.Show("最多只能选择6个");
+                        checkbox.IsChecked = false;
+                        return;
+                    }
                     CallSelectedItem.Add(Currentselected.baseLocationId);
+
+                    // 添加选中项
+                    string selectedItem = Currentselected.palletInfoCode;
+
+                    bool isIn = itemsControlItems.Any(t => t.baseLocationId == Currentselected.baseLocationId);
+                    if (!isIn)
+                    {
+                        itemsControlItems.Add(new SelectItemModel { 
+                                baseLocationId = Currentselected.baseLocationId,
+                                palletInfoCode = Currentselected.palletInfoCode
+                        });
+
+                    }
                 }
                 else
                 {
                     CallSelectedItem.Remove(Currentselected.baseLocationId);
+
+
+                    // 删除选中项
+                    SelectItemModel  model = itemsControlItems.FirstOrDefault(x => x.baseLocationId == Currentselected.baseLocationId);
+                    if (model != null)
+                    {
+                        itemsControlItems.Remove(model); 
+                    }
                 }
+
+
+              
+
+            }
+        }
+
+        /// <summary>
+        /// 删除选中的值
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void DeleteButton_Click(object sender, RoutedEventArgs e)
+        {
+            // 获取点击按钮的实例
+            Button button = sender as Button;
+
+            // 从按钮的 Tag 属性中获取当前数据项
+            SelectItemModel itemToRemove = button.Tag as SelectItemModel;
+
+            if (itemToRemove != null)
+            {
+                // 从集合中移除数据项
+                itemsControlItems.Remove(itemToRemove);
             }
         }
         /// <summary>
@@ -2018,6 +2089,8 @@ namespace Khd.Core.Wpf.Form
         /// <param name="e"></param>
         private void SelectButton_Click(object sender, RoutedEventArgs e)
         {
+          
+
             CallSelectedItem.Clear();
             GetPersonCallMaterialData();
         }
@@ -2026,6 +2099,8 @@ namespace Khd.Core.Wpf.Form
         /// </summary>
         private void GetPersonCallMaterialData()
         {
+           
+
             try
             {
                 using var scope = _host.Services.CreateScope();
@@ -2078,6 +2153,7 @@ namespace Khd.Core.Wpf.Form
                 if (string.IsNullOrEmpty(MaterialName.Text))
                 {
                     materialInfos = dbContext.MesBaseMaterialInfo.ToList();
+                    
                 }
                 var bill = from a in wmsBaseLocations
                            from b in groupWmsRawStock
@@ -2114,6 +2190,10 @@ namespace Khd.Core.Wpf.Form
                         materialSpec = string.Join("\n", t.Select(x => x.materialSpec[..(x.materialSpec.Length > 20 ? 20 : x.materialSpec.Length)])),
                         materialSpecSrc = string.Join("\n", t.Select(x => x.materialSpec))
                     }).ToList();
+
+
+           
+
                 bills = bills.OrderBy(t => t.palletInfoCode).ThenBy(t => t.materialId).ToList();
                 PersonCallMaterial.ItemsSource = bills.Skip((this.Pagination2.PageIndex - 1) * this.pageCount).Take(this.pageCount);
                 int sum = bills.Count();
@@ -2390,7 +2470,12 @@ namespace Khd.Core.Wpf.Form
             {
                 BaseEquip ctuEquip = SystemData.BaseEquip.First(t => t.objid == 11);
                 BaseEquip endEquip = SystemData.BaseEquip.First(t => t.objid == 20);
-                if (CallSelectedItem.Count == 0)
+                //if (CallSelectedItem.Count == 0)
+                //{  替换
+                //    MessageBox.Show("请选择料箱!");
+                //    return;
+                //}
+                if (itemsControlItems.Count == 0)
                 {
                     MessageBox.Show("请选择料箱!");
                     return;
@@ -2404,7 +2489,12 @@ namespace Khd.Core.Wpf.Form
                 //    MessageBox.Show($"当前CTU只能有6个任务,当前任务数{taskCount}");
                 //    return;
                 //}
-                var wmsBaseLocation = dbContext.WmsBaseLocation.Where(t => t.warehouseId == 512 && t.ContainerStatus == "1").Where(t => CallSelectedItem.Contains(t.locationId)).ToList();
+
+                //替换 var wmsBaseLocation = dbContext.WmsBaseLocation.Where(t => t.warehouseId == 512 && t.ContainerStatus == "1").Where(t => CallSelectedItem.Contains(t.locationId)).ToList();
+                List<long> idList = itemsControlItems.Select(x => x.baseLocationId).ToList();
+                var wmsBaseLocation = dbContext.WmsBaseLocation.Where(t => t.warehouseId == 512 && t.ContainerStatus == "1").Where(t => idList.Contains(t.locationId)).ToList();
+
+
                 StringBuilder stringBuilder = new StringBuilder();
                 stringBuilder.AppendLine("确认出库:");
                 foreach (var item in wmsBaseLocation)
diff --git a/src/Khd.Core.Wpf/appsettings.json b/src/Khd.Core.Wpf/appsettings.json
index b545c56..e8a62b5 100644
--- a/src/Khd.Core.Wpf/appsettings.json
+++ b/src/Khd.Core.Wpf/appsettings.json
@@ -5,8 +5,10 @@
     //khd服务器
     "DefaultConnection": "server=172.16.12.100;port=3306;database=hwjy-cloud;uid=kehaida;pwd=khdrkjy2024...;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True"
     //"DefaultConnection": "server=106.12.13.113;port=3336;database=khd_jyhb;uid=khd;pwd=khd@123;charset='utf8';persistsecurityinfo=True;SslMode=none;Allow User Variables=True"
+    //"DefaultConnection": "server=175.27.215.92;port=3306;database=hwjy-cloud;uid=kehaida;pwd=khd2024;charset='utf8mb4';persistsecurityinfo=True;SslMode=None;Allow User Variables=True"
     //"DefaultConnection": "server=localhost;port=3306;database=jyhb;uid=root;pwd=root;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True"
   },
+
   "PlcConfigs": [
     {
       "IP": "192.168.2.30",