Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightCentralizedControlManagement

View/ProductionPlanningView.xaml.cs

@@ -71,8 +71,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
             maxDate = minDate.AddDays(1);
             //添加表右键功能
             ganttTaskContextMenuItems.Add(new ContextMenuItem(ViewClicked, Properties.Resources.View + "..."));
-            ganttTaskContextMenuItems.Add(new ContextMenuItem(AdvanceClicked, Properties.Resources.Advance + "..."));
-            ganttTaskContextMenuItems.Add(new ContextMenuItem(DelayedClicked, Properties.Resources.Delayed + "..."));
+            ganttTaskContextMenuItems.Add(new ContextMenuItem(DelayedClicked, Properties.Resources.State + "..."));
             ganttTaskContextMenuItems.Add(new ContextMenuItem(EditClicked, Properties.Resources.edit + "...")); 
             ganttTaskContextMenuItems.Add(new ContextMenuItem(DeleteClicked, Properties.Resources.Delete + "...")); 
             GanttChart.GanttTaskContextMenuItems = ganttTaskContextMenuItems;
@@ -160,7 +159,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                 }
                 else
                 {
-                    if (WorkOrder_dt.Select().First().Field<object>("State").ToString() == "101")
+                    string wdt = WorkOrder_dt.Select().First().Field<object>("State").ToString();
+                    if (wdt == "101" || wdt == "100")
                     {
                         Picture.Content = null;
                         Picture.Width = 600;

WindowsView/MachineSelection.xaml.cs

@@ -83,7 +83,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.WindowsView
             {
                 if((bool)checkBoxes[i].IsChecked) MACHINEDATA= MACHINEDATA+"+"+ checkBoxes[i].Content;
             } 
-            AddressUpdated(this, new AddressUpdateEventArgs(MACHINEDATA.Remove(0, 1)));
+            if(!String.IsNullOrEmpty(MACHINEDATA)) AddressUpdated(this, new AddressUpdateEventArgs(MACHINEDATA.Remove(0, 1)));
             this.Close(); //关闭窗口
         }
         private void Button_Quit(object sender, RoutedEventArgs e)//退出