。

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);
+                        //await _taskExecutionPlanInfoServices.PlanMoveDown(objId.ToString(), stationCode);
-                        MessageBox.Show($"暂停计划成功,任务号：[{SelectedCells.TaskCode}]");
+                        MessageBox.Show($"下发计划成功,任务号：[{SelectedCells.TaskCode}]");
                         await LoadData();
                     }
                 }

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 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 ManualCommand}" Width="100" Height="30" Background="OrangeRed" Margin="380 0 0 0"  />
                         </WrapPanel>
                     </StackPanel>
                     

Aucma.Core.SheetMetalTasks/AucamSheetMetalTaskService.cs

@@ -329,7 +329,6 @@ namespace Aucma.Core.SheetMetalTasks
 
                     //读取设备进度，完成后再次下发新任务
                     ReadDeviceComplate_SidePanel(obj_sidePanel);
-
                 }
                 // });
             }