baogq
/
JYHB-WCS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add-扫描入库界面加单位

Browse Source
master
liuwf 10 months ago
parent c77d941ad5
commit 9fb9f5266f
4 changed files with 783 additions and 871 deletions
Show Stats Download Patch File Download Diff File

87
src/Khd.Core.Domain/Models/MesBaseUnitInfo.cs
Unescape Escape View File

@ -0,0 +1,87 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Khd.Core.Domain.Models
{
[Table("mes_base_unit_info")]
public class MesBaseUnitInfo
{
/// <summary>
/// 主键标识
/// </summary>
[Key]
[Column("unit_id")]
public long UnitId { get; set; }
/// <summary>
/// 供应商编号;对应FNumber
/// </summary>
[Column("unit_code")]
public string UnitCode { get; set; }
/// <summary>
/// 供应商名称;对应FName
/// </summary>
[Column("unit_name")]
public string UnitName { get; set; }
/// <summary>
/// erp的主键;对应FUnitId
/// </summary>
[Column("erp_id")]
public long? ErpId { get; set; }
/// <summary>
/// 单位状态：1-启用；0-停用
/// </summary>
[Column("unit_status")]
public string UnitStatus { get; set; } = "1";
/// <summary>
/// 备注
/// </summary>
[Column("remark")]
public string Remark { get; set; }
/// <summary>
/// 创建人
/// </summary>
[Column("create_by")]
public string CreateBy { get; set; }
/// <summary>
/// 创建时间;对应FCreateDate
/// </summary>
[Column("create_time")]
public DateTime? CreateTime { get; set; }
/// <summary>
/// 更新人
/// </summary>
[Column("update_by")]
public string UpdateBy { get; set; }
/// <summary>
/// 更新时间
/// </summary>
[Column("update_time")]
public DateTime? UpdateTime { get; set; }
/// <summary>
/// 审核日期;对应FAuditDate
/// </summary>
[Column("audit_date")]
public DateTime? AuditDate { get; set; }
/// <summary>
/// erp最后更新时间;对应FModifyDate
/// </summary>
[Column("erp_modify_date")]
public DateTime? ErpModifyDate { get; set; }
}
}

2
src/Khd.Core.EntityFramework/DefaultDbContext.cs
Unescape Escape View File

@ -95,5 +95,7 @@ namespace Khd.Core.EntityFramework
public DbSet<DmsRecordAlarmInfo> DmsRecordAlarmInfo { get; set; } public DbSet<DmsRecordAlarmInfo> DmsRecordAlarmInfo { get; set; }
public DbSet<DmsRecordAlarmTime> DmsRecordAlarmTime { get; set; } public DbSet<DmsRecordAlarmTime> DmsRecordAlarmTime { get; set; }
public DbSet<MesBaseUnitInfo> MesBaseUnitInfo { get; set; }
} }
} }

148
src/Khd.Core.Wpf/Form/FormBoardT.xaml
Unescape Escape View File

@ -14,15 +14,11 @@
Title="FormBoardT" Title="FormBoardT"
Loaded="FormBoard_Loaded" Loaded="FormBoard_Loaded"
Width="1920" Width="1920"
Height="1080" Height="1080">
>
<Window.Resources> <Window.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<!--<hc:ThemeResources /> <!--<hc:ThemeResources />
<hc:Theme />--> <hc:Theme />-->
@ -34,7 +30,6 @@
<local:EquipConverter x:Key="EquipConverter" /> <local:EquipConverter x:Key="EquipConverter" />
<local:AgvTaskStatusConverter x:Key="AgvTaskStatusConverter" /> <local:AgvTaskStatusConverter x:Key="AgvTaskStatusConverter" />
<Style TargetType="{x:Type ComboBox}"> <Style TargetType="{x:Type ComboBox}">
<Setter Property="Width" Value="120"></Setter> <Setter Property="Width" Value="120"></Setter>
<Setter Property="Template"> <Setter Property="Template">
@ -63,7 +58,6 @@
</DockPanel> </DockPanel>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="IsChecked" Value="True"> <Trigger Property="IsChecked" Value="True">
</Trigger> </Trigger>
</ControlTemplate.Triggers> </ControlTemplate.Triggers>
</ControlTemplate> </ControlTemplate>
@ -380,7 +374,6 @@
<Setter Property="FontSize" Value="14"></Setter> <Setter Property="FontSize" Value="14"></Setter>
</Style> </Style>
<DataTemplate x:Key="LocationTemplate"> <DataTemplate x:Key="LocationTemplate">
<Button Content="{Binding}" Click="LocationButton_Click" Height="50" Margin="0 0 2 2"> <Button Content="{Binding}" Click="LocationButton_Click" Height="50" Margin="0 0 2 2">
<Button.Style> <Button.Style>
@ -394,7 +387,6 @@
<DataTrigger Binding="{Binding Status}" Value="EmptyInStock"> <DataTrigger Binding="{Binding Status}" Value="EmptyInStock">
<Setter Property="Background" Value="#D78E28" /> <Setter Property="Background" Value="#D78E28" />
</DataTrigger> </DataTrigger>
</Style.Triggers> </Style.Triggers>
</Style> </Style>
</Button.Style> </Button.Style>
@ -423,7 +415,6 @@
</Button.ContentTemplate> </Button.ContentTemplate>
</Button> </Button>
</DataTemplate> </DataTemplate>
</ResourceDictionary> </ResourceDictionary>
</Window.Resources> </Window.Resources>
@ -464,8 +455,7 @@
VerticalAlignment="Center" VerticalAlignment="Center"
Text="设备编号 :" Text="设备编号 :"
FontSize="25" FontSize="25"
Foreground="White" Foreground="White" />
/>
<Border <Border
></Border> ></Border>
<TextBox x:Name="lba_ThrifTtitle1" Margin="5" Style="{StaticResource XingHaoBianMaYangShi}" IsEnabled="true" <TextBox x:Name="lba_ThrifTtitle1" Margin="5" Style="{StaticResource XingHaoBianMaYangShi}" IsEnabled="true"
@ -476,8 +466,7 @@
Margin="5" Margin="5"
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="25" FontSize="25"
Foreground="White" Foreground="White" />
/>
<Border <Border
></Border> ></Border>
<TextBox x:Name="lba_ThrifTtitle2" Style="{StaticResource XingHaoBianMaYangShi}" IsEnabled="true" <TextBox x:Name="lba_ThrifTtitle2" Style="{StaticResource XingHaoBianMaYangShi}" IsEnabled="true"
@ -578,8 +567,7 @@
<DataTemplate> <DataTemplate>
<Grid> <Grid>
<CheckBox x:Name="SelectBox" Click="CheckBox_Click" <CheckBox x:Name="SelectBox" Click="CheckBox_Click"
Style="{StaticResource CheckBoxStyle}" Style="{StaticResource CheckBoxStyle}" />
/>
</Grid> </Grid>
</DataTemplate> </DataTemplate>
</DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn.CellTemplate>
@ -715,7 +703,6 @@
<Setter Property="Height" Value="50" /> <Setter Property="Height" Value="50" />
<Setter Property="HorizontalContentAlignment" Value="Center" /> <Setter Property="HorizontalContentAlignment" Value="Center" />
</Style> </Style>
</DataGrid.CellStyle> </DataGrid.CellStyle>
<DataGrid.RowStyle> <DataGrid.RowStyle>
<Style TargetType="{x:Type DataGridRow}"> <Style TargetType="{x:Type DataGridRow}">
@ -774,8 +761,7 @@
IsReadOnly="True" IsReadOnly="True"
LoadingRow="dgData_LoadingRow" LoadingRow="dgData_LoadingRow"
RowHeaderWidth="0" RowHeaderWidth="0"
SelectionMode="Single" FontSize="16" HorizontalAlignment="Left" SelectionMode="Single" FontSize="16" HorizontalAlignment="Left">
>
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTemplateColumn Width="130*" Header="选择"> <DataGridTemplateColumn Width="130*" Header="选择">
<DataGridTemplateColumn.CellTemplate> <DataGridTemplateColumn.CellTemplate>
@ -836,7 +822,6 @@
<Setter Property="Height" Value="50" /> <Setter Property="Height" Value="50" />
<Setter Property="HorizontalContentAlignment" Value="Center" /> <Setter Property="HorizontalContentAlignment" Value="Center" />
</Style> </Style>
</DataGrid.CellStyle> </DataGrid.CellStyle>
<DataGrid.RowStyle> <DataGrid.RowStyle>
<Style TargetType="{x:Type DataGridRow}"> <Style TargetType="{x:Type DataGridRow}">
@ -882,8 +867,7 @@
Margin="-1500,20,0,-100" Margin="-1500,20,0,-100"
Text="设备编号 :" Text="设备编号 :"
FontSize="25" FontSize="25"
Foreground="White" Foreground="White" />
/>
<Border <Border
></Border> ></Border>
<TextBox x:Name="lba_ThrifTtitle3" Style="{StaticResource XingHaoBianMaYangShi}" IsEnabled="true" <TextBox x:Name="lba_ThrifTtitle3" Style="{StaticResource XingHaoBianMaYangShi}" IsEnabled="true"
@ -960,7 +944,6 @@
Header="设备名称" Header="设备名称"
IsReadOnly="True" /> IsReadOnly="True" />
<DataGridTextColumn <DataGridTextColumn
Width="180*" Width="180*"
Binding="{Binding serverIp}" Binding="{Binding serverIp}"
@ -993,7 +976,6 @@
<Setter Property="Height" Value="50" /> <Setter Property="Height" Value="50" />
<Setter Property="HorizontalContentAlignment" Value="Center" /> <Setter Property="HorizontalContentAlignment" Value="Center" />
</Style> </Style>
</DataGrid.CellStyle> </DataGrid.CellStyle>
<DataGrid.RowStyle> <DataGrid.RowStyle>
<Style TargetType="{x:Type DataGridRow}"> <Style TargetType="{x:Type DataGridRow}">
@ -1107,8 +1089,7 @@
IsReadOnly="True" IsReadOnly="True"
LoadingRow="dgData_LoadingRow" LoadingRow="dgData_LoadingRow"
RowHeaderWidth="0" RowHeaderWidth="0"
SelectionMode="Single" FontSize="16" HorizontalAlignment="Left" SelectionMode="Single" FontSize="16" HorizontalAlignment="Left">
>
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTemplateColumn Width="130*" Header="选择"> <DataGridTemplateColumn Width="130*" Header="选择">
<DataGridTemplateColumn.CellTemplate> <DataGridTemplateColumn.CellTemplate>
@ -1119,8 +1100,7 @@
</Grid.Tag> </Grid.Tag>
<CheckBox <CheckBox
Style="{StaticResource CheckBoxStyle}" Style="{StaticResource CheckBoxStyle}"
Click="LocationPersonBox_Click" Click="LocationPersonBox_Click" />
/>
</Grid> </Grid>
</DataTemplate> </DataTemplate>
</DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn.CellTemplate>
@ -1229,8 +1209,6 @@
FontSize="20" FontSize="20"
Header="冻结数量" Header="冻结数量"
IsReadOnly="True" />--> IsReadOnly="True" />-->
</DataGrid.Columns> </DataGrid.Columns>
<DataGrid.CellStyle> <DataGrid.CellStyle>
<Style TargetType="{x:Type DataGridCell}"> <Style TargetType="{x:Type DataGridCell}">
@ -1239,7 +1217,6 @@
<Setter Property="Height" Value="50" /> <Setter Property="Height" Value="50" />
<Setter Property="HorizontalContentAlignment" Value="Center" /> <Setter Property="HorizontalContentAlignment" Value="Center" />
</Style> </Style>
</DataGrid.CellStyle> </DataGrid.CellStyle>
<DataGrid.RowStyle> <DataGrid.RowStyle>
<Style TargetType="{x:Type DataGridRow}"> <Style TargetType="{x:Type DataGridRow}">
@ -1316,11 +1293,8 @@
<Ellipse Width="10" Height="10" Fill="Red" Canvas.Left="20" Canvas.Top="20" /> <Ellipse Width="10" Height="10" Fill="Red" Canvas.Left="20" Canvas.Top="20" />
</Canvas> </Canvas>
<TextBlock Text=" 库位锁定" FontSize="30" /> <TextBlock Text=" 库位锁定" FontSize="30" />
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</Grid> </Grid>
<Grid Grid.Row="1"> <Grid Grid.Row="1">
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled"> <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
@ -1373,12 +1347,9 @@
<Ellipse Width="10" Height="10" Fill="Red" Canvas.Left="20" Canvas.Top="20" /> <Ellipse Width="10" Height="10" Fill="Red" Canvas.Left="20" Canvas.Top="20" />
</Canvas> </Canvas>
<TextBlock Text=" 库位锁定" FontSize="30" /> <TextBlock Text=" 库位锁定" FontSize="30" />
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<Grid Grid.Row="1" x:Name="LocaltionGrid"> <Grid Grid.Row="1" x:Name="LocaltionGrid">
</Grid> </Grid>
</Grid> </Grid>
</TabItem> </TabItem>
@ -1418,8 +1389,7 @@
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
FontSize="30" FontSize="30"
Margin="-10,5,0,5" Margin="-10,5,0,5" />
/>
<Label <Label
Foreground="White" Foreground="White"
FontSize="25" FontSize="25"
@ -1586,9 +1556,6 @@
FontSize="20" FontSize="20"
Header="修改时间" Header="修改时间"
IsReadOnly="True" /> IsReadOnly="True" />
</DataGrid.Columns> </DataGrid.Columns>
<DataGrid.CellStyle> <DataGrid.CellStyle>
<Style TargetType="{x:Type DataGridCell}"> <Style TargetType="{x:Type DataGridCell}">
@ -1597,7 +1564,6 @@
<Setter Property="Height" Value="50" /> <Setter Property="Height" Value="50" />
<Setter Property="HorizontalContentAlignment" Value="Center" /> <Setter Property="HorizontalContentAlignment" Value="Center" />
</Style> </Style>
</DataGrid.CellStyle> </DataGrid.CellStyle>
<DataGrid.RowStyle> <DataGrid.RowStyle>
<Style TargetType="{x:Type DataGridRow}"> <Style TargetType="{x:Type DataGridRow}">
@ -1761,7 +1727,6 @@
<Setter Property="Foreground" Value="White" /> <Setter Property="Foreground" Value="White" />
<Setter Property="HorizontalContentAlignment" Value="Center" /> <Setter Property="HorizontalContentAlignment" Value="Center" />
</Style> </Style>
</DataGrid.CellStyle> </DataGrid.CellStyle>
<DataGrid.RowStyle> <DataGrid.RowStyle>
<Style TargetType="{x:Type DataGridRow}"> <Style TargetType="{x:Type DataGridRow}">
@ -1800,7 +1765,6 @@
<RowDefinition Height="5*" /> <RowDefinition Height="5*" />
<RowDefinition Height="0.7*" /> <RowDefinition Height="0.7*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Border Background="#213269" BorderBrush="Silver" BorderThickness="2" CornerRadius="10" Margin="0,5,0,0"> <Border Background="#213269" BorderBrush="Silver" BorderThickness="2" CornerRadius="10" Margin="0,5,0,0">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
@ -1864,8 +1828,7 @@
<CheckBox <CheckBox
IsChecked="{Binding Tag, RelativeSource={RelativeSource AncestorType=Grid}}" IsChecked="{Binding Tag, RelativeSource={RelativeSource AncestorType=Grid}}"
Style="{StaticResource CheckBoxStyle}" Style="{StaticResource CheckBoxStyle}"
Click="CheckPersonBox_Click" Click="CheckPersonBox_Click" />
/>
</Grid> </Grid>
</DataTemplate> </DataTemplate>
</DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn.CellTemplate>
@ -1963,7 +1926,6 @@
<Setter Property="Foreground" Value="White" /> <Setter Property="Foreground" Value="White" />
<Setter Property="HorizontalContentAlignment" Value="Center" /> <Setter Property="HorizontalContentAlignment" Value="Center" />
</Style> </Style>
</DataGrid.CellStyle> </DataGrid.CellStyle>
<DataGrid.RowStyle> <DataGrid.RowStyle>
<Style TargetType="{x:Type DataGridRow}"> <Style TargetType="{x:Type DataGridRow}">
@ -2119,9 +2081,7 @@
<Button Content="详情" Style="{StaticResource ButtonPrimary}" Margin="5 0 0 0" FontSize="15" Width="90" Height="55" Click="OpenInventoryDetails" VerticalAlignment="Center" HorizontalAlignment="Center" /> <Button Content="详情" Style="{StaticResource ButtonPrimary}" Margin="5 0 0 0" FontSize="15" Width="90" Height="55" Click="OpenInventoryDetails" VerticalAlignment="Center" HorizontalAlignment="Center" />
</StackPanel> </StackPanel>
</DataTemplate> </DataTemplate>
</DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn> </DataGridTemplateColumn>
</DataGrid.Columns> </DataGrid.Columns>
<DataGrid.CellStyle> <DataGrid.CellStyle>
@ -2194,6 +2154,7 @@
<TextBlock Text="物料名称:" Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" /> <TextBlock Text="物料名称:" Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" />
<TextBlock Text="物料规格:" Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" /> <TextBlock Text="物料规格:" Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" />
<TextBlock Text="入库数量:" Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" /> <TextBlock Text="入库数量:" Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" />
<TextBlock Text="单位:" Grid.Row="5" Grid.Column="3" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" Width="172" />
<TextBlock Text="备注信息:" Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" /> <TextBlock Text="备注信息:" Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" />
<hc:TextBox x:Name="txtInBox" hc:InfoElement.ShowClearButton="True" FontSize="50" LostFocus="txtInBox_TextChanged" TextChanged="txtInBox_TextChanged" Width="900" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80" Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="4" /> <hc:TextBox x:Name="txtInBox" hc:InfoElement.ShowClearButton="True" FontSize="50" LostFocus="txtInBox_TextChanged" TextChanged="txtInBox_TextChanged" Width="900" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80" Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="4" />
<Button Click="barClear_Click" HorizontalAlignment="Right" Height="80" Panel.ZIndex="1" Width="100" Margin="0,0,130,0" Grid.Column="5" Grid.Row="2"> <Button Click="barClear_Click" HorizontalAlignment="Right" Height="80" Panel.ZIndex="1" Width="100" Margin="0,0,130,0" Grid.Column="5" Grid.Row="2">
@ -2207,6 +2168,7 @@
<hc:TextBox x:Name="materialName" IsReadOnly="True" hc:InfoElement.ShowClearButton="True" FontSize="50" Width="970" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80" Grid.Row="3" Grid.Column="2" Grid.ColumnSpan="4" /> <hc:TextBox x:Name="materialName" IsReadOnly="True" hc:InfoElement.ShowClearButton="True" FontSize="50" Width="970" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80" Grid.Row="3" Grid.Column="2" Grid.ColumnSpan="4" />
<hc:TextBox x:Name="materialSpec" TextWrapping="Wrap" ScrollViewer.VerticalScrollBarVisibility="Visible" IsReadOnly="True" hc:InfoElement.ShowClearButton="True" FontSize="50" Width="970" HorizontalAlignment="Left" VerticalAlignment="Center" Height="140" Grid.Row="4" Grid.Column="2" Grid.ColumnSpan="4" /> <hc:TextBox x:Name="materialSpec" TextWrapping="Wrap" ScrollViewer.VerticalScrollBarVisibility="Visible" IsReadOnly="True" hc:InfoElement.ShowClearButton="True" FontSize="50" Width="970" HorizontalAlignment="Left" VerticalAlignment="Center" Height="140" Grid.Row="4" Grid.Column="2" Grid.ColumnSpan="4" />
<hc:TextBox x:Name="txtInScan" FontSize="50" IsReadOnly="True" Width="400" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80" Grid.Row="5" Grid.Column="2" Grid.ColumnSpan="3" KeyDown="ScanInKeyDown" Margin="0 20 0 20" /> <hc:TextBox x:Name="txtInScan" FontSize="50" IsReadOnly="True" Width="400" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80" Grid.Row="5" Grid.Column="2" Grid.ColumnSpan="3" KeyDown="ScanInKeyDown" Margin="0 20 0 20" />
<hc:TextBox x:Name="txtInUnit" FontSize="50" IsReadOnly="True" Width="287" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80" Grid.Row="5" Grid.Column="4" Grid.ColumnSpan="2" KeyDown="ScanInKeyDown" Margin="138,0,0,0" />
<Button Content="确认入库" Grid.Row="7" Grid.ColumnSpan="2" Width="300" Height="80" FontSize="50" Background="#346DFF" Foreground="White" Click="InRawBaseLocaltion_Click" Grid.Column="2" HorizontalAlignment="Left" Margin="125,0,0,10" VerticalAlignment="Bottom" /> <Button Content="确认入库" Grid.Row="7" Grid.ColumnSpan="2" Width="300" Height="80" FontSize="50" Background="#346DFF" Foreground="White" Click="InRawBaseLocaltion_Click" Grid.Column="2" HorizontalAlignment="Left" Margin="125,0,0,10" VerticalAlignment="Bottom" />
<Button Content="取消预调度" x:Name="CancelPreScheduling" Grid.Row="6" Grid.ColumnSpan="2" Width="328" Height="80" FontSize="50" Background="#346DFF" Foreground="White" HorizontalAlignment="Left" Grid.Column="4" Margin="222,0,0,0" Click="CancelPreScheduling_Click" /> <Button Content="取消预调度" x:Name="CancelPreScheduling" Grid.Row="6" Grid.ColumnSpan="2" Width="328" Height="80" FontSize="50" Background="#346DFF" Foreground="White" HorizontalAlignment="Left" Grid.Column="4" Margin="222,0,0,0" Click="CancelPreScheduling_Click" />
<Button Content="一键收料" Grid.Row="7" Grid.ColumnSpan="2" Width="328" Height="80" FontSize="50" Background="#346DFF" Foreground="White" Click="callPlc_Click" HorizontalAlignment="Left" Grid.Column="4" Margin="222,0,0,0" /> <Button Content="一键收料" Grid.Row="7" Grid.ColumnSpan="2" Width="328" Height="80" FontSize="50" Background="#346DFF" Foreground="White" Click="callPlc_Click" HorizontalAlignment="Left" Grid.Column="4" Margin="222,0,0,0" />
@ -2216,7 +2178,6 @@
</Grid> </Grid>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</TabItem> </TabItem>
<TabItem x:Name="ScanReturnManager" Header="扫描退库" Style="{StaticResource DefaultItem}" FontSize="25" HorizontalContentAlignment="Center" Background="#213269" VerticalContentAlignment="Center" Foreground="White" Width="160" Height="80" Margin="5"> <TabItem x:Name="ScanReturnManager" Header="扫描退库" Style="{StaticResource DefaultItem}" FontSize="25" HorizontalContentAlignment="Center" Background="#213269" VerticalContentAlignment="Center" Foreground="White" Width="160" Height="80" Margin="5">
@ -2264,14 +2225,12 @@
Header="物料名称" Header="物料名称"
Binding="{Binding materiaName}" Binding="{Binding materiaName}"
ElementStyle="{StaticResource dgCell}" ElementStyle="{StaticResource dgCell}"
Width="3*" Width="3*" />
/>
<DataGridTextColumn <DataGridTextColumn
Header="物料规格" Header="物料规格"
Binding="{Binding materialSpec}" Binding="{Binding materialSpec}"
ElementStyle="{StaticResource dgCell}" ElementStyle="{StaticResource dgCell}"
Width="5*" Width="5*" />
/>
<!--<DataGridTextColumn <!--<DataGridTextColumn
Header="销售订单" Header="销售订单"
Binding="{Binding saleOrderId}" Binding="{Binding saleOrderId}"
@ -2288,21 +2247,17 @@
Header="申请退库数量" Header="申请退库数量"
Binding="{Binding outstockAmount}" Binding="{Binding outstockAmount}"
ElementStyle="{StaticResource dgCell}" ElementStyle="{StaticResource dgCell}"
Width="2*" Width="2*" />
/>
<DataGridTextColumn <DataGridTextColumn
Header="已退数量" Header="已退数量"
Binding="{Binding realOutstockAmount}" Binding="{Binding realOutstockAmount}"
ElementStyle="{StaticResource dgCell}" ElementStyle="{StaticResource dgCell}"
Width="2*" Width="2*" />
/>
<DataGridTextColumn <DataGridTextColumn
Header="退库工位" Header="退库工位"
Binding="{Binding endStationCode}" Binding="{Binding endStationCode}"
ElementStyle="{StaticResource dgCell}" ElementStyle="{StaticResource dgCell}"
Width="2*" Width="2*" />
/>
</DataGrid.Columns> </DataGrid.Columns>
<DataGrid.CellStyle> <DataGrid.CellStyle>
<Style TargetType="{x:Type DataGridCell}"> <Style TargetType="{x:Type DataGridCell}">
@ -2310,7 +2265,6 @@
<Setter Property="Foreground" Value="White" /> <Setter Property="Foreground" Value="White" />
<Setter Property="HorizontalContentAlignment" Value="Center" /> <Setter Property="HorizontalContentAlignment" Value="Center" />
</Style> </Style>
</DataGrid.CellStyle> </DataGrid.CellStyle>
<DataGrid.RowStyle> <DataGrid.RowStyle>
<Style TargetType="{x:Type DataGridRow}"> <Style TargetType="{x:Type DataGridRow}">
@ -2342,7 +2296,6 @@
<TextBlock x:Name="ReturnTaskCount" Visibility="Hidden" Grid.Row="1" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" /> <TextBlock x:Name="ReturnTaskCount" Visibility="Hidden" Grid.Row="1" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" />
<Button Content="执行CTU出库任务" Visibility="Hidden" Grid.Row="1" Grid.Column="3" Grid.ColumnSpan="2" Width="500" Height="100" FontSize="50" Background="#346DFF" Foreground="White" Click="ExecuteCtuTask_Click" /> <Button Content="执行CTU出库任务" Visibility="Hidden" Grid.Row="1" Grid.Column="3" Grid.ColumnSpan="2" Width="500" Height="100" FontSize="50" Background="#346DFF" Foreground="White" Click="ExecuteCtuTask_Click" />
<StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="2" Grid.ColumnSpan="6"> <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="2" Grid.ColumnSpan="6">
<TextBlock Text="扫描料箱号:" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50" /> <TextBlock Text="扫描料箱号:" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50" />
<Grid> <Grid>
@ -2444,13 +2397,11 @@
<Button x:Name="SelectOutButton" Content="选择出库" Background="#346DFF" Foreground="White" FontSize="50" Margin="20,0,0,0" Height="100" Width="250" Click="SelectOutBtn_Click" /> <Button x:Name="SelectOutButton" Content="选择出库" Background="#346DFF" Foreground="White" FontSize="50" Margin="20,0,0,0" Height="100" Width="250" Click="SelectOutBtn_Click" />
<Button Content="继续出库" Background="#346DFF" Foreground="White" FontSize="50" Margin="20,50,0,0" Height="100" Width="250" Click="ContineOutBtn_Click" /> <Button Content="继续出库" Background="#346DFF" Foreground="White" FontSize="50" Margin="20,50,0,0" Height="100" Width="250" Click="ContineOutBtn_Click" />
</StackPanel> </StackPanel>
</Border> </Border>
<Border BorderBrush="White" BorderThickness="2" Grid.Column="0" Grid.ColumnSpan="6" Grid.Row="7" Grid.RowSpan="2" Margin="20"> <Border BorderBrush="White" BorderThickness="2" Grid.Column="0" Grid.ColumnSpan="6" Grid.Row="7" Grid.RowSpan="2" Margin="20">
<DataGrid Style="{StaticResource DataGridStyle}" <DataGrid Style="{StaticResource DataGridStyle}"
Grid.Row="2" AlternationCount="2" Grid.Row="2" AlternationCount="2"
AutoGenerateColumns="False" AutoGenerateColumns="False"
@ -2475,14 +2426,12 @@
Header="物料名称" Header="物料名称"
Binding="{Binding materiaName}" Binding="{Binding materiaName}"
ElementStyle="{StaticResource dgCell}" ElementStyle="{StaticResource dgCell}"
Width="*" Width="*" />
/>
<DataGridTextColumn <DataGridTextColumn
Header="物料规格" Header="物料规格"
Binding="{Binding materialSpec}" Binding="{Binding materialSpec}"
ElementStyle="{StaticResource dgCell}" ElementStyle="{StaticResource dgCell}"
Width="*" Width="*" />
/>
<!--<DataGridTextColumn <!--<DataGridTextColumn
Header="销售订单" Header="销售订单"
Binding="{Binding saleOrderId}" Binding="{Binding saleOrderId}"
@ -2494,34 +2443,29 @@
Header="申请数量" Header="申请数量"
Binding="{Binding outstockAmount}" Binding="{Binding outstockAmount}"
ElementStyle="{StaticResource dgCell}" ElementStyle="{StaticResource dgCell}"
Width="*" Width="*" />
/>
<DataGridTextColumn <DataGridTextColumn
Header="已出数量" Header="已出数量"
Binding="{Binding realOutstockAmount}" Binding="{Binding realOutstockAmount}"
ElementStyle="{StaticResource dgCell}" ElementStyle="{StaticResource dgCell}"
Width="*" Width="*" />
/>
<DataGridTextColumn <DataGridTextColumn
Header="目的地" Header="目的地"
Binding="{Binding EndStationCodes}" Binding="{Binding EndStationCodes}"
Width="*" Width="*"
ElementStyle="{StaticResource dgCell}" ElementStyle="{StaticResource dgCell}" />
/>
<DataGridTextColumn <DataGridTextColumn
Header="申请时间" Header="申请时间"
Binding="{Binding ApplyTime,StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}" Binding="{Binding ApplyTime,StringFormat='{}{0:yyyy-MM-dd HH:mm:ss}'}"
Width="1.2*" Width="1.2*"
ElementStyle="{StaticResource dgCell}" ElementStyle="{StaticResource dgCell}" />
/>
<DataGridTextColumn <DataGridTextColumn
Header="是否出完" Header="是否出完"
Binding="{Binding isSendOver}" Binding="{Binding isSendOver}"
Width="*" Width="*"
ElementStyle="{StaticResource dgCell}" ElementStyle="{StaticResource dgCell}" />
/>
<DataGridTemplateColumn <DataGridTemplateColumn
Width="3*" Width="3*"
CanUserSort="False" CanUserSort="False"
@ -2533,7 +2477,6 @@
</DataTemplate> </DataTemplate>
</DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn> </DataGridTemplateColumn>
</DataGrid.Columns> </DataGrid.Columns>
<DataGrid.CellStyle> <DataGrid.CellStyle>
<Style TargetType="{x:Type DataGridCell}"> <Style TargetType="{x:Type DataGridCell}">
@ -2541,7 +2484,6 @@
<Setter Property="Foreground" Value="White" /> <Setter Property="Foreground" Value="White" />
<Setter Property="HorizontalContentAlignment" Value="Center" /> <Setter Property="HorizontalContentAlignment" Value="Center" />
</Style> </Style>
</DataGrid.CellStyle> </DataGrid.CellStyle>
<DataGrid.RowStyle> <DataGrid.RowStyle>
<Style TargetType="{x:Type DataGridRow}"> <Style TargetType="{x:Type DataGridRow}">
@ -2592,7 +2534,6 @@
<Image Source="..\Resources\cancel.png" /> <Image Source="..\Resources\cancel.png" />
</Button> </Button>
</Grid> </Grid>
</StackPanel> </StackPanel>
<StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="2" Grid.ColumnSpan="6"> <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="2" Grid.ColumnSpan="6">
@ -2607,7 +2548,6 @@
<hc:TextBox hc:InfoElement.ShowClearButton="True" IsReadOnly="True" x:Name="outMaterialSpecTxt" FontSize="50" LostFocus="txtOutBarCode_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80" Grid.Row="3" Grid.Column="3" Grid.ColumnSpan="3" /> <hc:TextBox hc:InfoElement.ShowClearButton="True" IsReadOnly="True" x:Name="outMaterialSpecTxt" FontSize="50" LostFocus="txtOutBarCode_TextChanged" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80" Grid.Row="3" Grid.Column="3" Grid.ColumnSpan="3" />
</Grid> </Grid>
<Button Content="确认出库" Grid.Column="4" Grid.Row="3" Grid.ColumnSpan="2" Width="400" Height="75" Margin="100,0,0,0" FontSize="35" Background="#346DFF" Foreground="White" Click="OutRawBaseLocaltion_Click" /> <Button Content="确认出库" Grid.Column="4" Grid.Row="3" Grid.ColumnSpan="2" Width="400" Height="75" Margin="100,0,0,0" FontSize="35" Background="#346DFF" Foreground="White" Click="OutRawBaseLocaltion_Click" />
</StackPanel> </StackPanel>
<StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="4" Grid.ColumnSpan="6"> <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="4" Grid.ColumnSpan="6">
<TextBlock Text="库存:" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50" /> <TextBlock Text="库存:" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50" />
@ -2620,8 +2560,6 @@
<hc:TextBox x:Name="txtOutScan" Margin="0,0,0,0" FontSize="50" Width="300" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80" Grid.Row="4" Grid.Column="3" Grid.ColumnSpan="3" KeyDown="OutEnter" /> <hc:TextBox x:Name="txtOutScan" Margin="0,0,0,0" FontSize="50" Width="300" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80" Grid.Row="4" Grid.Column="3" Grid.ColumnSpan="3" KeyDown="OutEnter" />
</Grid> </Grid>
<Button Content="背负式小车捡料完成" Grid.Column="4" Grid.Row="6" Grid.ColumnSpan="2" Width="400" Height="75" Margin="100,0,0,0" FontSize="35" Background="#346DFF" Foreground="White" Click="btnBearConfirmBox_Click" /> <Button Content="背负式小车捡料完成" Grid.Column="4" Grid.Row="6" Grid.ColumnSpan="2" Width="400" Height="75" Margin="100,0,0,0" FontSize="35" Background="#346DFF" Foreground="White" Click="btnBearConfirmBox_Click" />
</StackPanel> </StackPanel>
<StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="5" Grid.ColumnSpan="6"> <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="5" Grid.ColumnSpan="6">
@ -2630,17 +2568,13 @@
<hc:TextBox hc:InfoElement.ShowClearButton="True" x:Name="remarks" FontSize="50" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80" Grid.Row="3" Grid.Column="3" Grid.ColumnSpan="3" /> <hc:TextBox hc:InfoElement.ShowClearButton="True" x:Name="remarks" FontSize="50" Width="700" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80" Grid.Row="3" Grid.Column="3" Grid.ColumnSpan="3" />
</Grid> </Grid>
<Button Content="创建背负小车任务" Grid.Column="4" Grid.Row="6" Grid.ColumnSpan="2" Width="400" Height="75" Margin="100,0,0,0" FontSize="35" Background="#346DFF" Foreground="White" Click="createBearConfirmBox_Click" /> <Button Content="创建背负小车任务" Grid.Column="4" Grid.Row="6" Grid.ColumnSpan="2" Width="400" Height="75" Margin="100,0,0,0" FontSize="35" Background="#346DFF" Foreground="White" Click="createBearConfirmBox_Click" />
</StackPanel> </StackPanel>
<StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="6" Grid.ColumnSpan="6"> <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="6" Grid.ColumnSpan="6">
<TextBlock Text="提示信息:" Width="280" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50" /> <TextBlock Text="提示信息:" Width="280" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="50" />
<Grid> <Grid>
<TextBlock x:Name="scanOutMsg" hc:InfoElement.ShowClearButton="True" FontSize="50" Width="1300" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80" Grid.Row="3" Grid.Column="3" Grid.ColumnSpan="4" /> <TextBlock x:Name="scanOutMsg" hc:InfoElement.ShowClearButton="True" FontSize="50" Width="1300" HorizontalAlignment="Left" VerticalAlignment="Center" Height="80" Grid.Row="3" Grid.Column="3" Grid.ColumnSpan="4" />
</Grid> </Grid>
</StackPanel> </StackPanel>
</Grid> </Grid>
<!--<Border Background="#213269" BorderBrush="Silver" BorderThickness="2" CornerRadius="10" Width="900" Height="500" Margin="0,5,0,0"> <!--<Border Background="#213269" BorderBrush="Silver" BorderThickness="2" CornerRadius="10" Width="900" Height="500" Margin="0,5,0,0">
<StackPanel Margin="0,10,10,10"> <StackPanel Margin="0,10,10,10">
@ -2649,18 +2583,15 @@
Height="37" Height="37"
Text="业务类型 :" Text="业务类型 :"
FontSize="25" Margin="0,20,750,-60" FontSize="25" Margin="0,20,750,-60"
Foreground="White" Foreground="White" />
/>
<TextBlock x:Name="cbxType" Margin="0,20,400,0" Width="180" Height="50" Text="入库" /> <TextBlock x:Name="cbxType" Margin="0,20,400,0" Width="180" Height="50" Text="入库" />
<TextBlock <TextBlock
Width="152" Width="152"
Height="36" Height="36"
Text="料箱 :" Text="料箱 :"
FontSize="25" Margin="0,30,750,-60" FontSize="25" Margin="0,30,750,-60"
Foreground="White" Foreground="White" />
/>
<TextBox x:Name="txtBox" Style="{StaticResource XingHaoBianMaYangShi}" IsEnabled="true" <TextBox x:Name="txtBox" Style="{StaticResource XingHaoBianMaYangShi}" IsEnabled="true"
Width="180" Height="50" Margin="0,15,400,0" KeyDown="txtBox_KeyDown" /> Width="180" Height="50" Margin="0,15,400,0" KeyDown="txtBox_KeyDown" />
<TextBlock <TextBlock
@ -2668,8 +2599,7 @@
Height="39" Height="39"
Text="条码:" Text="条码:"
FontSize="25" Margin="0,20,750,-60" FontSize="25" Margin="0,20,750,-60"
Foreground="White" Foreground="White" />
/>
<TextBox x:Name="txtBarCode" Style="{StaticResource XingHaoBianMaYangShi}" IsEnabled="true" <TextBox x:Name="txtBarCode" Style="{StaticResource XingHaoBianMaYangShi}" IsEnabled="true"
Width="180" Height="50" Margin="0,20,400,0" TextChanged="txtBarCode_KeyDown" /> Width="180" Height="50" Margin="0,20,400,0" TextChanged="txtBarCode_KeyDown" />
<Button Content="清除料箱条码" FontSize="25" Margin="400,-180,10,0" HorizontalAlignment="Left" Foreground="White" Height="50" Width="170" Click="clearRFID_Click"> <Button Content="清除料箱条码" FontSize="25" Margin="400,-180,10,0" HorizontalAlignment="Left" Foreground="White" Height="50" Width="170" Click="clearRFID_Click">
@ -2697,8 +2627,7 @@
Height="42" Height="42"
Text="已扫描数量:" Text="已扫描数量:"
FontSize="25" Margin="0,20,750,-60" FontSize="25" Margin="0,20,750,-60"
Foreground="White" Foreground="White" />
/>
<TextBox x:Name="txtScan" Style="{StaticResource XingHaoBianMaYangShi}" IsReadOnly="True" <TextBox x:Name="txtScan" Style="{StaticResource XingHaoBianMaYangShi}" IsReadOnly="True"
Width="180" Height="50" Margin="0,10,400,0" IsEnabled="False" /> Width="180" Height="50" Margin="0,10,400,0" IsEnabled="False" />
@ -2783,7 +2712,6 @@
</Button> </Button>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Grid.Row="2" Grid.Column="2" Grid.ColumnSpan="2" HorizontalAlignment="Center" Margin="5"> <StackPanel Orientation="Horizontal" Grid.Row="2" Grid.Column="2" Grid.ColumnSpan="2" HorizontalAlignment="Center" Margin="5">
<TextBlock Text="移库条码:" FontSize="40" VerticalAlignment="Center" HorizontalAlignment="Center" /> <TextBlock Text="移库条码:" FontSize="40" VerticalAlignment="Center" HorizontalAlignment="Center" />
<hc:TextBox x:Name="removeSourceBarCode" FontSize="40" TextChanged="removeSourceBarCode_TextChanged" Width="600" Height="100" Margin="0,0,0,0" hc:InfoElement.ShowClearButton="True" /> <hc:TextBox x:Name="removeSourceBarCode" FontSize="40" TextChanged="removeSourceBarCode_TextChanged" Width="600" Height="100" Margin="0,0,0,0" hc:InfoElement.ShowClearButton="True" />
@ -2806,22 +2734,18 @@
<hc:TextBox x:Name="removeSourceMaterialName" FontSize="40" Width="600" Height="100" Margin="0,0,0,0" hc:InfoElement.ShowClearButton="True" /> <hc:TextBox x:Name="removeSourceMaterialName" FontSize="40" Width="600" Height="100" Margin="0,0,0,0" hc:InfoElement.ShowClearButton="True" />
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Grid.Row="4" Grid.Column="2" Grid.ColumnSpan="2" HorizontalAlignment="Center" Margin="5"> <StackPanel Orientation="Horizontal" Grid.Row="4" Grid.Column="2" Grid.ColumnSpan="2" HorizontalAlignment="Center" Margin="5">
<TextBlock Text="物料规格:" FontSize="40" VerticalAlignment="Center" HorizontalAlignment="Center" /> <TextBlock Text="物料规格:" FontSize="40" VerticalAlignment="Center" HorizontalAlignment="Center" />
<hc:TextBox x:Name="removeSourceMaterialSpec" FontSize="40" Width="600" Height="100" Margin="0,0,0,0" hc:InfoElement.ShowClearButton="True" /> <hc:TextBox x:Name="removeSourceMaterialSpec" FontSize="40" Width="600" Height="100" Margin="0,0,0,0" hc:InfoElement.ShowClearButton="True" />
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" Margin="5"> <StackPanel Orientation="Horizontal" Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" Margin="5">
<TextBlock Text="移库数量:" FontSize="40" VerticalAlignment="Center" HorizontalAlignment="Center" /> <TextBlock Text="移库数量:" FontSize="40" VerticalAlignment="Center" HorizontalAlignment="Center" />
<hc:TextBox x:Name="removeScan" FontSize="40" Width="600" Height="100" Margin="0,0,0,0" hc:InfoElement.ShowClearButton="True" /> <hc:TextBox x:Name="removeScan" FontSize="40" Width="600" Height="100" Margin="0,0,0,0" hc:InfoElement.ShowClearButton="True" />
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Grid.Row="5" Grid.Column="2" Grid.ColumnSpan="2" HorizontalAlignment="Center" Margin="5"> <StackPanel Orientation="Horizontal" Grid.Row="5" Grid.Column="2" Grid.ColumnSpan="2" HorizontalAlignment="Center" Margin="5">
<TextBlock Text="物料库存:" FontSize="40" VerticalAlignment="Center" HorizontalAlignment="Center" /> <TextBlock Text="物料库存:" FontSize="40" VerticalAlignment="Center" HorizontalAlignment="Center" />
<hc:TextBox x:Name="removeTotalStock" FontSize="40" Width="600" Height="100" Margin="0,0,0,0" hc:InfoElement.ShowClearButton="True" /> <hc:TextBox x:Name="removeTotalStock" FontSize="40" Width="600" Height="100" Margin="0,0,0,0" hc:InfoElement.ShowClearButton="True" />
</StackPanel> </StackPanel>
<Button Content="确认移库" Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="4" Width="500" Height="150" FontSize="75" Background="#346DFF" Foreground="White" Click="btnRemoveConfirmBox_Click" /> <Button Content="确认移库" Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="4" Width="500" Height="150" FontSize="75" Background="#346DFF" Foreground="White" Click="btnRemoveConfirmBox_Click" />
@ -2829,7 +2753,6 @@
<TextBlock Text="提示信息:" FontSize="40" VerticalAlignment="Center" HorizontalAlignment="Left" /> <TextBlock Text="提示信息:" FontSize="40" VerticalAlignment="Center" HorizontalAlignment="Left" />
<TextBlock x:Name="RemoveMsg" HorizontalAlignment="Left" FontSize="40" Foreground="White" Width="1200" Height="60" Margin="10,0,0,0" /> <TextBlock x:Name="RemoveMsg" HorizontalAlignment="Left" FontSize="40" Foreground="White" Width="1200" Height="60" Margin="10,0,0,0" />
</StackPanel> </StackPanel>
</Grid> </Grid>
</TabItem> </TabItem>
<TabItem x:Name="FirstFloorManager" Header="一楼接驳" Style="{StaticResource DefaultItem}" FontSize="25" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="#213269" Foreground="White" Width="160" Height="80" Margin="5"> <TabItem x:Name="FirstFloorManager" Header="一楼接驳" Style="{StaticResource DefaultItem}" FontSize="25" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="#213269" Foreground="White" Width="160" Height="80" Margin="5">
@ -2945,7 +2868,6 @@
<TextBlock x:Name="linesignal05" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="2" Grid.Row="6" FontSize="25" /> <TextBlock x:Name="linesignal05" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="2" Grid.Row="6" FontSize="25" />
<TextBlock x:Name="wcsrun05" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="3" Grid.Row="6" FontSize="25" /> <TextBlock x:Name="wcsrun05" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="3" Grid.Row="6" FontSize="25" />
</Grid> </Grid>
</Border> </Border>
<Border Background="#213269" BorderBrush="Silver" BorderThickness="2" CornerRadius="10" Width="700" Height="350" Margin="0,30,0,0"> <Border Background="#213269" BorderBrush="Silver" BorderThickness="2" CornerRadius="10" Width="700" Height="350" Margin="0,30,0,0">
<Grid x:Name="UXX"> <Grid x:Name="UXX">
@ -3094,8 +3016,7 @@
IsReadOnly="True" IsReadOnly="True"
LoadingRow="dgData_LoadingRow" LoadingRow="dgData_LoadingRow"
RowHeaderWidth="0" RowHeaderWidth="0"
SelectionMode="Single" FontSize="16" HorizontalAlignment="Left" Height="1100" Width="1700" Margin="0,0,0,10" SelectionMode="Single" FontSize="16" HorizontalAlignment="Left" Height="1100" Width="1700" Margin="0,0,0,10">
>
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTemplateColumn <DataGridTemplateColumn
Width="100" Width="100"
@ -3178,7 +3099,6 @@ IsReadOnly="True">
FontSize="20" FontSize="20"
Header="报警信息" Header="报警信息"
IsReadOnly="True" /> IsReadOnly="True" />
</DataGrid.Columns> </DataGrid.Columns>
<DataGrid.CellStyle> <DataGrid.CellStyle>
<Style TargetType="{x:Type DataGridCell}"> <Style TargetType="{x:Type DataGridCell}">
@ -3186,7 +3106,6 @@ IsReadOnly="True">
<Setter Property="Foreground" Value="White" /> <Setter Property="Foreground" Value="White" />
<Setter Property="HorizontalContentAlignment" Value="Center" /> <Setter Property="HorizontalContentAlignment" Value="Center" />
</Style> </Style>
</DataGrid.CellStyle> </DataGrid.CellStyle>
<DataGrid.RowStyle> <DataGrid.RowStyle>
<Style TargetType="{x:Type DataGridRow}"> <Style TargetType="{x:Type DataGridRow}">
@ -3212,7 +3131,6 @@ IsReadOnly="True">
<Setter Property="FontSize" Value="30" /> <Setter Property="FontSize" Value="30" />
</Style> </Style>
</DataGrid.ColumnHeaderStyle> </DataGrid.ColumnHeaderStyle>
</DataGrid> </DataGrid>
</TabItem> </TabItem>
<TabItem x:Name="AuthManager" Header="权限控制" Style="{StaticResource DefaultItem}" FontSize="25" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="#213269" Foreground="White" Width="160" Height="100" Margin="5"> <TabItem x:Name="AuthManager" Header="权限控制" Style="{StaticResource DefaultItem}" FontSize="25" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="#213269" Foreground="White" Width="160" Height="100" Margin="5">
@ -3243,8 +3161,7 @@ IsReadOnly="True">
SelectionMode="Single" SelectionMode="Single"
x:Name="UserData" x:Name="UserData"
LoadingRow="dgData_LoadingRow" LoadingRow="dgData_LoadingRow"
MinRowHeight="50" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" MinRowHeight="50" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
>
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTemplateColumn <DataGridTemplateColumn
Width="100" Width="100"
@ -3316,7 +3233,6 @@ IsReadOnly="True">
<Setter Property="Foreground" Value="White" /> <Setter Property="Foreground" Value="White" />
<Setter Property="HorizontalContentAlignment" Value="Center" /> <Setter Property="HorizontalContentAlignment" Value="Center" />
</Style> </Style>
</DataGrid.CellStyle> </DataGrid.CellStyle>
<DataGrid.RowStyle> <DataGrid.RowStyle>
<Style TargetType="{x:Type DataGridRow}"> <Style TargetType="{x:Type DataGridRow}">
@ -3405,10 +3321,6 @@ IsReadOnly="True">
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</Grid> </Grid>
</Grid> </Grid>
</Grid> </Grid>
</Window> </Window>

299
src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save