Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage
This commit is contained in:
commit
5e93a8c7d5
2 files changed
+6
-6
No files matched your search
+5
-5
@@ -37,18 +37,18 @@
|
||||
<MenuItem Header="_历史查询" FontSize="16"/>
|
||||
<MenuItem Header="_统计" FontSize="16"/>
|
||||
</MenuItem>
|
||||
|
||||
</Menu>
|
||||
|
||||
<Button Content="新工单" HorizontalAlignment="Left" Margin="335,35,0,0" Height="30" VerticalAlignment="Top" Width="70" Background="#FFF9F9F9" FontSize="20" Click="Button_Click"/>
|
||||
<Button Content="预设工艺" HorizontalAlignment="Left" Margin="300,70,0,0" Height="30" VerticalAlignment="Top" Width="105" Background="#FFF9F9F9" FontSize="20" Click="Button_Click1"/>
|
||||
|
||||
<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="205,105,0,0" TextWrapping="Wrap" Text="总步数:" VerticalAlignment="Top" Width="90" 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 HorizontalAlignment="Left" Height="30" Margin="300,35,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="30" FontSize="20" MaxLines="1" MaxLength="2"/>
|
||||
<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"/>
|
||||
<TextBox HorizontalAlignment="Left" Height="30" Margin="95,70,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="200" FontSize="20"/>
|
||||
<TextBox HorizontalAlignment="Left" Height="30" Margin="95,105,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="200" FontSize="20"/>
|
||||
<ComboBox x:Name="Machine" HorizontalAlignment="Left" Height="30" Margin="95,105,0,0" Text="" VerticalAlignment="Top" Width="100" FontSize="20" IsEditable="True"/>
|
||||
<TextBox HorizontalAlignment="Left" Height="30" Margin="300,105,0,0" TextWrapping="Wrap" Text="1" VerticalAlignment="Top" Width="100" FontSize="20" MaxLines="1" MaxLength="3"/>
|
||||
|
||||
<DataGrid x:Name="Selectio" AlternationCount="2" IsReadOnly="False"
|
||||
Margin="5,300,5,100" d:ItemsSource="{d:SampleData ItemCount=200}" AutoGenerateColumns="False" MinColumnWidth="30"
|
||||
|
||||
@@ -185,7 +185,7 @@
|
||||
<Resource Include="Windows\sunlight_logo.jpg" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="UserControl\" />
|
||||
<Folder Include="UserControls\" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
</Project>
|
||||
Reference in new issue
Block a user