From 2deaecc699de80ac156b8c31767eaebb672ee4b8 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Tue, 20 May 2025 17:14:43 +0800
Subject: [PATCH] =?UTF-8?q?add-wpf=E5=88=A0=E9=99=A4=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=8C=E6=AC=A1=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SlnMesnac.WCS/WCS/CreateTaskByRecord.cs   |  2 ++
 SlnMesnac.WPF/ViewModel/IndexViewModel.cs | 26 +++++++++++++----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/SlnMesnac.WCS/WCS/CreateTaskByRecord.cs b/SlnMesnac.WCS/WCS/CreateTaskByRecord.cs
index de0e9d7..32c5c30 100644
--- a/SlnMesnac.WCS/WCS/CreateTaskByRecord.cs
+++ b/SlnMesnac.WCS/WCS/CreateTaskByRecord.cs
@@ -152,6 +152,7 @@ namespace SlnMesnac.WCS.WCS
                         //2#接驳位色粉派送至色粉存放点任务
                         if (workShop2Plc != null && workShop2Plc.IsConnected)
                         {
+                            _logger.Info("22222=============");
                             bool returnJudgeSignal = workShop2Plc.readBoolByAddress(StaticData.GetPlcAddress("2#料箱运回RFID读取"));
                             int busy2Flag = workShop2Plc.readInt16ByAddress(StaticData.GetPlcAddress("2#线体忙碌状态"));
                             int Amount = workShop2Plc.readInt16ByAddress(StaticData.GetPlcAddress("2#缓存链条线库存数"));
@@ -232,6 +233,7 @@ namespace SlnMesnac.WCS.WCS
 
                         if (workShop2Plc != null && workShop2Plc.IsConnected)
                         {
+                            _logger.Info("11111=============");
                             bool returnJudgeSignal = workShop2Plc.readBoolByAddress(StaticData.GetPlcAddress("2#料箱运进计量室RFID读取"));
                             int busy1Flag = workShop2Plc.readInt16ByAddress(StaticData.GetPlcAddress("1#提升机忙碌状态"));
                             if (returnJudgeSignal && busy1Flag == 0)
diff --git a/SlnMesnac.WPF/ViewModel/IndexViewModel.cs b/SlnMesnac.WPF/ViewModel/IndexViewModel.cs
index a061449..8c7e261 100644
--- a/SlnMesnac.WPF/ViewModel/IndexViewModel.cs
+++ b/SlnMesnac.WPF/ViewModel/IndexViewModel.cs
@@ -41,24 +41,28 @@ namespace SlnMesnac.WPF.ViewModel
         {
             try
             {
-                WcsTask? wcsTask = sqlSugarClient.Queryable<WcsTask>().Where(x => x.Id == id).First();
-                if (wcsTask != null && (wcsTask.TaskType == StaticTaskType.MoveLocationTask || wcsTask.TaskType == StaticTaskType.SupplyEmptyPalletTask || wcsTask.TaskType == StaticTaskType.TransferMaterialBoxTask))
+                var result = MessageBox.Show("是否确认删除计划!", "确认", MessageBoxButton.YesNo);
+                if (result == MessageBoxResult.Yes)
                 {
-                    if (wcsTask.TaskStatus >= 2)
+                    WcsTask? wcsTask = sqlSugarClient.Queryable<WcsTask>().Where(x => x.Id == id).First();
+                    if (wcsTask != null && (wcsTask.TaskType == StaticTaskType.MoveLocationTask || wcsTask.TaskType == StaticTaskType.SupplyEmptyPalletTask || wcsTask.TaskType == StaticTaskType.TransferMaterialBoxTask))
                     {
-                        //举着箱子去异常库位
-                        wcsTask.IsDelete = 2;
+                        if (wcsTask.TaskStatus >= 2)
+                        {
+                            //举着箱子去异常库位
+                            wcsTask.IsDelete = 2;
+                        }
+                        else
+                        { //删除任务
+                            wcsTask.IsDelete = 1;
+                        }
                     }
                     else
-                    { //删除任务
+                    {
                         wcsTask.IsDelete = 1;
                     }
+                    sqlSugarClient.Updateable(wcsTask).ExecuteCommand();
                 }
-                else
-                {
-                    wcsTask.IsDelete = 1;
-                }
-                sqlSugarClient.Updateable(wcsTask).ExecuteCommand();
             }
             catch (Exception ex)
             {