Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer
This commit is contained in:
commit
5a15a9a056
3 files changed
+125
-10
No files matched your search
@@ -89,7 +89,7 @@
|
||||
<TextBlock x:Name="log" TextWrapping="Wrap" FontSize="25" Background="White"
|
||||
Text="{Binding Sys_log}" />
|
||||
</ScrollViewer>
|
||||
<DataGrid x:Name="Receip" HorizontalAlignment="Left" IsHitTestVisible="False" Visibility="Collapsed"
|
||||
<DataGrid x:Name="Receip" IsHitTestVisible="False" Visibility="Collapsed"
|
||||
AutoGenerateColumns="False" FontSize="15" AlternationCount="2"
|
||||
HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9"
|
||||
ColumnHeaderHeight="40" >
|
||||
@@ -136,7 +136,7 @@
|
||||
<DataGridTextColumn Header="{x:Static lang:Resources.ParameterSet}" Width="*" Binding="{Binding Amount}"/>
|
||||
</DataGrid.Columns>
|
||||
</DataGrid>
|
||||
<DataGrid x:Name="Parameter_set" HorizontalAlignment="Left" Visibility="Collapsed"
|
||||
<DataGrid x:Name="Parameter_set" Visibility="Collapsed"
|
||||
AutoGenerateColumns="False" FontSize="15" AlternationCount="2"
|
||||
HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9"
|
||||
ColumnHeaderHeight="40" >
|
||||
@@ -170,8 +170,8 @@
|
||||
</DataGrid.CellStyle>
|
||||
<DataGrid.Columns>
|
||||
<!--列信息绑定-->
|
||||
<DataGridTextColumn Header="{x:Static lang:Resources.ParameterSet}" Binding="{Binding Name}" Width="200"/>
|
||||
<DataGridTextColumn Header="{x:Static lang:Resources.ParameterSet}" Width="200" Binding="{Binding ParameterSet}"/>
|
||||
<DataGridTextColumn Header="{x:Static lang:Resources.ParameterSet}" Binding="{Binding ParameterSet}" Width="200" IsReadOnly="True"/>
|
||||
<DataGridTextColumn Header="{x:Static lang:Resources.ParameterSet}" Width="200" Binding="{Binding Value}"/>
|
||||
</DataGrid.Columns>
|
||||
</DataGrid>
|
||||
</Grid>
|
||||
|
||||
@@ -67,16 +67,131 @@ namespace DyeingComputer.View
|
||||
// ProgramgroupView_edit.IsEnabled = false;
|
||||
// ProgramgroupView_del.IsEnabled = false;
|
||||
// ProgramgroupView_Insert.IsEnabled = false;
|
||||
tblDatas.Columns.Add("Name", Type.GetType("System.String"));
|
||||
tblDatas.Columns.Add("ParameterSet", Type.GetType("System.String"));
|
||||
tblDatas.Columns.Add("Value", Type.GetType("System.Double"));
|
||||
tblDatas.Columns.Add("ID", Type.GetType("System.String"));
|
||||
|
||||
DataRow newRow;
|
||||
newRow = tblDatas.NewRow();
|
||||
newRow["Name"] = Properties.Resources.PumpSpeed;//
|
||||
newRow["ParameterSet"] = Properties.Resources.PumpSpeed +" (%)";//主泵速度
|
||||
newRow["Value"] = MainWindowViewModel.Selet_dtm("1020");
|
||||
newRow["ID"] = "1020";
|
||||
tblDatas.Rows.Add(newRow);
|
||||
|
||||
newRow = tblDatas.NewRow();
|
||||
newRow["ParameterSet"] = Properties.Resources.Blower + " (%)";//风机速度
|
||||
newRow["Value"] = MainWindowViewModel.Selet_dtm("1021");
|
||||
newRow["ID"] = "1021";
|
||||
tblDatas.Rows.Add(newRow);
|
||||
|
||||
newRow = tblDatas.NewRow();
|
||||
newRow["ParameterSet"] = Properties.Resources.Blower + " (%)";//摆布速度
|
||||
newRow["Value"] = MainWindowViewModel.Selet_dtm("1041");
|
||||
newRow["ID"] = "1041";
|
||||
tblDatas.Rows.Add(newRow);
|
||||
|
||||
newRow = tblDatas.NewRow();
|
||||
newRow["ParameterSet"] = Properties.Resources.ClothWheel + " (M/min)";//布轮速度
|
||||
newRow["Value"] = MainWindowViewModel.Selet_dtm("1021");
|
||||
newRow["ID"] = "1021";
|
||||
tblDatas.Rows.Add(newRow);
|
||||
|
||||
newRow = tblDatas.NewRow();
|
||||
newRow["ParameterSet"] = Properties.Resources.ClothWheel + "1 (M/min)";//提不论速度
|
||||
newRow["Value"] = MainWindowViewModel.Selet_dtm("1025");
|
||||
newRow["ID"] = "1025";
|
||||
tblDatas.Rows.Add(newRow);
|
||||
if (MainWindowViewModel.MT18 >= 2)
|
||||
{
|
||||
newRow = tblDatas.NewRow();
|
||||
newRow["ParameterSet"] = Properties.Resources.ClothWheel + "2 (M/min)";//提不论速度
|
||||
newRow["Value"] = MainWindowViewModel.Selet_dtm("1026");
|
||||
newRow["ID"] = "1026";
|
||||
tblDatas.Rows.Add(newRow);
|
||||
}
|
||||
if (MainWindowViewModel.MT18 >= 3)
|
||||
{
|
||||
newRow = tblDatas.NewRow();
|
||||
newRow["ParameterSet"] = Properties.Resources.ClothWheel + "3 (M/min)";//提不论速度
|
||||
newRow["Value"] = MainWindowViewModel.Selet_dtm("1027");
|
||||
newRow["ID"] = "1027";
|
||||
tblDatas.Rows.Add(newRow);
|
||||
}
|
||||
if (MainWindowViewModel.MT18 >= 4)
|
||||
{
|
||||
newRow = tblDatas.NewRow();
|
||||
newRow["ParameterSet"] = Properties.Resources.ClothWheel + "4 (M/min)";//提不论速度
|
||||
newRow["Value"] = MainWindowViewModel.Selet_dtm("1028");
|
||||
newRow["ID"] = "1026";
|
||||
tblDatas.Rows.Add(newRow);
|
||||
}
|
||||
if (MainWindowViewModel.MT18 >= 5)
|
||||
{
|
||||
newRow = tblDatas.NewRow();
|
||||
newRow["ParameterSet"] = Properties.Resources.ClothWheel + "5 (M/min)";//提不论速度
|
||||
newRow["Value"] = MainWindowViewModel.Selet_dtm("1029");
|
||||
newRow["ID"] = "1026";
|
||||
tblDatas.Rows.Add(newRow);
|
||||
}
|
||||
if (MainWindowViewModel.MT18 >= 6)
|
||||
{
|
||||
newRow = tblDatas.NewRow();
|
||||
newRow["ParameterSet"] = Properties.Resources.ClothWheel + "2 (M/min)";//提不论速度
|
||||
newRow["Value"] = MainWindowViewModel.Selet_dtm("1026");
|
||||
newRow["ID"] = "1026";
|
||||
tblDatas.Rows.Add(newRow);
|
||||
}
|
||||
if (MainWindowViewModel.MT18 >= 7)
|
||||
{
|
||||
newRow = tblDatas.NewRow();
|
||||
newRow["ParameterSet"] = Properties.Resources.ClothWheel + "2 (M/min)";//提不论速度
|
||||
newRow["Value"] = MainWindowViewModel.Selet_dtm("1026");
|
||||
newRow["ID"] = "1026";
|
||||
tblDatas.Rows.Add(newRow);
|
||||
}
|
||||
if (MainWindowViewModel.MT18 >= 8)
|
||||
{
|
||||
newRow = tblDatas.NewRow();
|
||||
newRow["ParameterSet"] = Properties.Resources.ClothWheel + "2 (M/min)";//提不论速度
|
||||
newRow["Value"] = MainWindowViewModel.Selet_dtm("1026");
|
||||
newRow["ID"] = "1026";
|
||||
tblDatas.Rows.Add(newRow);
|
||||
}
|
||||
if (MainWindowViewModel.MT18 >= 9)
|
||||
{
|
||||
newRow = tblDatas.NewRow();
|
||||
newRow["ParameterSet"] = Properties.Resources.ClothWheel + "2 (M/min)";//提不论速度
|
||||
newRow["Value"] = MainWindowViewModel.Selet_dtm("1026");
|
||||
newRow["ID"] = "1026";
|
||||
tblDatas.Rows.Add(newRow);
|
||||
}
|
||||
if (MainWindowViewModel.MT18 >= 10)
|
||||
{
|
||||
newRow = tblDatas.NewRow();
|
||||
newRow["ParameterSet"] = Properties.Resources.ClothWheel + "2 (M/min)";//提不论速度
|
||||
newRow["Value"] = MainWindowViewModel.Selet_dtm("1026");
|
||||
newRow["ID"] = "1026";
|
||||
tblDatas.Rows.Add(newRow);
|
||||
}
|
||||
if (MainWindowViewModel.MT18 >= 11)
|
||||
{
|
||||
newRow = tblDatas.NewRow();
|
||||
newRow["ParameterSet"] = Properties.Resources.ClothWheel + "2 (M/min)";//提不论速度
|
||||
newRow["Value"] = MainWindowViewModel.Selet_dtm("1026");
|
||||
newRow["ID"] = "1026";
|
||||
tblDatas.Rows.Add(newRow);
|
||||
}
|
||||
if (MainWindowViewModel.MT18 >= 12)
|
||||
{
|
||||
newRow = tblDatas.NewRow();
|
||||
newRow["ParameterSet"] = Properties.Resources.ClothWheel + "2 (M/min)";//提不论速度
|
||||
newRow["Value"] = MainWindowViewModel.Selet_dtm("1026");
|
||||
newRow["ID"] = "1026";
|
||||
tblDatas.Rows.Add(newRow);
|
||||
}
|
||||
|
||||
|
||||
Parameter_set.ItemsSource = tblDatas.DefaultView;
|
||||
}
|
||||
DataTable tblDatas = new DataTable("Datas");
|
||||
public static object workName;
|
||||
@@ -301,12 +416,12 @@ namespace DyeingComputer.View
|
||||
private void DyeingMachine_Click(object sender, RoutedEventArgs e)//染色剂
|
||||
{
|
||||
Receip.Visibility = Visibility.Collapsed;
|
||||
// Parameter_Scroll.Visibility = Visibility.Collapsed;
|
||||
Parameter_set.Visibility = Visibility.Collapsed;
|
||||
}
|
||||
private void Receipt_Click(object sender, RoutedEventArgs e)//领料单
|
||||
{
|
||||
Receip.Visibility = Visibility.Visible;
|
||||
// Parameter_Scroll.Visibility = Visibility.Collapsed;
|
||||
Parameter_set.Visibility = Visibility.Collapsed;
|
||||
SQLiteHelpers = new SQLiteHelper(DBAddress); //数据库连接路径
|
||||
SQLiteHelpers.Open(); //打开数据库
|
||||
string sql_script = "select * from Dyelot where WorkOrder = '" + MainWindowViewModel.WorkNumder + "'";
|
||||
@@ -315,7 +430,7 @@ namespace DyeingComputer.View
|
||||
}
|
||||
private void ParameterSet_Click(object sender, RoutedEventArgs e)//参数
|
||||
{
|
||||
// Parameter_Scroll.Visibility = Visibility.Visible;
|
||||
Parameter_set.Visibility = Visibility.Visible;
|
||||
Receip.Visibility = Visibility.Collapsed;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user