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

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

Browse Source
This commit is contained in:
sc committed 2024-08-23 23:13:47 +08:00
2 parents 7e3d1f6a7e 987d3173e5
commit 7a1dc7b9e0
12 files changed
+154 -28
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ConvertMoels/RowToIndexConverter.cs
+32
View File
@@ -0,0 +1,32 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Controls;
using System.Windows.Data;
namespace DyeingComputer.ConvertMoels
{
/// <summary>
/// 序号转换器
/// 获取DataGrid的行号 , 转换为对应的序号
/// </summary>
internal class RowToIndexConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
{
DataGridRow row = value as DataGridRow;
if (row != null)
return row.GetIndex() + 1;
else
return -1;
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
throw new NotImplementedException();
}
}
}
DyeingComputer.csproj
+1
View File
@@ -64,6 +64,7 @@
</ApplicationDefinition>
<Compile Include="ConvertMoels\GramsSQLConvert.cs" />
<Compile Include="ConvertMoels\ProductTypeSQLConvert.cs" />
<Compile Include="ConvertMoels\RowToIndexConverter.cs" />
<Compile Include="ConvertMoels\StatenConvert.cs" />
<Compile Include="Properties\Resources.en-US.Designer.cs">
<AutoGen>True</AutoGen>
Properties/Resources.Designer.cs
Generated
+27
View File
@@ -213,6 +213,15 @@ namespace DyeingComputer.Properties {
}
}
/// <summary>
/// 查找类似 Insert 的本地化字符串。
/// </summary>
public static string Insert {
get {
return ResourceManager.GetString("Insert", resourceCulture);
}
}
/// <summary>
/// 查找类似 LineUp 的本地化字符串。
/// </summary>
@@ -303,6 +312,15 @@ namespace DyeingComputer.Properties {
}
}
/// <summary>
/// 查找类似 Recover 的本地化字符串。
/// </summary>
public static string Recover {
get {
return ResourceManager.GetString("Recover", resourceCulture);
}
}
/// <summary>
/// 查找类似 Redye 的本地化字符串。
/// </summary>
@@ -330,6 +348,15 @@ namespace DyeingComputer.Properties {
}
}
/// <summary>
/// 查找类似 Save 的本地化字符串。
/// </summary>
public static string Save {
get {
return ResourceManager.GetString("Save", resourceCulture);
}
}
/// <summary>
/// 查找类似 StartTime 的本地化字符串。
/// </summary>
Properties/Resources.en-US.resx
+9
View File
@@ -237,4 +237,13 @@
<data name="Code" xml:space="preserve">
<value>Code</value>
</data>
<data name="Recover" xml:space="preserve">
<value>Recover</value>
</data>
<data name="Insert" xml:space="preserve">
<value>Insert</value>
</data>
<data name="Save" xml:space="preserve">
<value>Save</value>
</data>
</root>
Properties/Resources.resx
+9
View File
@@ -237,4 +237,13 @@
<data name="ID" xml:space="preserve">
<value>ID</value>
</data>
<data name="Insert" xml:space="preserve">
<value>Insert</value>
</data>
<data name="Recover" xml:space="preserve">
<value>Recover</value>
</data>
<data name="Save" xml:space="preserve">
<value>Save</value>
</data>
</root>
Properties/Resources.zh-CN.resx
+9
View File
@@ -237,4 +237,13 @@
<data name="Code" xml:space="preserve">
<value>代码</value>
</data>
<data name="Recover" xml:space="preserve">
<value>恢复</value>
</data>
<data name="Insert" xml:space="preserve">
<value>插入</value>
</data>
<data name="Save" xml:space="preserve">
<value>保存</value>
</data>
</root>
Properties/Resources.zh-TW.resx
+9
View File
@@ -237,4 +237,13 @@
<data name="Code" xml:space="preserve">
<value>代碼</value>
</data>
<data name="Recover" xml:space="preserve">
<value>恢復</value>
</data>
<data name="Insert" xml:space="preserve">
<value>插入</value>
</data>
<data name="Save" xml:space="preserve">
<value>儲存</value>
</data>
</root>
View/ProgramgroupView.xaml
-2
View File
@@ -50,8 +50,6 @@
</Style.Triggers>
</Style>
</DataGrid.CellStyle>
<DataGrid.Columns>
<!--列信息绑定-->
<DataGridTextColumn Header="ProcessID" Binding="{Binding ProgramID}" Width="0" MinWidth="0" MaxWidth="0"/>
View/ProgramgroupView.xaml.cs
+3 -3
View File
@@ -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;//获取鼠标选中行并定义变量
View/ProgramstepsView .xaml
+17 -12
View File
@@ -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>
View/ProgramstepsView .xaml.cs
+35 -6
View File
@@ -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)//
{
}
}
}
View/WorkOrderView.xaml
+3 -5
View File
@@ -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>