From cde5e5dd0e9f9dd669406aec8b3513cb1f9bf630 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Sat, 21 Sep 2024 09:54:09 +0800
Subject: [PATCH] .

---
 src/Khd.Core.Wcs/MainCentralControl.cs          |  1 +
 src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs            |  2 +-
 .../TaskForm/Inventory/InventoryTaskForm.xaml   |  7 +++++--
 .../Inventory/InventoryTaskForm.xaml.cs         | 17 ++++++++++-------
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/Khd.Core.Wcs/MainCentralControl.cs b/src/Khd.Core.Wcs/MainCentralControl.cs
index 6d77409..cd7e666 100644
--- a/src/Khd.Core.Wcs/MainCentralControl.cs
+++ b/src/Khd.Core.Wcs/MainCentralControl.cs
@@ -1,4 +1,5 @@
 using Jc.SnowId;
+using Khd.Core.Domain.Dto.TaskType;
 using Khd.Core.Domain.Models;
 using Khd.Core.EntityFramework;
 using Khd.Core.Library;
diff --git a/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs b/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs
index 1a3634f..6633436 100644
--- a/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs
+++ b/src/Khd.Core.Wcs/Wcs/FiveFloorCTU.cs
@@ -455,7 +455,7 @@ namespace Khd.Core.Wcs.Wcs
                                         dbContext.Update(item);
                                         lock (SystemData.outStockLock)
                                         {
-                                            bool hasTask = dbContext.WcsTask.Where(t => t.nextPointId == 11 && t.taskType == StaticTaskType.FiveAccessoryOut).Any();
+                                            bool hasTask = dbContext.WcsTask.Where(t => t.nextPointId == 11 && (t.taskType == StaticTaskType.FiveAccessoryOut || t.taskType == StaticTaskType.FiveAccessoryStorage || t.taskType == StaticTaskType.FiveAccessoryRemove) ).Any();
                                             int taskCount = dbContext.WcsTask.Where(t => t.nextPointId == 11 && t.taskType == StaticTaskType.FiveAccessoryIn).Count();
                                             if ((!hasTask && item.ud3 == "1") || (taskCount >= 6))//如果CTU当前任务数量很多，取消预执行任务,或者出库的任务都生成了入库任务
                                             {
diff --git a/src/Khd.Core.Wpf/TaskForm/Inventory/InventoryTaskForm.xaml b/src/Khd.Core.Wpf/TaskForm/Inventory/InventoryTaskForm.xaml
index b84fb4f..ef83bac 100644
--- a/src/Khd.Core.Wpf/TaskForm/Inventory/InventoryTaskForm.xaml
+++ b/src/Khd.Core.Wpf/TaskForm/Inventory/InventoryTaskForm.xaml
@@ -56,7 +56,7 @@
             CanUserResizeRows="False"
             Focusable="False"
             HeadersVisibility="Column"
-            IsReadOnly="True"
+           
             VerticalAlignment="Stretch"
             RowHeaderWidth="0"
             SelectionMode="Single" FontSize="16"
@@ -80,7 +80,10 @@
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
                 <DataGridTextColumn Header="库存数量" Binding="{Binding StockAmount}" ElementStyle="{StaticResource dgCell}" Width="110*"/>
-                <DataGridTextColumn Header="实际数量" Binding="{Binding RealAmount}" ElementStyle="{StaticResource dgCell}" Width="110*"/>
+                <DataGridTextColumn Header="实际数量" Binding="{Binding RealAmount}"  IsReadOnly="False" ElementStyle="{StaticResource dgCell}" Width="110*"/>
+
+               
+                
                 <DataGridTemplateColumn Header="操作" Width="100*">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
diff --git a/src/Khd.Core.Wpf/TaskForm/Inventory/InventoryTaskForm.xaml.cs b/src/Khd.Core.Wpf/TaskForm/Inventory/InventoryTaskForm.xaml.cs
index ad388ef..cd7062b 100644
--- a/src/Khd.Core.Wpf/TaskForm/Inventory/InventoryTaskForm.xaml.cs
+++ b/src/Khd.Core.Wpf/TaskForm/Inventory/InventoryTaskForm.xaml.cs
@@ -132,7 +132,7 @@ namespace Khd.Core.Wpf.TaskForm
                             StockAmount = t.Sum(n => n.StockAmount),
                             LocationCode = wcsTask.currPointNo,
                             MaterialId = t.Key,
-                            RealAmount = t.Sum(n => n.RealAmount),
+                            RealAmount = (t.Sum(n => n.RealAmount)).ToString(),
                         });
                     this.InventoryDataGrid.Items.Refresh();
                     if (wmsInventoryCheckDetails.Count == 0)
@@ -188,13 +188,16 @@ namespace Khd.Core.Wpf.TaskForm
             if (this.InventoryDataGrid.SelectedItem != null)
             {
                 dynamic item = this.InventoryDataGrid.SelectedItem;
-                long materialId = item.MaterialId;
-                string containerNo = item.ContainerNo;
-                string materialName = item.MaterialName;
-                string locationCode = item.LocationCode;
+                UpdateStockAmount updateStockAmount = new UpdateStockAmount(_host, item.MaterialBatch);
+                updateStockAmount.ShowDialog();
+               
+                //long materialId = item.MaterialId;
+                //string containerNo = txtInBox.Text;
+                //string materialName = item.MaterialName;
+                //string locationCode = item.LocationCode;
+                //string realAmount = item.RealAmount;
                 
-                弹框接受数量
-                GetData(item.ContainerNo);
+                //GetData(txtInBox.Text);
             }
         }