From e57d9973e78553d986e6fa09eefca55881fbcff2 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Wed, 11 Dec 2024 10:56:45 +0800
Subject: [PATCH] =?UTF-8?q?change-=E8=BE=85=E6=96=99=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E4=B8=8B=E5=8F=91=E4=BB=BB=E5=8A=A1=E4=BB=A5?=
 =?UTF-8?q?=E5=90=8E=E4=B8=8D=E4=BC=9A=E7=AB=8B=E5=8D=B3=E5=B0=86=E6=96=99?=
 =?UTF-8?q?=E7=AE=B1=E7=8A=B6=E6=80=81=E7=BD=AE=E4=B8=BA=E5=BA=93=E5=A4=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
index 40583ff..991b27a 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
@@ -3935,6 +3935,27 @@ namespace Khd.Core.Wpf.Form
                             return;
                         }
                     }
+
+
+                    var removeTaskManualList = dbContext.WcsTaskManual.Where(x => x.taskType == 30 ).ToList();
+                    if (removeTaskManualList.Count > 0)
+                    {
+                        StringBuilder stringContainers = new StringBuilder();
+                        stringContainers.AppendLine("以下料箱有未完成的出库任务:");
+                        removeTaskManualList.ForEach(x => stringContainers.AppendLine($"料箱号{x.containerNo}\n"));
+                        stringContainers.AppendLine("是否删除任务继续出库?");
+                        MessageBoxResult isContinueCreateResult = HandyControl.Controls.MessageBox.Show(stringContainers.ToString(), "提示", MessageBoxButton.YesNo);
+                        if (isContinueCreateResult == MessageBoxResult.Yes)
+                        {
+                            dbContext.RemoveRange(removeTaskManualList);
+                        }
+                        else
+                        {
+                            return;
+                        }
+                    }
+
+
                     #endregion
 
 
@@ -3962,9 +3983,9 @@ namespace Khd.Core.Wpf.Form
                             fromFloorNo = 5,
                             useFlag = 1
                         });
-                        item.ContainerStatus = "2";
-                        item.locationStatus = "6";
-                        dbContext.Update(item);
+                       // item.ContainerStatus = "2";
+                        //item.locationStatus = "6";
+                    //    dbContext.Update(item);
                     }
                     if (addList.Count < 6)
                     {