sc/SunlightCentralizedControlManagement
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
sc committed 2025-02-28 22:07:51 +08:00
2 parents 66cccfddcd 64c2403a32
commit 7d93249975
2 files changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

View/ProductionPlanningView.xaml.cs
+3 -3
View File
@@ -71,8 +71,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
maxDate = minDate.AddDays(1); maxDate = minDate.AddDays(1);
//添加表右键功能 //添加表右键功能
ganttTaskContextMenuItems.Add(new ContextMenuItem(ViewClicked, Properties.Resources.View + "...")); ganttTaskContextMenuItems.Add(new ContextMenuItem(ViewClicked, Properties.Resources.View + "..."));
ganttTaskContextMenuItems.Add(new ContextMenuItem(AdvanceClicked, Properties.Resources.Advance + "...")); ganttTaskContextMenuItems.Add(new ContextMenuItem(DelayedClicked, Properties.Resources.State + "..."));
ganttTaskContextMenuItems.Add(new ContextMenuItem(DelayedClicked, Properties.Resources.Delayed + "..."));
ganttTaskContextMenuItems.Add(new ContextMenuItem(EditClicked, Properties.Resources.edit + "...")); ganttTaskContextMenuItems.Add(new ContextMenuItem(EditClicked, Properties.Resources.edit + "..."));
ganttTaskContextMenuItems.Add(new ContextMenuItem(DeleteClicked, Properties.Resources.Delete + "...")); ganttTaskContextMenuItems.Add(new ContextMenuItem(DeleteClicked, Properties.Resources.Delete + "..."));
GanttChart.GanttTaskContextMenuItems = ganttTaskContextMenuItems; GanttChart.GanttTaskContextMenuItems = ganttTaskContextMenuItems;
@@ -160,7 +159,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
} }
else 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.Content = null;
Picture.Width = 600; Picture.Width = 600;
WindowsView/MachineSelection.xaml.cs
+1 -1
View File
@@ -83,7 +83,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.WindowsView
{ {
if((bool)checkBoxes[i].IsChecked) MACHINEDATA= MACHINEDATA+"+"+ checkBoxes[i].Content; 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(); //关闭窗口 this.Close(); //关闭窗口
} }
private void Button_Quit(object sender, RoutedEventArgs e)//退出 private void Button_Quit(object sender, RoutedEventArgs e)//退出