Skip to content

J
JmpZbChannel
Commit 8475f7d9 by zxw
Options

充电台ui调整

parent 32cf4833
正在显示 包含 57 行增加 和 40 行删除
LiteChannel/Commons/HttpHelper.cs
...@@ -880,10 +880,10 @@ namespace LiteChannel.Commons ...@@ -880,10 +880,10 @@ namespace LiteChannel.Commons
} }
else else
{ {
var successCount = res_data.data.Count(x => new[] { 1, 2, 8, 14, 15, 17 }.Contains(x.currentState)); var successCount = res_data.data.Count(x => new[] { 1, 2, 8, 14, 15, 17, 6 }.Contains(x.currentState));
var failCount = eps.Count - successCount; var failCount = eps.Count - successCount;
var failEpcList = eps.Where(x => var failEpcList = eps.Where(x =>
res_data.data.Where(y => new[] { 1, 2, 8, 14, 15, 17 }.Contains(y.currentState)).Count(y => y.epc == x.RFID) == 0) res_data.data.Where(y => new[] { 1, 2, 8, 14, 15, 17, 6 }.Contains(y.currentState)).Count(y => y.epc == x.RFID) == 0)
.Select(x => x.RFID); .Select(x => x.RFID);
var message = $"装备出库成功{successCount}条，失败{failCount}条"; var message = $"装备出库成功{successCount}条，失败{failCount}条";
......
LiteChannel/MainWindow.xaml
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="0.18*"/> <RowDefinition Height="0.18*"/>
<RowDefinition Height="0.06*"/> <RowDefinition Height="0.06*"/>
<RowDefinition Height="0.02*"/> <RowDefinition Height="0.1*"/>
<RowDefinition Height="0.46*"/> <RowDefinition Height="0.4*"/>
<RowDefinition Height="0.28*"/> <RowDefinition Height="0.28*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
...@@ -41,49 +41,45 @@ ...@@ -41,49 +41,45 @@
pu:ComboBoxHelper.SearchTextChanged="cbo_warehouse_SearchTextChanged" pu:ComboBoxHelper.SearchTextChanged="cbo_warehouse_SearchTextChanged"
pu:ComboBoxHelper.SearchTextBoxWatermark="在此搜索仓库..." SelectionChanged="cbo_warehouse_SelectionChanged"></ComboBox> pu:ComboBoxHelper.SearchTextBoxWatermark="在此搜索仓库..." SelectionChanged="cbo_warehouse_SelectionChanged"></ComboBox>
<Button Grid.Row="3" Grid.Column="1" Click="OnInStore_Click" FontFamily="{StaticResource FontAwesome}" FontSize="30" Foreground="{x:Null}" Margin="25,0,25,0"> <Border Grid.Row="3" Grid.Column="1" Margin="25,0,25,0">
<!--<Button.BorderBrush> <Border.BorderBrush>
<ImageBrush ImageSource="Resources/3.png"/> <ImageBrush ImageSource="Resources/3.png"/>
</Button.BorderBrush>--> </Border.BorderBrush>
<Button.Background> <Border.Background>
<ImageBrush ImageSource="Resources/3.png"/> <ImageBrush ImageSource="Resources/3.png"/>
</Button.Background> </Border.Background>
<Button Click="OnInStore_Click" FontFamily="{StaticResource FontAwesome}" FontSize="30" Foreground="{x:Null}" Margin="0,75,0,0">
<pu:ButtonHelper.ButtonStyle> <pu:ButtonHelper.ButtonStyle>
<pu:ButtonStyle>Link</pu:ButtonStyle> <pu:ButtonStyle>Link</pu:ButtonStyle>
</pu:ButtonHelper.ButtonStyle> </pu:ButtonHelper.ButtonStyle>
<pu:ButtonHelper.HoverBrush>
<ImageBrush ImageSource="Resources/3.png"/>
</pu:ButtonHelper.HoverBrush>
</Button> </Button>
<Button Grid.Row="3" Grid.Column="2" Click="OnOutStore_Click" FontFamily="{StaticResource FontAwesome}" FontSize="30" Foreground="{x:Null}" Margin="25,0,25,0"> </Border>
<Button.BorderBrush> <Border Grid.Row="3" Grid.Column="2" Margin="25,0,25,0">
<Border.BorderBrush>
<ImageBrush ImageSource="Resources/4.png"/> <ImageBrush ImageSource="Resources/4.png"/>
</Button.BorderBrush> </Border.BorderBrush>
<Button.Background> <Border.Background>
<ImageBrush ImageSource="Resources/4.png"/> <ImageBrush ImageSource="Resources/4.png"/>
</Button.Background> </Border.Background>
<Button Click="OnOutStore_Click" FontFamily="{StaticResource FontAwesome}" FontSize="30" Foreground="{x:Null}" Margin="0,75,0,0">
<pu:ButtonHelper.ButtonStyle> <pu:ButtonHelper.ButtonStyle>
<pu:ButtonStyle>Link</pu:ButtonStyle> <pu:ButtonStyle>Link</pu:ButtonStyle>
</pu:ButtonHelper.ButtonStyle> </pu:ButtonHelper.ButtonStyle>
<pu:ButtonHelper.HoverBrush>
<ImageBrush ImageSource="Resources/4.png"/>
</pu:ButtonHelper.HoverBrush>
</Button> </Button>
<Button Grid.Row="3" Grid.Column="3" Click="OnClose_Click" FontFamily="{StaticResource FontAwesome}" FontSize="30" Foreground="{x:Null}" Margin="25,0,25,0"> </Border>
<Button.BorderBrush> <Border Grid.Row="3" Grid.Column="3" Margin="25,0,25,0">
<Border.BorderBrush>
<ImageBrush ImageSource="Resources/2.png"/> <ImageBrush ImageSource="Resources/2.png"/>
</Button.BorderBrush> </Border.BorderBrush>
<Button.Background> <Border.Background>
<ImageBrush ImageSource="Resources/2.png"/> <ImageBrush ImageSource="Resources/2.png"/>
</Button.Background> </Border.Background>
<Button Click="OnClose_Click" FontFamily="{StaticResource FontAwesome}" FontSize="30" Foreground="{x:Null}" Margin="0,75,0,0">
<pu:ButtonHelper.ButtonStyle> <pu:ButtonHelper.ButtonStyle>
<pu:ButtonStyle>Link</pu:ButtonStyle> <pu:ButtonStyle>Link</pu:ButtonStyle>
</pu:ButtonHelper.ButtonStyle> </pu:ButtonHelper.ButtonStyle>
<pu:ButtonHelper.HoverBrush>
<ImageBrush ImageSource="Resources/2.png"/>
</pu:ButtonHelper.HoverBrush>
</Button> </Button>
</Border>
</Grid> </Grid>
</pu:WindowX> </pu:WindowX>
LiteChannel/MainWindow2.xaml
...@@ -32,21 +32,21 @@ ...@@ -32,21 +32,21 @@
pu:DataGridHelper.SelectedBackground="#44B5B5B5" pu:DataGridHelper.HoverBackground="#22B5B5B5" CanUserAddRows="False" Grid.ColumnSpan="4" pu:DataGridHelper.SelectedBackground="#44B5B5B5" pu:DataGridHelper.HoverBackground="#22B5B5B5" CanUserAddRows="False" Grid.ColumnSpan="4"
AutoGenerateColumns="False" LoadingRow="OnDataGridLoadingRow" SelectionMode="Single" Name="dg_order" pu:DataGridHelper.ColumnHorizontalContentAlignment="Center" CanUserSortColumns="True" > AutoGenerateColumns="False" LoadingRow="OnDataGridLoadingRow" SelectionMode="Single" Name="dg_order" pu:DataGridHelper.ColumnHorizontalContentAlignment="Center" CanUserSortColumns="True" >
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTemplateColumn Header="序号" MinWidth="80" > <!--<DataGridTemplateColumn Header="序号" MinWidth="80" >
<DataGridTemplateColumn.CellTemplate> <DataGridTemplateColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<TextBlock FontSize="18" Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow}}, Path=Header}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5,0,0,0"/> <TextBlock FontSize="18" Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow}}, Path=Header}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5,0,0,0"/>
</DataTemplate> </DataTemplate>
</DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn> </DataGridTemplateColumn>-->
<DataGridTextColumn IsReadOnly="True" Header="单据编号" Width="1.5*" MinWidth="100" FontSize="18" Binding="{Binding orderCode}" /> <DataGridTextColumn IsReadOnly="True" Header="单据编号(后6位)" Width="115" MinWidth="115" FontSize="18" Binding="{Binding orderCodeLast6}" />
<DataGridTextColumn IsReadOnly="True" Header="单据类型" Width="100" MinWidth="100" FontSize="18" Binding="{Binding orderType}" /> <DataGridTextColumn IsReadOnly="True" Header="单据类型" Width="100" MinWidth="100" FontSize="18" Binding="{Binding orderType}" />
<DataGridTextColumn IsReadOnly="True" Header="借用警员(借用)" Width="100" MinWidth="120" FontSize="18" Binding="{Binding borrowPolice}" /> <DataGridTextColumn IsReadOnly="True" Header="借用警员(借用)" Width="*" MinWidth="100" FontSize="18" Binding="{Binding borrowPolice}" />
<DataGridTextColumn IsReadOnly="True" Header="目标仓库(调拨)" Width="100" MinWidth="200" FontSize="18" Binding="{Binding receiveWarehouseName}" /> <DataGridTextColumn IsReadOnly="True" Header="目标仓库(调拨)" Width="*" MinWidth="100" FontSize="18" Binding="{Binding receiveWarehouseName}" />
<DataGridTextColumn IsReadOnly="True" Header="申请日期" Width="1.5*" MinWidth="100" FontSize="18" Binding="{Binding createTime}"/> <DataGridTextColumn IsReadOnly="True" Header="申请日期" Width="*" MinWidth="205" FontSize="18" Binding="{Binding createTime}"/>
<DataGridTextColumn IsReadOnly="True" Header="装备信息" Width="3*" MinWidth="100" FontSize="18" Binding="{Binding equNames}"/> <!--<DataGridTextColumn IsReadOnly="True" Header="装备信息" Width="*" MinWidth="100" FontSize="18" Binding="{Binding equNames}"/>-->
<!--<DataGridTextColumn IsReadOnly="True" Header="单据数量" Width="100" MinWidth="100" FontSize="18" Binding="{Binding orderQuantity}"/>--> <!--<DataGridTextColumn IsReadOnly="True" Header="单据数量" Width="100" MinWidth="100" FontSize="18" Binding="{Binding orderQuantity}"/>-->
<DataGridTemplateColumn Header="操作" Width="280" IsReadOnly="True"> <DataGridTemplateColumn Header="操作" Width="250" MinWidth="250" IsReadOnly="True">
<DataGridTemplateColumn.CellTemplate> <DataGridTemplateColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center"> <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
......
LiteChannel/Models/order_info.cs
...@@ -11,6 +11,7 @@ namespace LiteChannel.Models ...@@ -11,6 +11,7 @@ namespace LiteChannel.Models
public string id { get; set; } public string id { get; set; }
public string warehouseId { get; set; } public string warehouseId { get; set; }
public string orderCode { get; set; } public string orderCode { get; set; }
public string orderCodeLast6 => orderCode.Substring(16);
public string orgId { get; set; } public string orgId { get; set; }
public string createTime { get; set; } public string createTime { get; set; }
public bool? isWork { get; set; } public bool? isWork { get; set; }
......
LiteChannel/OrderInfoWindows.xaml.cs
...@@ -34,7 +34,7 @@ namespace LiteChannel ...@@ -34,7 +34,7 @@ namespace LiteChannel
dg_detail.AutoGenerateColumns = false; dg_detail.AutoGenerateColumns = false;
if (type == "借用" || type == "库存调拨") if (type == "借用" || type == "库存调拨" || type == "销毁")
{ {
bt_CloseOrder.Visibility = Visibility.Visible; bt_CloseOrder.Visibility = Visibility.Visible;
} }
...@@ -58,6 +58,10 @@ namespace LiteChannel ...@@ -58,6 +58,10 @@ namespace LiteChannel
{ {
orderType = "Transfer"; orderType = "Transfer";
} }
if (type == "销毁")
{
orderType = "Destruction";
}
if (HttpHelper.CloseOrder(id, orderType)) if (HttpHelper.CloseOrder(id, orderType))
{ {
......
LiteChannel/Properties/AssemblyInfo.cs
...@@ -51,5 +51,5 @@ using System.Windows; ...@@ -51,5 +51,5 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示: //通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.6.10240")] [assembly: AssemblyVersion("1.2.9.10272")]
[assembly: AssemblyFileVersion("1.2.6.10240")] [assembly: AssemblyFileVersion("1.2.9.10272")]
LiteChannel/StoreOutWindow.xaml.cs
...@@ -94,7 +94,23 @@ namespace LiteChannel ...@@ -94,7 +94,23 @@ namespace LiteChannel
equRem = s.equCount - s.equUsed, equRem = s.equCount - s.equUsed,
equCount = s.equCount equCount = s.equCount
}); });
SourcesList.Add(new scan_info()
{
epcList = new List<string>(),
equCode = s.equCode,
equName = s.equName,
scanQty = 0,
equCount = s.equCount,
equRem = s.equCount - s.equUsed
});
}); });
Dispatcher.BeginInvoke(DispatcherPriority.Background,
new Action<List<scan_info>>((x) =>
{
RefreshSourcesList = new ObservableCollection<scan_info>(x);
dg_epc.ItemsSource = RefreshSourcesList;
}), SourcesList);
ConnectReader(); ConnectReader();
EpcHandleTask(tokenSource.Token); EpcHandleTask(tokenSource.Token);
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论