From c12b23a2822744ebd432ce46f17d4554027dd885 Mon Sep 17 00:00:00 2001
From: "liulb@mesnac.com" <haiwei@123>
Date: Sat, 30 Mar 2024 17:56:16 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs   | 9 ++++++---
 Aucma.Core.SheetMetal/Views/IndexPageView.xaml           | 4 ++--
 Aucma.Core.SheetMetalTasks/AucamSheetMetalTaskService.cs | 1 -
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs b/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs
index dae63c3..0ec0be6 100644
--- a/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs
+++ b/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs
@@ -1255,6 +1255,9 @@ namespace Aucma.Core.SheetMetal.ViewModels
                     MessageBox.Show("请选中要执行下发的计划！");
                     return;
                 }
+               
+
+
                 //获取当前计划的id
                 string Id = SelectedCells.ID;
                 if (string.IsNullOrEmpty(Id))
@@ -1266,12 +1269,12 @@ namespace Aucma.Core.SheetMetal.ViewModels
                 var taskExecutionPlanInfo = await _taskExecutionPlanInfoServices.FirstAsync(d => d.ObjId == objId);
                 if (taskExecutionPlanInfo != null)
                 {
-                    taskExecutionPlanInfo.ExecuteStatus = 1;
+                    taskExecutionPlanInfo.ExecuteStatus = 2;
                     bool result = await _taskExecutionPlanInfoServices.UpdateAsync(taskExecutionPlanInfo);
                     if (result)
                     {
-                        await _taskExecutionPlanInfoServices.PlanMoveDown(objId.ToString(), stationCode);
-                        MessageBox.Show($"暂停计划成功,任务号：[{SelectedCells.TaskCode}]");
+                        //await _taskExecutionPlanInfoServices.PlanMoveDown(objId.ToString(), stationCode);
+                        MessageBox.Show($"下发计划成功,任务号：[{SelectedCells.TaskCode}]");
                         await LoadData();
                     }
                 }
diff --git a/Aucma.Core.SheetMetal/Views/IndexPageView.xaml b/Aucma.Core.SheetMetal/Views/IndexPageView.xaml
index c957a05..4a5e0d0 100644
--- a/Aucma.Core.SheetMetal/Views/IndexPageView.xaml
+++ b/Aucma.Core.SheetMetal/Views/IndexPageView.xaml
@@ -295,8 +295,8 @@
                     <StackPanel >
                         <WrapPanel  VerticalAlignment="Center" HorizontalAlignment="Right" >
                             <TextBlock Text="计划列表" FontSize="20" FontWeight="Bold" Foreground="White" />
-                            <Button Content="暂停计划" Command="{Binding StopCommand}" Width="100" Height="30" Background="YellowGreen"  Margin="300 0 0 0"  />
-                            <Button Content="手动下发" Command="{Binding ManualCommand}" Width="100" Height="30" Background="OrangeRed" Margin="10 0 0 0"  />
+                            <!--<Button Content="暂停计划" Command="{Binding StopCommand}" Width="100" Height="30" Background="YellowGreen"  Margin="300 0 0 0"  />-->
+                            <Button Content="手动下发" Command="{Binding ManualCommand}" Width="100" Height="30" Background="OrangeRed" Margin="380 0 0 0"  />
                         </WrapPanel>
                     </StackPanel>
                     
diff --git a/Aucma.Core.SheetMetalTasks/AucamSheetMetalTaskService.cs b/Aucma.Core.SheetMetalTasks/AucamSheetMetalTaskService.cs
index b6c42c5..25676d2 100644
--- a/Aucma.Core.SheetMetalTasks/AucamSheetMetalTaskService.cs
+++ b/Aucma.Core.SheetMetalTasks/AucamSheetMetalTaskService.cs
@@ -329,7 +329,6 @@ namespace Aucma.Core.SheetMetalTasks
 
                     //读取设备进度，完成后再次下发新任务
                     ReadDeviceComplate_SidePanel(obj_sidePanel);
-
                 }
                 // });
             }