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

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

Browse Source
This commit is contained in:
sc authored and 忱 沈 committed 2023-11-19 11:23:11 +08:00
2 parents 589a453438 aee1102b44
commit a3c807f02e
3 files changed
+12 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

MainWindow.xaml
+7 -6
View File
@@ -78,7 +78,7 @@
<Button Content="-" HorizontalAlignment="Left" Height="15" Width="20" Margin="385,155,0,0" VerticalAlignment="Top" FontSize="10" <Button Content="-" HorizontalAlignment="Left" Height="15" Width="20" Margin="385,155,0,0" VerticalAlignment="Top" FontSize="10"
Background="#FFF1F1F1" BorderBrush="#FFC5C5C5" Padding="0,0,0,0" Click="Button_dow" IsTabStop="False" Focusable ="False"/> Background="#FFF1F1F1" BorderBrush="#FFC5C5C5" Padding="0,0,0,0" Click="Button_dow" IsTabStop="False" Focusable ="False"/>
<Grid Height="150" Width="405" Margin="5,205,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Background="#FFF7F7F7"> <Grid Height="150" Width="405" Margin="5,210,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Background="#FFF7F7F7">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="254"/> <ColumnDefinition Width="254"/>
<ColumnDefinition Width="151"/> <ColumnDefinition Width="151"/>
@@ -109,7 +109,7 @@
</Grid> </Grid>
<DataGrid x:Name="Grid_RRODUCT" AlternationCount="2" IsReadOnly="False" InitializingNewItem="DataGrid_InitializingNewItem" <DataGrid x:Name="Grid_RRODUCT" AlternationCount="2" IsReadOnly="False" InitializingNewItem="DataGrid_InitializingNewItem"
Margin="5,360,5,80" d:ItemsSource="{d:SampleData ItemCount=99}" AutoGenerateColumns="False" MinColumnWidth="30" Margin="5,365,5,80" d:ItemsSource="{d:SampleData ItemCount=99}" AutoGenerateColumns="False" MinColumnWidth="30"
HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC" HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC"
BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2"
CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeRows="False" CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeRows="False"
@@ -154,7 +154,8 @@
<DataGrid.Columns> <DataGrid.Columns>
<!--列信息绑定--> <!--列信息绑定-->
<DataGridTextColumn Header="序列" Width="50" FontSize="15" MaxWidth="50" MinWidth="50" IsReadOnly="True" Binding="{Binding ID}" CellStyle="{StaticResource CellStyle}"/> <DataGridTextColumn Header="序列" Width="50" FontSize="15" MaxWidth="50" MinWidth="50" Binding="{Binding ID}" IsReadOnly="True" CellStyle="{StaticResource CellStyle}"/>
<DataGridTextColumn Header="步骤" Width="50" FontSize="15" MaxWidth="50" MinWidth="50" Binding="{Binding STEP}" IsReadOnly="True" CellStyle="{StaticResource CellStyle}"/>
<DataGridTemplateColumn Header="原料代码" Width="200" MaxWidth="400" MinWidth="100" IsReadOnly="False"> <DataGridTemplateColumn Header="原料代码" Width="200" MaxWidth="400" MinWidth="100" IsReadOnly="False">
<DataGridTemplateColumn.CellTemplate> <DataGridTemplateColumn.CellTemplate>
<DataTemplate> <DataTemplate>
@@ -189,8 +190,8 @@
</DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn> </DataGridTemplateColumn>
<DataGridTextColumn Header="目标重量(g)" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" IsReadOnly="True" Binding="{Binding TARGET_WT}" CellStyle="{StaticResource CellStyle}"/> <DataGridTextColumn Header="目标重量(g)" Width="200" FontSize="15" MaxWidth="400" MinWidth="100" IsReadOnly="True" Binding="{Binding TARGET_WT}" CellStyle="{StaticResource CellStyle}"/>
<DataGridTextColumn Header="单位" Width="80" FontSize="15" MaxWidth="80" MinWidth="80" IsReadOnly="True" Binding="{Binding UNIT}" CellStyle="{StaticResource CellStyle}"/> <DataGridTextColumn Header="单位" Width="80" FontSize="15" MaxWidth="80" MinWidth="80" IsReadOnly="True" Binding="{Binding UNIT}" CellStyle="{StaticResource CellStyle}"/>
<DataGridTextColumn Header="备注" Width="600" FontSize="15" MinWidth="100" Binding="{Binding REMARK}" CellStyle="{StaticResource CellStyle}"/> <DataGridTextColumn Header="备注" Width="600" FontSize="15" MinWidth="600" Binding="{Binding REMARK}" CellStyle="{StaticResource CellStyle}"/>
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>
@@ -199,7 +200,7 @@
<Button Content="保存" HorizontalAlignment="Left" Height="40" Width="80" Margin="15,0,0,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="save" IsTabStop="False" Focusable ="False"/> <Button Content="保存" HorizontalAlignment="Left" Height="40" Width="80" Margin="15,0,0,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="save" IsTabStop="False" Focusable ="False"/>
<Button Content="删除" HorizontalAlignment="Left" Height="40" Width="80" Margin="100,0,0,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="delete" IsTabStop="False" Focusable ="False"/> <Button Content="删除" HorizontalAlignment="Left" Height="40" Width="80" Margin="100,0,0,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="delete" IsTabStop="False" Focusable ="False"/>
<Grid Grid.Column="1" Height="320" Margin="410,35,5,0" VerticalAlignment="Top" Background="#FFF7F7F7"> <Grid Grid.Column="1" Height="325" Margin="410,35,5,0" VerticalAlignment="Top" Background="#FFF7F7F7">
<ContentControl x:Name="Deputy"/> <ContentControl x:Name="Deputy"/>
</Grid> </Grid>
Windows/Machine.xaml.cs
+3 -1
View File
@@ -195,7 +195,8 @@ namespace formula_manage.Windows
} }
else else
{ {
GridSql(); GridSql();
System.Windows.MessageBox.Show("添加完成");//
} }
} }
else else
@@ -213,6 +214,7 @@ namespace formula_manage.Windows
else else
{ {
GridSql(); GridSql();
System.Windows.MessageBox.Show("修改完成");//
} }
} }
} }
Windows/Stuff.xaml.cs
+2
View File
@@ -265,6 +265,7 @@ namespace formula_manage.Windows
else if (Button_ID == 2) GridSql(2); else if (Button_ID == 2) GridSql(2);
else if (Button_ID == 3) GridSql(3); else if (Button_ID == 3) GridSql(3);
else if (Button_ID == 4) GridSql(4); else if (Button_ID == 4) GridSql(4);
System.Windows.MessageBox.Show("添加完成");
} }
} }
else else
@@ -291,6 +292,7 @@ namespace formula_manage.Windows
else if (Button_ID == 2) GridSql(2); else if (Button_ID == 2) GridSql(2);
else if (Button_ID == 3) GridSql(3); else if (Button_ID == 3) GridSql(3);
else if (Button_ID == 4) GridSql(4); else if (Button_ID == 4) GridSql(4);
System.Windows.MessageBox.Show("修改完成");
} }
} }
} }