diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index 7886d39..50d06df 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -591,6 +591,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties { } } + /// + /// 查找类似 Does Not Exist 的本地化字符串。 + /// + public static string DoesNotExist { + get { + return ResourceManager.GetString("DoesNotExist", resourceCulture); + } + } + /// /// 查找类似 Drainage 的本地化字符串。 /// diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx index fa18c67..f559a3a 100644 --- a/Properties/Resources.en-US.resx +++ b/Properties/Resources.en-US.resx @@ -939,4 +939,7 @@ Color + + Does Not Exist + \ No newline at end of file diff --git a/Properties/Resources.resx b/Properties/Resources.resx index 2436b6a..80461b7 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -939,4 +939,7 @@ Color + + Does Not Exist + \ No newline at end of file diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx index 8fb671d..1b79e23 100644 --- a/Properties/Resources.zh-CN.resx +++ b/Properties/Resources.zh-CN.resx @@ -939,4 +939,7 @@ 颜色 + + 不存在 + \ No newline at end of file diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx index 2db90e9..5aec2c6 100644 --- a/Properties/Resources.zh-TW.resx +++ b/Properties/Resources.zh-TW.resx @@ -936,4 +936,10 @@ 多机 + + 顏色 + + + 頁面不存在 + \ No newline at end of file diff --git a/SunlightCentralizedControlManagement_SCCM_.csproj b/SunlightCentralizedControlManagement_SCCM_.csproj index 50e7684..50e4163 100644 --- a/SunlightCentralizedControlManagement_SCCM_.csproj +++ b/SunlightCentralizedControlManagement_SCCM_.csproj @@ -175,6 +175,9 @@ MachineSelection.xaml + + SchedulingTime.xaml + ViewStep.xaml @@ -264,6 +267,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + MSBuild:Compile Designer diff --git a/View/ProductionPlanningEdit.xaml.cs b/View/ProductionPlanningEdit.xaml.cs index 431eb25..a1602ba 100644 --- a/View/ProductionPlanningEdit.xaml.cs +++ b/View/ProductionPlanningEdit.xaml.cs @@ -37,6 +37,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View DataTable ProgramName = new DataTable(); DataTable WorkOrder =new DataTable(); DataTable dat = new DataTable(); + public string WorkOrder_n; public ProductionPlanningEdit(string workOrder, bool save) { InitializeComponent(); @@ -45,7 +46,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View ProgramName = SQLiteHelpers.ExecuteDataSet("select * from ProgramName order by ProgramID desc", null).Tables[0]; //读取计划表写入缓存 if (!string.IsNullOrEmpty(workOrder)) { - WorkOrder = SQLiteHelpers.ExecuteDataSet("select * from Workorder order by EndTime desc", null).Tables[0]; + WorkOrder = SQLiteHelpers.ExecuteDataSet("select * from Workorder where Workorder='" + workOrder + "' order by EndTime desc", null).Tables[0]; // dat = SQLiteHelpers.ExecuteDataSet("select * from WorkorderSteps order by Step asc", null).Tables[0]; } SQLiteHelpers.Close(); //关闭连接 @@ -53,6 +54,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View if (!string.IsNullOrEmpty(workOrder)) { //WorkOrder.Select().First().Field("WorkOrder").ToString(); + WorkOrder_n=workOrder; comboBoxMachine.Text = WorkOrder.Select().First().Field("Machines").ToString(); comboBoxProgram.Text = WorkOrder.Select().First().Field("ProgramName").ToString(); comboBoxDyelot.Text = WorkOrder.Select().First().Field("Dyelot").ToString(); @@ -102,7 +104,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View comboBoxDyelot.IsEnabled = false; } - private void Button_Click(object sender, RoutedEventArgs e) + private void Button_Click(object sender, RoutedEventArgs e)//保存按钮 { if (string.IsNullOrEmpty(comboBoxMachine.Text)) { @@ -123,6 +125,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View string sTime; string StartTime_; string WorkOrder_ = comboBoxMachine.Text + "_" + DateTime.Now.ToString("yyMMddHHmmss"); + if (!string.IsNullOrEmpty(WorkOrder_n)) WorkOrder_ = WorkOrder_n; string ProgramName_ = comboBoxProgram.Text; string ProgramID_ =null; for (int j = 0; j < pArray.Length; j++) @@ -215,6 +218,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View string sTime; string StartTime_; string WorkOrder_ = sArray[i] + "_" + DateTime.Now.ToString("yyMMddHHmmss")+i; + if (!string.IsNullOrEmpty(WorkOrder_n)) WorkOrder_ = WorkOrder_n; string ProgramName_ = comboBoxProgram.Text; string ProgramID_ = null; for (int j = 0; j < pArray.Length; j++) @@ -355,16 +359,20 @@ namespace SunlightCentralizedControlManagement_SCCM_.View { dat.Rows.Add(drT.ItemArray); } - //dat = temp.Copy(); - } + }//以工艺名组合工艺细节 + if (!string.IsNullOrEmpty(WorkOrder_n)) + { + dat = SQLiteHelpers.ExecuteDataSet( + "select * from WorkorderSteps where WorkOrder='" + WorkOrder_n + "' order by Step asc", null).Tables[0]; //读取计划表写入缓存 + }//插入工单不为空时载入细节信息 SQLiteHelpers.Close(); //关闭连接 DatSteps(dat); - Grid_data.ItemsSource = dat.DefaultView; + Grid_data.ItemsSource = dat.DefaultView;//显示 } catch (Exception) { } } - } + }//工艺修改事件 private void color_color_MouseDoubleClick(object sender, MouseButtonEventArgs e)//颜色 { diff --git a/View/ProductionPlanningView.xaml.cs b/View/ProductionPlanningView.xaml.cs index 05f2008..207fe3a 100644 --- a/View/ProductionPlanningView.xaml.cs +++ b/View/ProductionPlanningView.xaml.cs @@ -72,8 +72,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.View maxDate = minDate.AddDays(1); //添加表右键功能 ganttTaskContextMenuItems.Add(new ContextMenuItem(ViewClicked, Properties.Resources.View + "...")); - ganttTaskContextMenuItems.Add(new ContextMenuItem(ViewClicked, Properties.Resources.Advance + "...")); - ganttTaskContextMenuItems.Add(new ContextMenuItem(ViewClicked, Properties.Resources.Delayed + "...")); + ganttTaskContextMenuItems.Add(new ContextMenuItem(AdvanceClicked, Properties.Resources.Advance + "...")); + ganttTaskContextMenuItems.Add(new ContextMenuItem(DelayedClicked, Properties.Resources.Delayed + "...")); ganttTaskContextMenuItems.Add(new ContextMenuItem(EditClicked, Properties.Resources.edit + "...")); ganttTaskContextMenuItems.Add(new ContextMenuItem(DeleteClicked, Properties.Resources.Delete + "...")); GanttChart.GanttTaskContextMenuItems = ganttTaskContextMenuItems; @@ -138,6 +138,14 @@ namespace SunlightCentralizedControlManagement_SCCM_.View Picture.Content = null; Picture.Width = 600; Picture.Content = new ProductionPlanningEdit(ganttTask.ID,false); + } + private void AdvanceClicked(GanttTask ganttTask) + { + + } + private void DelayedClicked(GanttTask ganttTask) + { + } private void EditClicked(GanttTask ganttTask) { @@ -193,27 +201,43 @@ namespace SunlightCentralizedControlManagement_SCCM_.View } private void WorkOrderNumder_Click(object sender, RoutedEventArgs e) { - Picture.Width = 0; - // Select_WorkOrderNumder.Text; - } + Picture.Content = null; + SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径 + SQLiteHelpers.Open(); //打开数据库 + int con = SQLiteHelpers.ExecuteDataSet( + "select * from WorkOrder where WorkOrder='" + Select_WorkOrderNumder.Text + + "'Order by StartTime", null).Tables[0].Rows.Count; + SQLiteHelpers.Close(); + + if (con > 0) + { + Picture.Content = null; + Picture.Width = 600; + Picture.Content = new ProductionPlanningEdit(Select_WorkOrderNumder.Text, true); + } + else + { + MessageBox.Show(Properties.Resources.WorkOrderNumder+ Select_WorkOrderNumder.Text + Properties.Resources.DoesNotExist); + } + }//搜索并打开 private void ListViewItem_Before(object sender, MouseButtonEventArgs e)//前一天 { - Picture.Width = 0; + Picture.Content = null; Sdatepicker.Text = DateTime.Parse(Sdatepicker.Text).AddDays(-1).ToString("yyyy/MM/dd HH:mm:ss"); } private void ListViewItem_Today(object sender, MouseButtonEventArgs e)//今天 { - Picture.Width = 0; - Sdatepicker.Text = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"); + Picture.Content = null; + Sdatepicker.Text = DateTime.Now.ToString("yyyy/MM/dd"); } private void ListViewItem_DayAfter(object sender, MouseButtonEventArgs e)//后一天 { - Picture.Width = 0; + Picture.Content = null; Sdatepicker.Text = DateTime.Parse(Sdatepicker.Text).AddDays(1).ToString("yyyy/MM/dd HH:mm:ss"); } private void Sdatepicker_SelectedDateChanged(object sender, SelectionChangedEventArgs e)//时间控件 { - Picture.Width = 0; + Picture.Content = null; minDate = DateTime.Parse(sender.ToString()); maxDate = DateTime.Parse(sender.ToString()).AddDays(1); GanttChartNEW(); diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index ff853f6..6aebb24 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -139,7 +139,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel }); WorkOrderSQL.Update("WorkOrder", new Dictionary { { "State", 112 } }, "WorkOrder ='" + WorkOrderstepdata.Select()[k].Field("WorkOrder").ToString() + "'", null); - } //下传工单总览 DataTable WorkOrderdata = WorkOrderSQL.ExecuteDataSet("select * from WorkOrder where State='100'", null).Tables[0]; //读取表写入缓存 @@ -169,7 +168,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel } } WorkOrderSQL.Close(); - } void DisTimer_50MS(object sender, EventArgs e)//Tick_Event周期执行事件50MS { diff --git a/WindowsView/SchedulingTime.xaml b/WindowsView/SchedulingTime.xaml new file mode 100644 index 0000000..861659f --- /dev/null +++ b/WindowsView/SchedulingTime.xaml @@ -0,0 +1,20 @@ + + +