Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
This commit is contained in:
commit
e4e9ffa99f
2 files changed
+21
-16
No files matched your search
+16
-13
@@ -42,20 +42,23 @@
|
||||
</MenuItem>
|
||||
</Menu>
|
||||
<Button Content="新工单" HorizontalAlignment="Left" Margin="335,35,0,0" Height="30" VerticalAlignment="Top" Width="70" Background="#FFF9F9F9" FontSize="20" Click="Button_NewOrder" Focusable ="False"/>
|
||||
<Button Content="预设工艺" HorizontalAlignment="Left" Margin="300,70,0,0" Height="30" VerticalAlignment="Top" Width="105" Background="#FFF9F9F9" FontSize="20" Focusable ="False" Click="Button_Technology"/>
|
||||
<TextBlock HorizontalAlignment="Left" Height="35" Margin="5,35,0,0" TextWrapping="Wrap" Text="物料单号:" VerticalAlignment="Top" Width="90" FontSize="20" Background="WhiteSmoke"/>
|
||||
<TextBlock HorizontalAlignment="Left" Height="35" Margin="5,70,0,0" TextWrapping="Wrap" Text="执行工艺:" VerticalAlignment="Top" Width="90" FontSize="20"/>
|
||||
<TextBlock HorizontalAlignment="Left" Height="35" Margin="5,105,0,0" TextWrapping="Wrap" Text="机台:" VerticalAlignment="Top" Width="90" FontSize="20"/>
|
||||
<TextBlock HorizontalAlignment="Left" Height="35" Margin="230,105,0,0" TextWrapping="Wrap" Text="总步数:" VerticalAlignment="Top" Width="70" FontSize="20"/>
|
||||
<Button Content="归属订单" HorizontalAlignment="Left" Margin="300,70,0,0" Height="30" VerticalAlignment="Top" Width="105" Background="#FFF9F9F9" FontSize="20" Focusable ="False" Click="Button_Technology"/>
|
||||
<Button Content="预设工艺" HorizontalAlignment="Left" Margin="300,105,0,0" Height="30" VerticalAlignment="Top" Width="105" Background="#FFF9F9F9" FontSize="20" Focusable ="False" Click="Button_Technology"/>
|
||||
<TextBlock HorizontalAlignment="Left" Height="35" Margin="5,35,0,0" TextWrapping="Wrap" Text="物料单号:" VerticalAlignment="Top" Width="90" FontSize="20" Background="WhiteSmoke"/>
|
||||
<TextBlock HorizontalAlignment="Left" Height="35" Margin="5,70,0,0" TextWrapping="Wrap" Text="流转单号:" VerticalAlignment="Top" Width="90" FontSize="20"/>
|
||||
<TextBlock HorizontalAlignment="Left" Height="35" Margin="5,105,0,0" TextWrapping="Wrap" Text="执行工艺:" VerticalAlignment="Top" Width="90" FontSize="20"/>
|
||||
<TextBlock HorizontalAlignment="Left" Height="35" Margin="5,140,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"/>
|
||||
<TextBox x:Name="Number" HorizontalAlignment="Left" Height="30" Margin="95,35,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="200" FontSize="20"/>
|
||||
<TextBox x:Name="Anew" HorizontalAlignment="Left" Height="30" Margin="300,35,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="30" FontSize="20" MaxLines="1" MaxLength="2" PreviewTextInput="Tb_KeyPress" InputMethod.IsInputMethodEnabled="False" Focusable ="False"/>
|
||||
<TextBox HorizontalAlignment="Left" Height="30" Margin="95,70,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="200" FontSize="20" Focusable ="False"/>
|
||||
<ComboBox x:Name="Machine" HorizontalAlignment="Left" Height="30" Margin="95,105,0,0" Text="" VerticalAlignment="Top" Width="130" FontSize="20" IsEditable="True"/>
|
||||
<TextBox x:Name="Procedures_N" HorizontalAlignment="Left" Height="30" Margin="305,105,0,0" TextWrapping="Wrap" Text="1" VerticalAlignment="Top" Width="80" FontSize="20" MaxLines="1" MaxLength="3" PreviewTextInput="Tb_KeyPress" InputMethod.IsInputMethodEnabled="False"/>
|
||||
<Button Content="+" HorizontalAlignment="Left" Height="15" Width="20" Margin="385,105,0,0" VerticalAlignment="Top" FontSize="10" Background="#FFF1F1F1" BorderBrush="#FFC5C5C5" Padding="0,0,0,0" Click="Button_up" IsTabStop="False" Focusable ="False"/>
|
||||
<Button Content="-" HorizontalAlignment="Left" Height="15" Width="20" Margin="385,120,0,0" VerticalAlignment="Top" FontSize="10" Background="#FFF1F1F1" BorderBrush="#FFC5C5C5" Padding="0,0,0,0" Click="Button_dow" IsTabStop="False" Focusable ="False"/>
|
||||
<TextBox x:Name="Anew" HorizontalAlignment="Left" Height="30" Margin="300,35,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="30" FontSize="20" MaxLines="1" MaxLength="2" PreviewTextInput="Tb_KeyPress" InputMethod.IsInputMethodEnabled="False" Focusable ="False"/>
|
||||
<TextBox HorizontalAlignment="Left" Height="30" Margin="95,105,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="200" FontSize="20" Focusable ="False"/>
|
||||
<ComboBox x:Name="Machine" HorizontalAlignment="Left" Height="30" Margin="95,140,0,0" Text="" VerticalAlignment="Top" Width="130" FontSize="20" IsEditable="True"/>
|
||||
<TextBox x:Name="Procedures_N" HorizontalAlignment="Left" Height="30" Margin="305,140,0,0" TextWrapping="Wrap" Text="1" VerticalAlignment="Top" Width="80" FontSize="20" MaxLines="1" MaxLength="3" PreviewTextInput="Tb_KeyPress" InputMethod.IsInputMethodEnabled="False"/>
|
||||
<Button Content="+" HorizontalAlignment="Left" Height="15" Width="20" Margin="385,140,0,0" VerticalAlignment="Top" FontSize="10" Background="#FFF1F1F1" BorderBrush="#FFC5C5C5" Padding="0,0,0,0" Click="Button_up" IsTabStop="False" Focusable ="False"/>
|
||||
<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"/>
|
||||
|
||||
<Grid Height="150" Width="405" Margin="5,140,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Background="#FFF7F7F7">
|
||||
<Grid Height="150" Width="405" Margin="5,170,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Background="#FFF7F7F7">
|
||||
<Button Content="..." HorizontalAlignment="Left" Margin="370,40,0,0" Height="30" VerticalAlignment="Top" Width="30" Background="#FFF9F9F9" FontSize="20" Focusable ="False" Click="Button_Formula"/>
|
||||
<TextBlock HorizontalAlignment="Left" Height="35" Margin="0,5,0,0" TextWrapping="Wrap" Text="步序:" VerticalAlignment="Top" Width="70" FontSize="20"/>
|
||||
<TextBox x:Name="Procedures_P" HorizontalAlignment="Left" Height="30" Margin="90,5,0,0" TextWrapping="Wrap" Text="1" VerticalAlignment="Top" Width="50" FontSize="20" MaxLines="1" MaxLength="3" PreviewTextInput="Tb_KeyPress" InputMethod.IsInputMethodEnabled="False"/>
|
||||
@@ -77,7 +80,7 @@
|
||||
</Grid>
|
||||
|
||||
<DataGrid x:Name="DetailedGrid" AlternationCount="2" IsReadOnly="False" InitializingNewItem="DataGrid_InitializingNewItem"
|
||||
Margin="5,300,5,100" d:ItemsSource="{d:SampleData ItemCount=90}" AutoGenerateColumns="False" MinColumnWidth="30"
|
||||
Margin="5,330,5,100" d:ItemsSource="{d:SampleData ItemCount=90}" AutoGenerateColumns="False" MinColumnWidth="30"
|
||||
HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="#CCCCCC"
|
||||
BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2"
|
||||
CanUserDeleteRows="True" CanUserSortColumns="False" LoadingRow="DataGrid_LoadingRow"
|
||||
@@ -136,7 +139,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="100,0,0,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="delete" IsTabStop="False" Focusable ="False"/>
|
||||
|
||||
<Grid Grid.Column="1" Height="255" Margin="410,35,5,0" VerticalAlignment="Top" Background="#FFF7F7F7">
|
||||
<Grid Grid.Column="1" Height="285" Margin="410,35,5,0" VerticalAlignment="Top" Background="#FFF7F7F7">
|
||||
<ContentControl x:Name="Deputy"/>
|
||||
</Grid>
|
||||
|
||||
|
||||
+5
-3
@@ -31,13 +31,15 @@ namespace formula_manage
|
||||
public string INIPath = Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "formula.ini";
|
||||
|
||||
string Prepose; //料单前置
|
||||
string PreposeT; //料单时间
|
||||
|
||||
private void Window_MIN(object sender, RoutedEventArgs e)
|
||||
{
|
||||
|
||||
UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);
|
||||
Prepose = Configini.IniReadvalue("SOFTWARE_SET", "L3"); //自定义料单前缀
|
||||
Number.Text = Prepose + System.DateTime.Now.ToString("yyyyMMddHHmmss"); //生成料单号
|
||||
Prepose = Configini.IniReadvalue("SOFTWARE_SET", "T1"); //自定义料单前缀
|
||||
PreposeT = Configini.IniReadvalue("SOFTWARE_SET", "T2"); //自定义料单时间
|
||||
Number.Text = Prepose + System.DateTime.Now.ToString(PreposeT); //生成料单号
|
||||
|
||||
}
|
||||
|
||||
@@ -113,7 +115,7 @@ namespace formula_manage
|
||||
|
||||
private void Button_NewOrder(object sender, RoutedEventArgs e)
|
||||
{
|
||||
Number.Text = Prepose + System.DateTime.Now.ToString("yyyyMMddHHmmss"); ;
|
||||
Number.Text = Prepose + System.DateTime.Now.ToString(PreposeT);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user