Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer
This commit is contained in:
sc committed
commit
7a1dc7b9e0
12 files changed
+154
-28
No files matched your search
@@ -50,8 +50,6 @@
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</DataGrid.CellStyle>
|
||||
|
||||
|
||||
<DataGrid.Columns>
|
||||
<!--列信息绑定-->
|
||||
<DataGridTextColumn Header="ProcessID" Binding="{Binding ProgramID}" Width="0" MinWidth="0" MaxWidth="0"/>
|
||||
|
||||
@@ -59,7 +59,6 @@ namespace DyeingComputer.View
|
||||
if (Programgroup_ID == null) return;
|
||||
|
||||
container.Content = new ProgramstepsView();
|
||||
|
||||
}
|
||||
|
||||
private void ProgramgroupView_new_Click(object sender, RoutedEventArgs e)//新建按钮
|
||||
@@ -167,8 +166,9 @@ namespace DyeingComputer.View
|
||||
Programgroup_ID = null;
|
||||
}
|
||||
|
||||
string Programgroup_Numder = null;
|
||||
string Programgroup_ID = null;
|
||||
public static string Programgroup_Numder { get; set; }
|
||||
public static string Programgroup_ID { get; set; }
|
||||
|
||||
private void Grid_SelectionChanged(object sender, SelectionChangedEventArgs e)//表格选择事件
|
||||
{
|
||||
int rownum = Grid.SelectedIndex;//获取鼠标选中行并定义变量
|
||||
|
||||
+17
-12
@@ -5,16 +5,21 @@
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:local="clr-namespace:DyeingComputer.View"
|
||||
xmlns:lang="clr-namespace:DyeingComputer.Properties"
|
||||
xmlns:ConvertMoels="clr-namespace:DyeingComputer.ConvertMoels"
|
||||
mc:Ignorable="d"
|
||||
d:DesignHeight="630" d:DesignWidth="1280" HorizontalAlignment="Left">
|
||||
<UserControl.Resources>
|
||||
<ConvertMoels:RowToIndexConverter x:Key="RowToIndexConverter"/>
|
||||
</UserControl.Resources>
|
||||
<Grid>
|
||||
<Rectangle Margin="0,0,0,0" Fill="#FFCCCCCC" VerticalAlignment="Top" Height="40"/>
|
||||
<Button Content="{x:Static lang:Resources.edit}" x:Name="ProgramgroupView_edit" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="200,0,0,0" VerticalAlignment="Top" Width="200" Background="White" />
|
||||
<Button Content="{x:Static lang:Resources.New}" x:Name="ProgramgroupView_new" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="0,0,0,0" VerticalAlignment="Top" Width="200" Background="White" />
|
||||
<Button Content="{x:Static lang:Resources.Delete}" x:Name="ProgramgroupView_del" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="800,0,0,0" VerticalAlignment="Top" Width="200" Background="White"/>
|
||||
<Button Content="{x:Static lang:Resources.Rename}" x:Name="ProgramgroupView_Rename" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="400,0,0,0" VerticalAlignment="Top" Width="200" Background="White" />
|
||||
<Button Content="{x:Static lang:Resources.Remark}" x:Name="ProgramgroupView_Remark" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="600,0,0,0" VerticalAlignment="Top" Width="200" Background="White" />
|
||||
|
||||
<Button Content="{x:Static lang:Resources.edit}" x:Name="ProgramgroupView_edit" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="0,0,0,0" VerticalAlignment="Top" Width="200" Background="White" Click="ProgramgroupView_edit_Click"/>
|
||||
<Button Content="{x:Static lang:Resources.Recover}" x:Name="ProgramgroupView_Recover" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="400,0,0,0" VerticalAlignment="Top" Width="200" Background="White" Click="ProgramgroupView_Recover_Click"/>
|
||||
<Button Content="{x:Static lang:Resources.Delete}" x:Name="ProgramgroupView_del" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="800,0,0,0" VerticalAlignment="Top" Width="200" Background="White" Click="ProgramgroupView_del_Click"/>
|
||||
<Button Content="{x:Static lang:Resources.Insert}" x:Name="ProgramgroupView_Insert" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="200,0,0,0" VerticalAlignment="Top" Width="200" Background="White" Click="ProgramgroupView_Insert_Click"/>
|
||||
<Button Content="{x:Static lang:Resources.Save}" x:Name="ProgramgroupView_Save" FontSize="20" HorizontalAlignment="Left" Height="40" Margin="600,0,0,0" VerticalAlignment="Top" Width="200" Background="White" Click="ProgramgroupView_Save_Click"/>
|
||||
<TextBlock x:Name="p_title" FontSize="20" VerticalAlignment="Top" Height="40" Margin="1000,0,0,0" />
|
||||
|
||||
<DataGrid x:Name="Grid" AlternationCount="2" IsReadOnly="True" SelectionChanged="Grid_SelectionChanged"
|
||||
Margin="0,40,0,0" d:ItemsSource="{d:SampleData ItemCount=20}" AutoGenerateColumns="False" MinColumnWidth="30"
|
||||
HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC"
|
||||
@@ -51,14 +56,14 @@
|
||||
</Style>
|
||||
</DataGrid.CellStyle>
|
||||
|
||||
|
||||
<DataGrid.Columns>
|
||||
<!--列信息绑定-->
|
||||
<DataGridTextColumn Header="{x:Static lang:Resources.Step}" Width="60" Binding="{Binding ProgramName}" IsReadOnly="True"/>
|
||||
<DataGridTextColumn Header="{x:Static lang:Resources.Code}" Width="100" Binding="{Binding Step}" IsReadOnly="True"/>
|
||||
<DataGridTextColumn Header="{x:Static lang:Resources.Directives}" Width="200" Binding="{Binding Time}" IsReadOnly="True"/>
|
||||
<DataGridTextColumn Header="{x:Static lang:Resources.ParameterSet}" Width="*" Binding="{Binding Notes}" IsReadOnly="True"/>
|
||||
<DataGridTextColumn Header="{x:Static lang:Resources.Remark}" Width="*" Binding="{Binding Notes}" IsReadOnly="True"/>
|
||||
<DataGridTextColumn Header="ProcessID" Binding="{Binding ProgramID}" Width="0" MinWidth="0" MaxWidth="0"/>
|
||||
<DataGridTextColumn Header="ProcessID" Binding="{Binding Program}" Width="0" MinWidth="0" MaxWidth="0"/>
|
||||
<DataGridTextColumn Header="{x:Static lang:Resources.Step}" Binding="{Binding RelativeSource={RelativeSource AncestorType=DataGridRow}, Converter={StaticResource RowToIndexConverter}}" Width="60" IsReadOnly="True"/>
|
||||
<DataGridTextColumn Header="{x:Static lang:Resources.Code}" Width="100" Binding="{Binding StepID}" IsReadOnly="True"/>
|
||||
<DataGridTextColumn Header="{x:Static lang:Resources.Directives}" Width="300" Binding="{Binding StepName}" IsReadOnly="True"/>
|
||||
<DataGridTextColumn Header="{x:Static lang:Resources.ParameterSet}" Width="*" Binding="{Binding ParameterName}" IsReadOnly="True"/>
|
||||
</DataGrid.Columns>
|
||||
</DataGrid>
|
||||
|
||||
|
||||
@@ -30,6 +30,11 @@ namespace DyeingComputer.View
|
||||
public ProgramstepsView()
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
ProgramID = ProgramgroupView.Programgroup_ID;
|
||||
ProgramNAME = ProgramgroupView.Programgroup_Numder;
|
||||
this.p_title.Text = ProgramNAME;
|
||||
|
||||
Programgroup_sql();
|
||||
}
|
||||
|
||||
@@ -37,16 +42,19 @@ namespace DyeingComputer.View
|
||||
private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径
|
||||
DataSet sql; //内存数据缓存
|
||||
|
||||
string ProgramID;
|
||||
string ProgramNAME;
|
||||
|
||||
public void Programgroup_sql()
|
||||
{
|
||||
SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
|
||||
SQLiteHelpers.Open(); //打开数据库
|
||||
|
||||
string sql_script = "select * from ProgramName order by ProgramID desc";
|
||||
string sql_script = "select * from ProgramSteps where ProgramID='"+ ProgramID + "' order by Step desc";
|
||||
|
||||
if (sql != null) sql.Clear(); //清空缓存
|
||||
sql = SQLiteHelpers.ExecuteDataSet(sql_script, null); //读取计划表写入缓存
|
||||
// if (sql != null) Grid.ItemsSource = sql.Tables[0].DefaultView; //转换显示计划表
|
||||
if (sql != null) Grid.ItemsSource = sql.Tables[0].DefaultView; //转换显示计划表
|
||||
|
||||
SQLiteHelpers.Close(); //关闭连接
|
||||
|
||||
@@ -54,16 +62,37 @@ namespace DyeingComputer.View
|
||||
//System.GC.Collect();
|
||||
}
|
||||
|
||||
string Programgroup_Numder = null;
|
||||
string Programgroup_ID = null;
|
||||
string Numder = null;
|
||||
string ID = null;
|
||||
private void Grid_SelectionChanged(object sender, SelectionChangedEventArgs e)//表格选择事件
|
||||
{
|
||||
int rownum = Grid.SelectedIndex;//获取鼠标选中行并定义变量
|
||||
if (rownum != -1)//判断鼠标定位是否有效
|
||||
{
|
||||
Programgroup_ID = (Grid.Columns[0].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第0列，
|
||||
Programgroup_Numder = (Grid.Columns[1].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第1列，
|
||||
ID = (Grid.Columns[0].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第0列，
|
||||
Numder = (Grid.Columns[1].GetCellContent(Grid.Items[rownum]) as TextBlock).Text;//定位第1列，
|
||||
}
|
||||
}
|
||||
|
||||
private void ProgramgroupView_edit_Click(object sender, RoutedEventArgs e)//
|
||||
{
|
||||
|
||||
}
|
||||
private void ProgramgroupView_Recover_Click(object sender, RoutedEventArgs e)//
|
||||
{
|
||||
|
||||
}
|
||||
private void ProgramgroupView_del_Click(object sender, RoutedEventArgs e)//
|
||||
{
|
||||
|
||||
}
|
||||
private void ProgramgroupView_Insert_Click(object sender, RoutedEventArgs e)//
|
||||
{
|
||||
|
||||
}
|
||||
private void ProgramgroupView_Save_Click(object sender, RoutedEventArgs e)//
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -62,7 +62,6 @@
|
||||
<DataGrid.Columns>
|
||||
<!--列信息绑定-->
|
||||
<DataGridTextColumn Header="{x:Static lang:Resources.WorkOrderNumder}" Width="200" Binding="{Binding WorkOrder}" IsReadOnly="True">
|
||||
<!--事件名称：工作状态数字转文字显示，转换器StatenConvert-->
|
||||
<DataGridTextColumn.ElementStyle>
|
||||
<Style TargetType="{x:Type TextBlock}">
|
||||
<Setter Property="Foreground" Value="{Binding Path=lock,Converter={StaticResource GramsSQLConvert}}"/>
|
||||
@@ -71,10 +70,9 @@
|
||||
</DataGridTextColumn>
|
||||
<DataGridTextColumn Header="{x:Static lang:Resources.ProcessName}" Width="200" Binding="{Binding ProcessName}" IsReadOnly="True"/>
|
||||
<DataGridTextColumn Header="ProcessID" Binding="{Binding ProcessID}" Width="0" MinWidth="0" MaxWidth="0"/>
|
||||
<DataGridTextColumn Header="lock" Binding="{Binding lock}" Width="0" MinWidth="0" MaxWidth="0"/>
|
||||
<DataGridTextColumn Header="{x:Static lang:Resources.State}" Width="90" IsReadOnly="True">
|
||||
<!--事件名称：工作状态数字转文字显示，转换器StatenConvert-->
|
||||
<DataGridTextColumn.ElementStyle>
|
||||
<DataGridTextColumn Header="lock" Binding="{Binding lock}" Width="0" MinWidth="0" MaxWidth="0"/>
|
||||
<DataGridTextColumn Header="{x:Static lang:Resources.State}" Width="90" IsReadOnly="True">
|
||||
<DataGridTextColumn.ElementStyle>
|
||||
<Style TargetType="{x:Type TextBlock}">
|
||||
<Setter Property="Text" Value="{Binding Path=State,Converter={StaticResource StatenConvert}}"/>
|
||||
</Style>
|
||||
|
||||
Reference in new issue
Block a user