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 committed 2023-11-17 00:09:31 +08:00
2 parents 5bad675f46 5ac90e6e7f
commit 8c922d5cc0
2 files changed
+6 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

MainWindow.xaml
+3 -4
View File
@@ -60,7 +60,7 @@
<TextBlock HorizontalAlignment="Left" Height="35" Margin="5,175,0,0" TextWrapping="Wrap" Text="类型:" VerticalAlignment="Top" Width="90" FontSize="20"/>
<TextBlock HorizontalAlignment="Left" Height="35" Margin="230,140,0,0" TextWrapping="Wrap" Text="总步数:" VerticalAlignment="Top" Width="70" FontSize="20"/>
<TextBlock HorizontalAlignment="Left" Height="35" Margin="230,175,0,0" TextWrapping="Wrap" Text="表单:" VerticalAlignment="Top" Width="70" FontSize="20"/>
<ComboBox x:Name="Forms_" DisplayMemberPath="Name" HorizontalAlignment="Left" Height="30" Margin="300,175,0,0" VerticalAlignment="Top" Width="105" FontSize="20" IsTabStop="True"/>
<ComboBox x:Name="Forms_" HorizontalAlignment="Left" Height="30" Margin="300,175,0,0" VerticalAlignment="Top" Width="105" FontSize="20" IsTabStop="True"/>
<TextBox x:Name="Number" HorizontalAlignment="Left" Height="30" Margin="95,35,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="200" FontSize="20" KeyUp="SearchBox_OnKeyDownd"/>
<TextBox HorizontalAlignment="Left" Height="30" Margin="95,70,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="200" FontSize="20" KeyUp="SearchBox_OnKeyDownd" IsTabStop="False"/>
<TextBox x:Name="Anew" HorizontalAlignment="Left" Height="30" Margin="300,35,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="30" FontSize="20"
@@ -158,8 +158,8 @@
<DataGridTemplateColumn Header="原料代码" Width="200" MaxWidth="400" MinWidth="100" IsReadOnly="False">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<ComboBox x:Name="CP_PRODUCT_CODE" BorderThickness="0,0,0,0" ItemsSource="{Binding Path=STUFFdataTable}" DisplayMemberPath="{Binding ProductCode}" BorderBrush="{x:Null}" Background="{x:Null}" IsEditable="True" KeyDown="CP_PRODUCT_CODE_KeyUp"
>
<ComboBox x:Name="CP_PRODUCT_CODE" BorderThickness="0,0,0,0" ItemsSource="{Binding Path=RRODUCTdataTable}" DisplayMemberPath="{Binding ProductCode}" BorderBrush="{x:Null}" Background="{x:Null}" IsEditable="True" KeyDown="CP_PRODUCT_CODE_KeyUp"
SelectedItem="{Binding Path=G_TypeNameDicNoStr}" >
</ComboBox>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
@@ -171,7 +171,6 @@
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTemplateColumn Header="计算单位" Width="80" MaxWidth="80" MinWidth="80" CellStyle="{StaticResource CellStyle}">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
MainWindow.xaml.cs
+3 -2
View File
@@ -12,6 +12,7 @@ using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Forms;
@@ -94,6 +95,7 @@ namespace formula_manage
row["ID"] = ID_N;
row["STEP"] = Procedures_P.Text;
RRODUCTdataTable.Rows.Add(row);
for (ID_N = 2; ID_N <= 64; ID_N++)
{
row = RRODUCTdataTable.NewRow();
@@ -101,9 +103,8 @@ namespace formula_manage
row["STEP"] = Procedures_P.Text;
RRODUCTdataTable.Rows.Add(row);
}
// DetailedGrid.DataContext = dataTable;
Grid_RRODUCT.ItemsSource = RRODUCTdataTable.DefaultView;
}
private async void sql_()