From 5685f238c51c44911a44fe072c6465f39a78a4cc Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Thu, 8 Aug 2024 13:56:54 +0800
Subject: [PATCH 1/7] .

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

diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
index 3f85a4c..80975d2 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
@@ -2147,7 +2147,7 @@
                                                         <RowDefinition Height="*"/>
                                                         <RowDefinition Height="*"/>
                                                     </Grid.RowDefinitions>
-                                                    <Border BorderBrush="White" BorderThickness="2"  Grid.ColumnSpan="2" Grid.Column="4" Grid.RowSpan="2" Margin="20">
+                                                    <Border BorderBrush="White" BorderThickness="2"  Grid.ColumnSpan="1" Grid.Column="5" Grid.RowSpan="2" Margin="20 0 0 0">
                                                         <StackPanel Orientation="Vertical" >
                                                             <TextBlock x:Name="OutOrder" Background="Transparent" Grid.ColumnSpan="2" Grid.RowSpan="2" VerticalAlignment="Top" HorizontalAlignment="Center"/>
                                                             <TextBlock x:Name="thisOutEndStation" Background="Transparent" Grid.ColumnSpan="2" Grid.RowSpan="2" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="0,20,0,0"/>
@@ -2240,7 +2240,7 @@
                                                             </DataGrid.ColumnHeaderStyle>
                                                         </DataGrid>
                                                     </Border>
-                                                    <TextBlock Text="扫描出库" Grid.RowSpan="2" Foreground="White" FontSize="50"   HorizontalAlignment="Center" VerticalAlignment="Center" Grid.ColumnSpan="6"/>
+                                                    <TextBlock Text="扫描出库:"  Grid.Column="3" Grid.RowSpan="2" Foreground="White" FontSize="50"   HorizontalAlignment="Center" VerticalAlignment="Center" Grid.ColumnSpan="6"/>
                                                     <TextBlock Text="待执行CTU任务数:" Visibility="Hidden" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Right" VerticalAlignment="Center" FontSize="50"/>
                                                     <TextBlock x:Name="outTaskCount" Visibility="Hidden" Grid.Row="1" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75"/>
                                                     <Button Content="执行CTU出库任务" Visibility="Hidden" Grid.Row="1" Grid.Column="3" Grid.ColumnSpan="2" Width="500" Height="100" FontSize="50" Background="#346DFF" Foreground="White" Click="ExecuteCtuTask_Click"/>

From ea77779751d767de04669a38a8fd6c02626ffe8b Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Thu, 8 Aug 2024 13:57:01 +0800
Subject: [PATCH 2/7] .

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

diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
index 80975d2..a8f78b7 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
@@ -2244,7 +2244,18 @@
                                                     <TextBlock Text="待执行CTU任务数:" Visibility="Hidden" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Right" VerticalAlignment="Center" FontSize="50"/>
                                                     <TextBlock x:Name="outTaskCount" Visibility="Hidden" Grid.Row="1" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75"/>
                                                     <Button Content="执行CTU出库任务" Visibility="Hidden" Grid.Row="1" Grid.Column="3" Grid.ColumnSpan="2" Width="500" Height="100" FontSize="50" Background="#346DFF" Foreground="White" Click="ExecuteCtuTask_Click"/>
-
+                                                   
+                                                    <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="0" Grid.ColumnSpan="6">
+                                                        <TextBlock Text="扫描料箱号:" Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75"/>
+                                                        <Grid>
+                                                            <hc:TextBox hc:InfoElement.ShowClearButton="True" x:Name="txtOutBox" FontSize="50" LostFocus="txtOutBox_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="130"  Grid.Row="2" Grid.Column="3" Grid.ColumnSpan="3"/>
+                                                            <Button Click="boxOutClear_Click" HorizontalAlignment="Right" Height="100" Panel.ZIndex="1" Width="100" Margin="0,0,0,0"  Grid.Column="5" Grid.Row="2">
+                                                                <Image Source="..\Resources\cancel.png"/>
+                                                            </Button>
+                                                        </Grid>
+                                                        <Button Content="选择出库" Background="#346DFF" Grid.ColumnSpan="6" Grid.Row="1" Foreground="White" FontSize="50" Margin="20,0,0,0"  Height="100" Width="250" Click="SelectOutBtn_Click"/>
+                                                        <Button Content="继续出库" Background="#346DFF" Grid.ColumnSpan="6" Grid.Row="1" Foreground="White" FontSize="50" Margin="20,0,0,0"  Height="100" Width="250" Click="ContineOutBtn_Click"/>
+                                                    </StackPanel>
 
                                                     <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="75"/>

From d9e3a8607d8bf159c8435fd2e2a8f0d81434ce74 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Thu, 8 Aug 2024 14:29:11 +0800
Subject: [PATCH 3/7] .

---
 src/Khd.Core.Wcs/MainCentralControl.cs | 2 +-
 src/Khd.Core.Wcs/appsettings.json      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Khd.Core.Wcs/MainCentralControl.cs b/src/Khd.Core.Wcs/MainCentralControl.cs
index d2d3011..c389ed7 100644
--- a/src/Khd.Core.Wcs/MainCentralControl.cs
+++ b/src/Khd.Core.Wcs/MainCentralControl.cs
@@ -37,7 +37,7 @@ namespace Khd.Core.Wcs
             using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
             try
             {
-                dbContext.WmsBaseLocation.Update(t => new Dictionary<string, WmsBaseLocation>() { { "1", new WmsBaseLocation { locationStatus="1" } } });
+                //dbContext.WmsBaseLocation.Update(t => new Dictionary<string, WmsBaseLocation>() { { "1", new WmsBaseLocation { locationStatus="1" } } });
 
                 StaticData.BasePlcpointList = dbContext.BasePlcpoint.Where(t => t.isDelete == 0).ToList();//设备交互用
                 StaticData.basePlcs = dbContext.BasePlc.ToList();//陈工Agv和设备信息推送
diff --git a/src/Khd.Core.Wcs/appsettings.json b/src/Khd.Core.Wcs/appsettings.json
index 404728a..ab07902 100644
--- a/src/Khd.Core.Wcs/appsettings.json
+++ b/src/Khd.Core.Wcs/appsettings.json
@@ -1,7 +1,7 @@
 {
   "ConnectionStrings": {
-    "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=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=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=localhost;port=3306;database=jyhb;uid=root;pwd=root;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='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True"
   },
@@ -43,7 +43,7 @@
   "Logging": {
     "LogLevel": {
       "Default": "Information",
-      "Microsoft": "Information",
+      "Microsoft": "Error",
       "Microsoft.Hosting.Lifetime": "Information"
     } 
   }

From fe1cf2c9373d3e11bbfc287b5509642c77a1b4c9 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Thu, 8 Aug 2024 14:59:45 +0800
Subject: [PATCH 4/7] .

---
 src/Khd.Core.Wcs/MainCentralControl.cs | 4 ++--
 src/Khd.Core.Wcs/Wcs/FirstFloor.cs     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Khd.Core.Wcs/MainCentralControl.cs b/src/Khd.Core.Wcs/MainCentralControl.cs
index c389ed7..b12a418 100644
--- a/src/Khd.Core.Wcs/MainCentralControl.cs
+++ b/src/Khd.Core.Wcs/MainCentralControl.cs
@@ -84,11 +84,11 @@ namespace Khd.Core.Wcs
                 SecondFloorLine secondFloorLine = new(_host, 2);
                 secondFloorLine.StartPoint();
 
-                //三层接驳位
+               //三层接驳位
                 ThirdFloorPoint thirdFloorPoint = new(_host, 3);
                 thirdFloorPoint.StartPoint();
 
-                //三层AGV
+               // 三层AGV
                 ThirdFloorAGV thirdFloorAGV = new(_host, 3);
                 thirdFloorAGV.StartPoint();
 
diff --git a/src/Khd.Core.Wcs/Wcs/FirstFloor.cs b/src/Khd.Core.Wcs/Wcs/FirstFloor.cs
index 9e75a44..0daee2c 100644
--- a/src/Khd.Core.Wcs/Wcs/FirstFloor.cs
+++ b/src/Khd.Core.Wcs/Wcs/FirstFloor.cs
@@ -523,11 +523,11 @@ namespace Khd.Core.Wcs.Wcs
                             if (Convert.ToInt32(equipstate06Value) == 0)
                             {
                                 dbContext.ChangeTracker.Entries().ToList().ForEach(e => e.Reload());
-                                var wcsTasks = dbContext.WcsTask.Where(t => t.nextPointId == T01).OrderBy(t => t.createTime).ToList();
+                                var wcsTasks = dbContext.WcsTask.Where(t => t.nextPointId == T01 && t.taskStatus<5).OrderBy(t => t.createTime).ToList();
                                 foreach (var wcsTask in wcsTasks)
                                 {
                                     _logger.Info($"当前任务?{wcsTask.ToJsonString()}");
-                                    bool hasTask = dbContext.WcsTask.Where(t => t.endPointId == wcsTask.endPointId && t.objid != wcsTask.objid).Any();
+                                    bool hasTask = dbContext.WcsTask.Where(t => t.endPointId == wcsTask.endPointId && t.objid != wcsTask.objid  && t.nextPointId != 6).Any();
                                     if (!hasTask)
                                     {
                                         wcsTask.serialNo ??= SystemData.GetSerialNo(dbContext);

From a4e3b4b7e0d3adbbf3977ada3c4d353f9cc9fa3e Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Thu, 8 Aug 2024 15:04:37 +0800
Subject: [PATCH 5/7] .

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

diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
index a8f78b7..613d140 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
@@ -2258,13 +2258,13 @@
                                                     </StackPanel>
 
                                                     <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="75"/>
+                                                        <!--<TextBlock Text="扫描料箱号:" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75"/>
                                                         <Grid>
                                                             <hc:TextBox hc:InfoElement.ShowClearButton="True" x:Name="txtOutBox" FontSize="50" LostFocus="txtOutBox_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="130"  Grid.Row="2" Grid.Column="3" Grid.ColumnSpan="3"/>
                                                             <Button Click="boxOutClear_Click" HorizontalAlignment="Right" Height="100" Panel.ZIndex="1" Width="100" Margin="0,0,0,0"  Grid.Column="5" Grid.Row="2">
                                                                 <Image Source="..\Resources\cancel.png"/>
                                                             </Button>
-                                                        </Grid>
+                                                        </Grid>-->
                                                         <Button Content="选择出库" Background="#346DFF" Grid.ColumnSpan="6" Grid.Row="1" Foreground="White" FontSize="50" Margin="20,0,0,0"  Height="100" Width="250" Click="SelectOutBtn_Click"/>
                                                         <Button Content="继续出库" Background="#346DFF" Grid.ColumnSpan="6" Grid.Row="1" Foreground="White" FontSize="50" Margin="20,0,0,0"  Height="100" Width="250" Click="ContineOutBtn_Click"/>
                                                     </StackPanel>

From 690793c51603d2530af4bb33f144daf5af4ded88 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Thu, 8 Aug 2024 17:39:20 +0800
Subject: [PATCH 6/7] .

---
 src/Khd.Core.Wpf/Form/FormBoardT.xaml    |  46 ++--
 src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs | 262 +++++++++++++----------
 2 files changed, 176 insertions(+), 132 deletions(-)

diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
index 613d140..67970a0 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
@@ -2240,48 +2240,52 @@
                                                             </DataGrid.ColumnHeaderStyle>
                                                         </DataGrid>
                                                     </Border>
-                                                    <TextBlock Text="扫描出库:"  Grid.Column="3" Grid.RowSpan="2" Foreground="White" FontSize="50"   HorizontalAlignment="Center" VerticalAlignment="Center" Grid.ColumnSpan="6"/>
+                                                    <!--<TextBlock Text="扫描出库:"  Grid.Column="3" Grid.RowSpan="2" Foreground="White" FontSize="50"   HorizontalAlignment="Center" VerticalAlignment="Center" Grid.ColumnSpan="6"/>-->
                                                     <TextBlock Text="待执行CTU任务数:" Visibility="Hidden" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Right" VerticalAlignment="Center" FontSize="50"/>
                                                     <TextBlock x:Name="outTaskCount" Visibility="Hidden" Grid.Row="1" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75"/>
                                                     <Button Content="执行CTU出库任务" Visibility="Hidden" Grid.Row="1" Grid.Column="3" Grid.ColumnSpan="2" Width="500" Height="100" FontSize="50" Background="#346DFF" Foreground="White" Click="ExecuteCtuTask_Click"/>
                                                    
                                                     <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="0" Grid.ColumnSpan="6">
-                                                        <TextBlock Text="扫描料箱号:" Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75"/>
+                                                        <TextBlock Text="扫描料箱号:" Width="350" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="60"/>
                                                         <Grid>
-                                                            <hc:TextBox hc:InfoElement.ShowClearButton="True" x:Name="txtOutBox" FontSize="50" LostFocus="txtOutBox_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="130"  Grid.Row="2" Grid.Column="3" Grid.ColumnSpan="3"/>
+                                                            <hc:TextBox hc:InfoElement.ShowClearButton="True" x:Name="txtOutBox" FontSize="50" TextChanged="txtOutBox_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="130"  Grid.Row="2" Grid.Column="3" Grid.ColumnSpan="3" />
                                                             <Button Click="boxOutClear_Click" HorizontalAlignment="Right" Height="100" Panel.ZIndex="1" Width="100" Margin="0,0,0,0"  Grid.Column="5" Grid.Row="2">
                                                                 <Image Source="..\Resources\cancel.png"/>
                                                             </Button>
                                                         </Grid>
-                                                        <Button Content="选择出库" Background="#346DFF" Grid.ColumnSpan="6" Grid.Row="1" Foreground="White" FontSize="50" Margin="20,0,0,0"  Height="100" Width="250" Click="SelectOutBtn_Click"/>
-                                                        <Button Content="继续出库" Background="#346DFF" Grid.ColumnSpan="6" Grid.Row="1" Foreground="White" FontSize="50" Margin="20,0,0,0"  Height="100" Width="250" Click="ContineOutBtn_Click"/>
                                                     </StackPanel>
 
-                                                    <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="75"/>
+                                                    <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="1" Grid.ColumnSpan="6">
+                                                        <TextBlock Text="扫描条码号:" Width="350" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="60"/>
                                                         <Grid>
-                                                            <hc:TextBox hc:InfoElement.ShowClearButton="True" x:Name="txtOutBox" FontSize="50" LostFocus="txtOutBox_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="130"  Grid.Row="2" Grid.Column="3" Grid.ColumnSpan="3"/>
-                                                            <Button Click="boxOutClear_Click" HorizontalAlignment="Right" Height="100" Panel.ZIndex="1" Width="100" Margin="0,0,0,0"  Grid.Column="5" Grid.Row="2">
-                                                                <Image Source="..\Resources\cancel.png"/>
-                                                            </Button>
-                                                        </Grid>-->
-                                                        <Button Content="选择出库" Background="#346DFF" Grid.ColumnSpan="6" Grid.Row="1" Foreground="White" FontSize="50" Margin="20,0,0,0"  Height="100" Width="250" Click="SelectOutBtn_Click"/>
-                                                        <Button Content="继续出库" Background="#346DFF" Grid.ColumnSpan="6" Grid.Row="1" Foreground="White" FontSize="50" Margin="20,0,0,0"  Height="100" Width="250" Click="ContineOutBtn_Click"/>
-                                                    </StackPanel>
-                                                    <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="75"/>
-                                                        <Grid>
-                                                            <hc:TextBox hc:InfoElement.ShowClearButton="True" x:Name="txtOutBarCode" FontSize="50" LostFocus="txtOutBarCode_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="130"  Grid.Row="3" Grid.Column="3" Grid.ColumnSpan="3"/>
+                                                            <hc:TextBox hc:InfoElement.ShowClearButton="True" x:Name="txtOutBarCode" FontSize="50" TextChanged="txtOutBarCode_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="130"  Grid.Row="3" Grid.Column="3" Grid.ColumnSpan="3"/>
                                                             <Button Click="barOutClear_Click" HorizontalAlignment="Right" Height="100" Panel.ZIndex="1" Width="100" Margin="0,0,0,0"  Grid.Column="5" Grid.Row="3">
                                                                 <Image Source="..\Resources\cancel.png"/>
                                                             </Button>
                                                         </Grid>
+                                                       
+                                                    </StackPanel>
+
+                                                    <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="2" Grid.ColumnSpan="6">
+                                                        <TextBlock Width="350"  Text="物料名称:" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="60"/>
+                                                        <Grid>
+                                                            <hc:TextBox hc:InfoElement.ShowClearButton="True"  IsReadOnly="True" x:Name="outMaterialNameTxt" FontSize="50" LostFocus="txtOutBox_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="130"  Grid.Row="2" Grid.Column="3" Grid.ColumnSpan="3"/>
+                                                        </Grid>
+                                                        <Button Content="选择出库" Background="#346DFF" Grid.ColumnSpan="6" Grid.Row="1" Foreground="White" FontSize="50" Margin="20,0,0,0"  Height="100" Width="250" Click="SelectOutBtn_Click"/>
+                                                        <Button Content="继续出库" Background="#346DFF" Grid.ColumnSpan="6" Grid.Row="1" Foreground="White" FontSize="50" Margin="20,0,0,0"  Height="100" Width="250" Click="ContineOutBtn_Click"/>
+                                                    </StackPanel>
+                                                    <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="3" Grid.ColumnSpan="6">
+                                                        <TextBlock Text="物料规格:" Width="350" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="60"/>
+                                                        <Grid>
+                                                            <hc:TextBox hc:InfoElement.ShowClearButton="True" IsReadOnly="True" x:Name="outMaterialSpecTxt" FontSize="50" LostFocus="txtOutBarCode_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="130"  Grid.Row="3" Grid.Column="3" Grid.ColumnSpan="3"/>
+                                                           
+                                                        </Grid>
                                                         <Button Content="确认出库" Grid.Column="4" Grid.Row="5" Grid.ColumnSpan="2" Width="400" Height="100" Margin="100,0,0,0" FontSize="35" Background="#346DFF" Foreground="White" Click="OutRawBaseLocaltion_Click"/>
                                                     </StackPanel>
                                                     <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="4" Grid.ColumnSpan="6">
-                                                        <TextBlock Text="出库数量:" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75"/>
+                                                        <TextBlock Text="出库数量:" Width="350" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="60"/>
                                                         <Grid>
-                                                            <hc:TextBox x:Name="txtOutScan" Margin="80,0,0,0"  IsReadOnly="True" FontSize="50" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="130"  Grid.Row="4" Grid.Column="3" Grid.ColumnSpan="3" />
+                                                            <hc:TextBox x:Name="txtOutScan" Margin="0,0,0,0"  IsReadOnly="True" FontSize="50" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="130"  Grid.Row="4" Grid.Column="3" Grid.ColumnSpan="3" KeyDown="OutEnter" />
                                                         </Grid>
                                                         <Button Content="背负式小车捡料完成" Grid.Column="4" Grid.Row="6" Grid.ColumnSpan="2" Width="400" Height="100" Margin="100,0,0,0" FontSize="35" Background="#346DFF" Foreground="White" Click="btnBearConfirmBox_Click"/>
 
diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
index 924abe0..8d7a4da 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
@@ -26,6 +26,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using System.Windows.Media.Media3D;
 using System.Windows.Threading;
 using Z.EntityFramework.Plus;
 
@@ -2047,6 +2048,9 @@ namespace Khd.Core.Wpf.Form
             try
             {
                 string containerCode = txtOutBox.Text;
+                
+                if (containerCode.Length < 15)
+                    return;
                 if (!string.IsNullOrEmpty(containerCode))
                 {
                     using var scope = _host.Services.CreateScope();
@@ -2078,8 +2082,11 @@ namespace Khd.Core.Wpf.Form
         {
             try
             {
+                outMaterialNameTxt.Text ="";
+                outMaterialSpecTxt.Text = "";
                 string barCode = txtOutBarCode.Text;
                 string containerCode = txtOutBox.Text;
+                if (barCode.Length < 19) return;
                 if (!string.IsNullOrEmpty(containerCode))
                 {
                     if (!string.IsNullOrEmpty(barCode))
@@ -2104,8 +2111,16 @@ namespace Khd.Core.Wpf.Form
                                 txtOutScan.Text = string.Empty;
                                 txtOutBarCode.Focus();
                             }
+
+
                             else
                             {
+                                var materialInfo = dbContext.MesBaseMaterialInfo.FirstOrDefault(t => t.MaterialId == wmsRawStock.materialId);
+                                if (materialInfo != null)
+                                {
+                                    outMaterialNameTxt.Text = materialInfo.MaterialName;
+                                    outMaterialSpecTxt.Text = materialInfo.MaterialSpec;
+                                }
                                 txtOutScan.Text = (mesBaseMaterialInfo.batchFlag == "1" ? (wmsRawStock.totalAmount - wmsRawStock.frozenAmount) : 1).ToString();
                                 if (mesBaseMaterialInfo.batchFlag == "1")
                                 {
@@ -2141,125 +2156,143 @@ namespace Khd.Core.Wpf.Form
         /// <param name="e"></param>
         private void OutRawBaseLocaltion_Click(object sender, RoutedEventArgs e)
         {
-            if (!string.IsNullOrEmpty(txtOutBox.Text) && !string.IsNullOrEmpty(txtOutBarCode.Text))
-            {
-                using var scope = _host.Services.CreateScope();
-                using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
-                var wmsRawStock = dbContext.WmsRawStock
-                    .FirstOrDefault(t => t.instockBatch == txtOutBarCode.Text && t.palletInfoCode == txtOutBox.Text);
-                if (wmsRawStock == null)
-                {
-                    HandyControl.Controls.MessageBox.Error("库存已经被清空!");
-                    return;
-                }
-                decimal outScan = Convert.ToDecimal(this.txtOutScan.Text);
-                if (outScan != 1 && outScan > wmsRawStock.totalAmount - wmsRawStock.frozenAmount)
-                {
-                    HandyControl.Controls.MessageBox.Error("出库数量不能大于库存数量!");
-                    return;
-                }
-                var wcsTask = dbContext.WcsTask.Where(t => t.containerNo == txtOutBox.Text).FirstOrDefault();
-                if (wcsTask == null)
-                {
-                    HandyControl.Controls.MessageBox.Error("出库失败，非CTU出库任务，无法出库!");
-                    return;
-                }
-                else
-                {
-                    var mesBaseBarcodeInfo = dbContext.MesBaseBarcodeInfo.FirstOrDefault(t => t.barcodeInfo == txtOutBarCode.Text);
-                    if (mesBaseBarcodeInfo != null)
-                    {
-                        WmsRawOutstock? wmsRawOutstock = dbContext.WmsRawOutstock
-                            .Where(t => t.materialId == mesBaseBarcodeInfo.materialId && t.realOutstockAmount < t.outstockAmount && t.saleOrderId == (mesBaseBarcodeInfo.saleOrderId == null ? 0 : mesBaseBarcodeInfo.saleOrderId)).FirstOrDefault();
-                        if (wmsRawOutstock != null)
-                        {
-                            wmsRawOutstock.realOutstockAmount += outScan;
-                            if (wmsRawOutstock.outstockAmount == wmsRawOutstock.realOutstockAmount)
-                            {
-                                wmsRawOutstock.executeStatus = "2";
-                            }
-                            else if (wmsRawOutstock.realOutstockAmount > wmsRawOutstock.outstockAmount)
-                            {
-                                HandyControl.Controls.MessageBox.Error("出库数量不能大于申请单数量，当前出库数量为：" + (wmsRawOutstock.realOutstockAmount - outScan) + "，申请单数量为：" + wmsRawOutstock.outstockAmount + "!");
-                                return;
-                            }
-                            wmsRawStock.totalAmount -= outScan;
-                            if (wmsRawStock.totalAmount <= 0)
-                            {
-                                dbContext.Remove(wmsRawStock);
-                                dbContext.Update(wmsRawOutstock);
-                            }
-                            else
-                            {
-                                dbContext.Update(wmsRawStock);
-                                dbContext.Update(wmsRawOutstock);
-                            }
-                            if (mesBaseBarcodeInfo != null)
-                            {
-                                WmsRawOutstockDetail wmsProductOutstockDetail = new WmsRawOutstockDetail()
-                                {
-                                    rawOutstockDetailId = Global.SnowId.NextId(),
-                                    rawOutstockId = wmsRawOutstock.rawOutstockId,
-                                    materialId = mesBaseBarcodeInfo.materialId,
-                                    createDate = DateTime.Now,
-                                    createBy = "WCS",
-                                    taskCode = wcsTask.objid.ToString(),
-                                    executeStatus = "2",
-                                    locationCode = wcsTask.currPointNo,
-                                    outstockAmount = outScan,
-                                    planAmount = outScan,
-                                    warehouseId = 512,
-                                    materialBarcode = mesBaseBarcodeInfo.barcodeInfo,
-                                    instockBatch = mesBaseBarcodeInfo.batchCode,
-                                    stackAmount = outScan,
-                                    outstockPerson = "WCS",
-                                    outstockTime = DateTime.Now,
-                                    outstockWay = "2",
-                                    materialProductionDate = mesBaseBarcodeInfo.productionDate
-                                };
-                                dbContext.WmsRawOutstockDetail.Add(wmsProductOutstockDetail);
-                            }
-                            dbContext.SaveChanges();
-                        }
-                        else
-                        {
-                            if (mesBaseBarcodeInfo.PurchaseOrderId == null)
-                            {
-                                wmsRawStock.totalAmount -= outScan;
-                                if (wmsRawStock.totalAmount == 0)
-                                {
-                                    dbContext.WmsRawStock.Remove(wmsRawStock);
-                                    dbContext.SaveChanges();
-                                }
-                                else
-                                {
-                                    dbContext.WmsRawStock.Update(wmsRawStock);
-                                    dbContext.SaveChanges();
-                                }
-                            }
-                            else
-                            {
-                                HandyControl.Controls.MessageBox.Error("该条码的销售订单不正确");
-                                txtOutScan.Text = string.Empty;
-                                txtOutBarCode.Text = string.Empty;
-                                return;
-                            }
-                        }
+            OutRaw();
+        }
 
-                        HandyControl.Controls.MessageBox.Success("出库成功!");
-                        txtOutScan.Text = string.Empty;
-                        txtOutBarCode.Text = string.Empty;
-                        txtOutBarCode.Focus();
+        private void OutRaw()
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(txtOutBox.Text) && !string.IsNullOrEmpty(txtOutBarCode.Text))
+                {
+                    using var scope = _host.Services.CreateScope();
+                    using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
+                    var wmsRawStock = dbContext.WmsRawStock
+                        .FirstOrDefault(t => t.instockBatch == txtOutBarCode.Text && t.palletInfoCode == txtOutBox.Text);
+                    if (wmsRawStock == null)
+                    {
+                        HandyControl.Controls.MessageBox.Error("库存已经被清空!");
+                        return;
+                    }
+                    decimal outScan = Convert.ToDecimal(this.txtOutScan.Text);
+                    if (outScan != 1 && outScan > wmsRawStock.totalAmount - wmsRawStock.frozenAmount)
+                    {
+                        HandyControl.Controls.MessageBox.Error("出库数量不能大于库存数量!");
+                        return;
+                    }
+                    var wcsTask = dbContext.WcsTask.Where(t => t.containerNo == txtOutBox.Text).FirstOrDefault();
+                    if (wcsTask == null)
+                    {
+                        HandyControl.Controls.MessageBox.Error("出库失败，非CTU出库任务，无法出库!");
+                        return;
                     }
                     else
                     {
-                        HandyControl.Controls.MessageBox.Error("未查询到该条码信息!");
+                        var mesBaseBarcodeInfo = dbContext.MesBaseBarcodeInfo.FirstOrDefault(t => t.barcodeInfo == txtOutBarCode.Text);
+                        if (mesBaseBarcodeInfo != null)
+                        {
+                            WmsRawOutstock? wmsRawOutstock = dbContext.WmsRawOutstock
+                                .Where(t => t.materialId == mesBaseBarcodeInfo.materialId && t.realOutstockAmount < t.outstockAmount && t.saleOrderId == (mesBaseBarcodeInfo.saleOrderId == null ? 0 : mesBaseBarcodeInfo.saleOrderId)).FirstOrDefault();
+                            if (wmsRawOutstock != null)
+                            {
+                                wmsRawOutstock.realOutstockAmount += outScan;
+                                if (wmsRawOutstock.outstockAmount == wmsRawOutstock.realOutstockAmount)
+                                {
+                                    wmsRawOutstock.executeStatus = "2";
+                                }
+                                else if (wmsRawOutstock.realOutstockAmount > wmsRawOutstock.outstockAmount)
+                                {
+                                    HandyControl.Controls.MessageBox.Error("出库数量不能大于申请单数量，当前出库数量为：" + (wmsRawOutstock.realOutstockAmount - outScan) + "，申请单数量为：" + wmsRawOutstock.outstockAmount + "!");
+                                    return;
+                                }
+                                wmsRawStock.totalAmount -= outScan;
+                                if (wmsRawStock.totalAmount <= 0)
+                                {
+                                    dbContext.Remove(wmsRawStock);
+                                    dbContext.Update(wmsRawOutstock);
+                                }
+                                else
+                                {
+                                    dbContext.Update(wmsRawStock);
+                                    dbContext.Update(wmsRawOutstock);
+                                }
+                                if (mesBaseBarcodeInfo != null)
+                                {
+                                    WmsRawOutstockDetail wmsProductOutstockDetail = new WmsRawOutstockDetail()
+                                    {
+                                        rawOutstockDetailId = Global.SnowId.NextId(),
+                                        rawOutstockId = wmsRawOutstock.rawOutstockId,
+                                        materialId = mesBaseBarcodeInfo.materialId,
+                                        createDate = DateTime.Now,
+                                        createBy = "WCS",
+                                        taskCode = wcsTask.objid.ToString(),
+                                        executeStatus = "2",
+                                        locationCode = wcsTask.currPointNo,
+                                        outstockAmount = outScan,
+                                        planAmount = outScan,
+                                        warehouseId = 512,
+                                        materialBarcode = mesBaseBarcodeInfo.barcodeInfo,
+                                        instockBatch = mesBaseBarcodeInfo.batchCode,
+                                        stackAmount = outScan,
+                                        outstockPerson = "WCS",
+                                        outstockTime = DateTime.Now,
+                                        outstockWay = "2",
+                                        materialProductionDate = mesBaseBarcodeInfo.productionDate
+                                    };
+                                    dbContext.WmsRawOutstockDetail.Add(wmsProductOutstockDetail);
+                                }
+                                dbContext.SaveChanges();
+                            }
+                            else
+                            {
+                                if (mesBaseBarcodeInfo.PurchaseOrderId == null)
+                                {
+                                    wmsRawStock.totalAmount -= outScan;
+                                    if (wmsRawStock.totalAmount == 0)
+                                    {
+                                        dbContext.WmsRawStock.Remove(wmsRawStock);
+                                        dbContext.SaveChanges();
+                                    }
+                                    else
+                                    {
+                                        dbContext.WmsRawStock.Update(wmsRawStock);
+                                        dbContext.SaveChanges();
+                                    }
+                                }
+                                else
+                                {
+                                    HandyControl.Controls.MessageBox.Error("该条码的销售订单不正确");
+                                    txtOutScan.Text = string.Empty;
+                                    txtOutBarCode.Text = string.Empty;
+                                    outMaterialSpecTxt.Text = string.Empty;
+                                    outMaterialNameTxt.Text = string.Empty;
+                                    txtOutBox.Focus();
+                                    return;
+                                }
+                            }
+
+                            HandyControl.Controls.MessageBox.Success("出库成功!");
+                            txtOutScan.Text = string.Empty;
+                            txtOutBarCode.Text = string.Empty;
+                            outMaterialSpecTxt.Text = string.Empty;
+                            outMaterialNameTxt.Text = string.Empty;
+                            txtOutBarCode.Focus();
+                            txtOutBox.Focus();
+                        }
+                        else
+                        {
+                            HandyControl.Controls.MessageBox.Error("未查询到该条码信息!");
+                        }
                     }
                 }
+                else
+                {
+                    HandyControl.Controls.MessageBox.Info("请先扫描容器号和条码!");
+                }
             }
-            else
+            catch(Exception ex)
             {
-                HandyControl.Controls.MessageBox.Info("请先扫描容器号和条码!");
+                MessageBox.Show(ex.Message);
             }
         }
         /// <summary>
@@ -4029,6 +4062,13 @@ namespace Khd.Core.Wpf.Form
 
             }
         }
+
         #endregion
+
+
+        private void OutEnter(object sender, KeyEventArgs e)
+        {
+            OutRaw();
+        }
     }
 }

From aa8ccf7cd21871a0a861ca82398458034f160720 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Thu, 8 Aug 2024 18:01:05 +0800
Subject: [PATCH 7/7] .

---
 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 8d7a4da..e8025e5 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
@@ -2266,6 +2266,7 @@ namespace Khd.Core.Wpf.Form
                                     txtOutBarCode.Text = string.Empty;
                                     outMaterialSpecTxt.Text = string.Empty;
                                     outMaterialNameTxt.Text = string.Empty;
+                                    txtOutBox.Text = string.Empty;
                                     txtOutBox.Focus();
                                     return;
                                 }
@@ -2276,7 +2277,7 @@ namespace Khd.Core.Wpf.Form
                             txtOutBarCode.Text = string.Empty;
                             outMaterialSpecTxt.Text = string.Empty;
                             outMaterialNameTxt.Text = string.Empty;
-                            txtOutBarCode.Focus();
+                            txtOutBox.Text = string.Empty;
                             txtOutBox.Focus();
                         }
                         else