From 2c293f8ba1fcc2487157370675bbc3cbfbf2e338 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Thu, 12 Sep 2024 15:28:11 +0800
Subject: [PATCH] .

---
 src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs      | 62 +-------------
 .../WindowPage/InventoryMaterialWindow.xaml   | 11 ++-
 .../InventoryMaterialWindow.xaml.cs           | 80 +++++++++++++++++++
 3 files changed, 89 insertions(+), 64 deletions(-)

diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
index bd589f4..e4c1225 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
@@ -4295,67 +4295,7 @@ namespace Khd.Core.Wpf.Form
         {
             InventoryMaterialWindow window = new InventoryMaterialWindow(_host);
             window.ShowDialog();
-            return;
-            try
-            {
-                using var scope = _host.Services.CreateScope();
-                using var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
-                var Orders = dbContext.WmsInventoryCheck.Where(t => t.CheckStatus == "0" || t.CheckStatus == "1").ToList();
-                if (Orders != null && Orders.Count > 0)
-                {
-                    MessageBoxResult messageBoxResult = HandyControl.Controls.MessageBox.Show("已经有盘库任务是否继续创建新盘库任务?", "提示", MessageBoxButton.OKCancel, MessageBoxImage.Question);
-                    if (messageBoxResult == MessageBoxResult.OK)
-                    {
-                        Orders.ForEach(t =>
-                        {
-                            t.CheckStatus = "2";
-                        });
-                        dbContext.UpdateRange(Orders);
-                        int locationCount = dbContext.WmsBaseLocation.Where(t => t.warehouseId == 512).Count();
-                        dbContext.Add(new WmsInventoryCheck()
-                        {
-                            CreateTime = DateTime.Now,
-                            CheckStatus = "0",
-                            LocationAmount = locationCount,
-                            InventoriedAmount = 0,
-                            InventoryingAmount = 0,
-                            WarehouseId = 512,
-                            CreateBy = "WCS"
-                        });
-                        dbContext.SaveChanges();
-                        HandyControl.Controls.Growl.Info("创建盘库任务成功!");
-                    }
-                    else
-                    {
-                        return;
-                    }
-                }
-                else
-                {
-                    MessageBoxResult messageBoxResult = HandyControl.Controls.MessageBox.Show("是否创建一个盘库任务?", "提示", MessageBoxButton.OKCancel, MessageBoxImage.Question);
-                    if (messageBoxResult == MessageBoxResult.OK)
-                    {
-                        int locationCount = dbContext.WmsBaseLocation.Where(t => t.warehouseId == 512).Count();
-                        dbContext.Add(new WmsInventoryCheck()
-                        {
-                            CreateTime = DateTime.Now,
-                            CheckStatus = "0",
-                            LocationAmount = locationCount,
-                            InventoriedAmount = 0,
-                            InventoryingAmount = 0,
-                            WarehouseId = 512,
-                            CreateBy = "WCS"
-                        });
-                        dbContext.SaveChanges();
-                        HandyControl.Controls.Growl.Info("创建盘库任务成功!");
-                    }
-                }
-            }
-            catch
-            {
-
-            }
-            GetInvertoryData();
+     
         }
 
         private void GetInvertoryData()
diff --git a/src/Khd.Core.Wpf/WindowPage/InventoryMaterialWindow.xaml b/src/Khd.Core.Wpf/WindowPage/InventoryMaterialWindow.xaml
index 954501e..56f6e89 100644
--- a/src/Khd.Core.Wpf/WindowPage/InventoryMaterialWindow.xaml
+++ b/src/Khd.Core.Wpf/WindowPage/InventoryMaterialWindow.xaml
@@ -39,9 +39,14 @@
                 <Button x:Name="SearchButton" Foreground="White" Background="Blue" Content="搜  索" FontSize="20" Margin="20 0 25 0"  Height="50" Width="100" Click="SearchButton_Click"/>
 
                 <TextBlock Text="选中物料" Foreground="White" FontSize="25" Margin="0 0 25 0" VerticalAlignment="Center"/>
-                <TextBox x:Name="SelectMaterialId" Width="50" Height="40" Margin="5,0,0,0" VerticalAlignment="Center" />
-                <TextBox x:Name="SelectMaterialName" Width="200" Height="40" Margin="5,0,0,0" VerticalAlignment="Center" />
-                
+                <TextBox x:Name="SelectMaterialId" Width="50" Height="40" Margin="5,0,0,0" VerticalAlignment="Center" IsReadOnly="True"/>
+                <TextBox x:Name="SelectMaterialName" Width="200" Height="40" Margin="5,0,0,0" VerticalAlignment="Center"  IsReadOnly="True"/>
+
+
+                <Button x:Name="ClearButton" Foreground="White" Background="Blue" Content="清除" FontSize="20" Margin="20 0 25 0"  Height="50" Width="100" Click="ClearButton_Click" />
+
+                <Button x:Name="CreateInventoryTask" Foreground="White" Background="DarkGreen" Content="创建盘库任务" FontSize="20" Margin="200 0 25 0"  Height="50" Width="200" Click="CreateInventoryTask_Click" />
+               
             </StackPanel>
         </Grid>
         <Grid Grid.Row="1">
diff --git a/src/Khd.Core.Wpf/WindowPage/InventoryMaterialWindow.xaml.cs b/src/Khd.Core.Wpf/WindowPage/InventoryMaterialWindow.xaml.cs
index 55b9a72..cead1e8 100644
--- a/src/Khd.Core.Wpf/WindowPage/InventoryMaterialWindow.xaml.cs
+++ b/src/Khd.Core.Wpf/WindowPage/InventoryMaterialWindow.xaml.cs
@@ -108,5 +108,85 @@ namespace Khd.Core.Wpf.WindowPage
             public string  materialName { get; set; }
             public string  materialSpec { get; set; }
         }
+
+        private void ClearButton_Click(object sender, RoutedEventArgs e)
+        {
+            // 如果没有选中项，则清空TextBox的内容
+            SelectMaterialId.Text = string.Empty;
+            SelectMaterialName.Text = string.Empty;
+            SearchTxt.Text = string.Empty;
+            Init();
+
+        }
+
+        private void CreateInventoryTask_Click(object sender, RoutedEventArgs e)
+        {
+           
+            try
+            {
+                using var scope = host.Services.CreateScope();
+                var dbContext = scope.ServiceProvider.GetRequiredService<DefaultDbContext>();
+
+                var Orders = dbContext.WmsInventoryCheck.Where(t => t.CheckStatus == "0" || t.CheckStatus == "1").ToList();
+                if (Orders != null && Orders.Count > 0)
+                {
+                    MessageBoxResult messageBoxResult = HandyControl.Controls.MessageBox.Show("已经有盘库任务是否继续创建新盘库任务?", "提示", MessageBoxButton.OKCancel, MessageBoxImage.Question);
+                    if (messageBoxResult == MessageBoxResult.OK)
+                    {
+                        Orders.ForEach(t =>
+                        {
+                            t.CheckStatus = "2";
+                        });
+                        dbContext.UpdateRange(Orders);
+                        int locationCount = dbContext.WmsBaseLocation.Where(t => t.warehouseId == 512).Count();
+                        dbContext.Add(new WmsInventoryCheck()
+                        {
+                            CreateTime = DateTime.Now,
+                            CheckStatus = "0",
+                            LocationAmount = locationCount,
+                            InventoriedAmount = 0,
+                            InventoryingAmount = 0,
+                            WarehouseId = 512,
+                            CreateBy = "WCS",
+                            MaterialId = string.IsNullOrEmpty(SelectMaterialId.Text) ? null : long.Parse(SelectMaterialId.Text)
+                        }) ;
+                        dbContext.SaveChanges();
+                        HandyControl.Controls.Growl.Info("创建盘库任务成功!");
+                    }
+                    else
+                    {
+                        return;
+                    }
+                }
+                else
+                {
+                    MessageBoxResult messageBoxResult = HandyControl.Controls.MessageBox.Show("是否创建一个盘库任务?", "提示", MessageBoxButton.OKCancel, MessageBoxImage.Question);
+                    if (messageBoxResult == MessageBoxResult.OK)
+                    {
+                        int locationCount = dbContext.WmsBaseLocation.Where(t => t.warehouseId == 512).Count();
+                        dbContext.Add(new WmsInventoryCheck()
+                        {
+                            CreateTime = DateTime.Now,
+                            CheckStatus = "0",
+                            LocationAmount = locationCount,
+                            InventoriedAmount = 0,
+                            InventoryingAmount = 0,
+                            WarehouseId = 512,
+                            CreateBy = "WCS"
+                        });
+                        dbContext.SaveChanges();
+                        HandyControl.Controls.Growl.Info("创建盘库任务成功!");
+                    }
+                }
+
+                this.Close();
+                
+            }
+            catch
+            {
+
+            }
+
+        }
     }
 }