ICM-WCS/wcs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交代码

Browse Source
This commit is contained in:
hehaibing-1996
2024-05-03 11:04:59 +08:00
parent 97888c6978
commit d283924ae1
48 changed files with 802 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
货架标准上位机/Views/MatInventoryDetailView.xaml
View File

@ -108,8 +108,21 @@
Content=" 导 出" FontFamily="{StaticResource IconFont}"
Style="{StaticResource ButtonWarning}" Background="DarkOrange">
</Button>
<Button MinHeight="40" FontSize="18" Margin="5" Command="{Binding BtnGenerateOutstoreCommand}"
Content="&#xe67d; 搜索结果出库" FontFamily="{StaticResource IconFont}"
Style="{StaticResource ButtonWarning}" Background="IndianRed">
</Button>
<Button MinHeight="40" FontSize="18" Margin="5" Command="{Binding BtnGenerateStocktakingCommand}"
Content="&#xe65f; 搜索结果盘点" FontFamily="{StaticResource IconFont}"
Style="{StaticResource ButtonWarning}" Background="IndianRed">
</Button>
</StackPanel>
<DataGrid Grid.Row="1"
SelectedCellsChanged="DataGrid_SelectedCellsChanged"
ItemsSource="{Binding DataGridItemSource}"
@ -123,9 +136,7 @@
<DataGridTextColumn MaxWidth="100" Header="批次" Binding="{Binding MatBatch}"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="True" Header="数量" Binding="{Binding MatQty}"></DataGridTextColumn>
<DataGridTextColumn Header="库位" Binding="{Binding StoreCode}"></DataGridTextColumn>
<!--<DataGridTextColumn IsReadOnly="True" Header="R" Binding="{Binding R}"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="True" Header="C" Binding="{Binding C}"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="True" Header="位" Binding="{Binding Wei}"></DataGridTextColumn>-->
<DataGridTextColumn IsReadOnly="True" Header="已锁定" Binding="{Binding IsLockedStr}"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="True" Header="入库时间" Binding="{Binding InstoreTime,StringFormat='yyyy-MM-dd HH:mm:ss'}"></DataGridTextColumn>
<DataGridTextColumn Header="物料SN" Binding="{Binding MatSN}"></DataGridTextColumn>
</DataGrid.Columns>

58
货架标准上位机/Views/OutInventoryView.xaml
View File

@ -31,12 +31,12 @@
<Button Style="{StaticResource ButtonSuccess}" hc:BorderElement.CornerRadius="15"
Grid.Column="3" MinHeight="45" FontSize="28" Content="&#xec61;完整发料" FontFamily="{StaticResource IconFont}"
Grid.Column="3" MinHeight="45" FontSize="28" Content="&#xec61;开始发料" FontFamily="{StaticResource IconFont}"
Command="{Binding BtnStartCommand}"
>
</Button>
<Button Style="{StaticResource ButtonWarning}" hc:BorderElement.CornerRadius="15"
Grid.Column="4" MinHeight="45" FontSize="28" Content="&#xe61b;取消发料" FontFamily="{StaticResource IconFont}"
Grid.Column="4" MinHeight="45" FontSize="28" Content="&#xe61b;暂停发料" FontFamily="{StaticResource IconFont}"
Command="{Binding BtnPauseCommand}">
</Button>
</Grid>
@ -64,7 +64,7 @@
<StackPanel Grid.Column="2" VerticalAlignment="Center" Orientation="Horizontal">
<TextBlock FontSize="26" Text="发料单号：">
</TextBlock>
<TextBlock FontSize="26" Text="{Binding SelectedPickBillNumber}">
<TextBlock FontSize="26" Text="{Binding SelectedOutOrderNumber}">
</TextBlock>
</StackPanel>
</Grid>
@ -88,12 +88,21 @@
<RowDefinition Height="1*"></RowDefinition>
<RowDefinition Height="12*"></RowDefinition>
</Grid.RowDefinitions>
<!--<Border CornerRadius="3" Margin="1 1 1 0" Grid.Row="0" Background="AliceBlue" BorderBrush="CadetBlue" BorderThickness="1.5">-->
<TextBlock Text="发料单列表" FontWeight="DemiBold" FontSize="24" HorizontalAlignment="Center" VerticalAlignment="Center" TextAlignment="Center"></TextBlock>
<!--</Border>-->
<Border CornerRadius="3" Margin="1" Grid.Row="1" Background="AliceBlue" BorderBrush="CadetBlue" BorderThickness="1.5">
<ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Visible">
<ListView FontSize="18" ItemsSource="{Binding PickBillNumberList}" SelectedItem="{Binding SelectedPickBillNumber}" PreviewMouseWheel="ListView_PreviewMouseWheel">
<ListView FontSize="18" ItemsSource="{Binding OutOrderList}" SelectedItem="{Binding SelectedOutOrder,Mode=TwoWay}" PreviewMouseWheel="ListView_PreviewMouseWheel">
<ListView.View>
<GridView AllowsColumnReorder="False">
<GridView.ColumnHeaderContainerStyle>
<Style TargetType="{x:Type GridViewColumnHeader}">
<Setter Property="Visibility" Value="Collapsed"/>
</Style>
</GridView.ColumnHeaderContainerStyle>
<GridViewColumn DisplayMemberBinding="{Binding OrderNumber}"/>
</GridView>
</ListView.View>
</ListView>
</ScrollViewer>
</Border>
@ -102,18 +111,18 @@
<Border CornerRadius="3" Margin="1" Grid.Row="0" Grid.Column="1" Background="AliceBlue" BorderBrush="CadetBlue" BorderThickness="1.5">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="1*"></RowDefinition>
<!--<RowDefinition Height="1*"></RowDefinition>-->
<RowDefinition Height="12*"></RowDefinition>
</Grid.RowDefinitions>
<StackPanel VerticalAlignment="Center" Orientation="Horizontal" >
<TextBlock Text="订单号：" FontSize="24">
<!--<StackPanel VerticalAlignment="Center" Orientation="Horizontal" >
<TextBlock FontSize="24">
</TextBlock>
<TextBlock Text="{Binding OrderProdNumber}" FontSize="24">
<TextBlock Text="{Binding SelectedOutOrderNumber}" FontSize="24">
</TextBlock>
</StackPanel>
</StackPanel>-->
<DataGrid Grid.Row="2"
<DataGrid Grid.Row="0"
SelectedCellsChanged="DataGrid_SelectedCellsChanged"
ItemsSource="{Binding DataGridItemSource}"
RowHeight="40"
@ -121,39 +130,22 @@
<DataGrid.Resources>
<货架标准上位机:WorkItemBackgroundConverter x:Key="converter"/>
</DataGrid.Resources>
<DataGrid.RowStyle>
<Style TargetType="DataGridRow">
<Setter Property="Background" Value="{Binding Path=IsSend, Converter={StaticResource converter}}"/>
<Setter Property="Background" Value="{Binding Path=IsSended, Converter={StaticResource converter}}"/>
</Style>
</DataGrid.RowStyle>
<DataGrid.Columns>
<!--<DataGridTemplateColumn CanUserResize="False">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<CheckBox Width="30" Height="30"
Checked="CheckBox_Checked"
Unchecked="CheckBox_Checked"
IsChecked="{Binding IsSelected , UpdateSourceTrigger=PropertyChanged}"/>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
<DataGridTemplateColumn.HeaderTemplate>
<DataTemplate>
<CheckBox Width="30" Height="30" Unchecked="allChecked_Unchecked" Checked="allChecked_Checked" Name="allChecked"/>
</DataTemplate>
</DataGridTemplateColumn.HeaderTemplate>
</DataGridTemplateColumn>-->
<DataGridTextColumn IsReadOnly="True" Header="序号" Binding="{Binding RowNumber}"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="True" Header="库位" Binding="{Binding StoreCode}"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="True" Header="物料编码" Binding="{Binding MatCode}"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="True" Header="数量" Binding="{Binding MatQty}"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="True" Header="物料名称" Binding="{Binding MatName}"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="True" Header="数量" Binding="{Binding MatQty}"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="True" Header="规格" Binding="{Binding MatSpec}"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="True" Header="批次" Binding="{Binding MatBatch}"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="True" Header="是否已取料" Binding="{Binding IsSendStr}"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="False" Header="最小包装条码" Binding="{Binding MatSN}"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="True" Header="已取料" Binding="{Binding IsSendedStr}"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="False" Header="物料SN" Binding="{Binding MatSN}"></DataGridTextColumn>
</DataGrid.Columns>
</DataGrid>
</Grid>

50
货架标准上位机/Views/OutInventoryView.xaml.cs
View File

@ -19,10 +19,11 @@ namespace 货架标准上位机
{
public partial class OutVentoryView : UserControlBase
{
public static OutInventoryViewModel viewModel = new OutInventoryViewModel();
public OutVentoryView()
{
InitializeComponent();
this.DataContext = new OutInventoryViewModel();
this.DataContext = viewModel;
}
private void DataGrid_SelectedCellsChanged(object sender, SelectedCellsChangedEventArgs e)
@ -34,12 +35,7 @@ namespace 货架标准上位机
var index = datagrid.SelectedIndex;
if (index >= 0)
{
//if (viewModel.DataGridItemSource != null && viewModel.DataGridItemSource.Count() > index)
//{
// var data = viewModel.DataGridItemSource.ElementAt(index);
// //data.IsSelected = !data.IsSelected;
// viewModel.DataGridItemSource = viewModel.DataGridItemSource.ToList();
//}
}
datagrid.UnselectAllCells();
}
@ -49,46 +45,6 @@ namespace 货架标准上位机
}
}
private void allChecked_Checked(object sender, RoutedEventArgs e)
{
//var viewMode = this.DataContext as OutInventoryViewModel;
//if (viewMode != null && viewMode.DataGridItemSource != null && viewMode.DataGridItemSource.Count() > 0)
//{
// foreach (var item in viewMode.DataGridItemSource)
// {
// //item.IsSelected = true;
// }
// viewMode.DataGridItemSource = viewMode.DataGridItemSource.ToList();
//}
}
private void allChecked_Unchecked(object sender, RoutedEventArgs e)
{
//var viewMode = this.DataContext as OutInventoryViewModel;
//if (viewMode != null && viewMode.DataGridItemSource != null && viewMode.DataGridItemSource.Count() > 0)
//{
// foreach (var item in viewMode.DataGridItemSource)
// {
// //item.IsSelected = false;
// }
// viewMode.DataGridItemSource = viewMode.DataGridItemSource.ToList();
//}
}
private void CheckBox_Checked(object sender, RoutedEventArgs e)
{
//var viewMode = this.DataContext as OutInventoryViewModel;
//viewMode.RefreshCount();
}
private void txtMatQty1_PreviewTextInput(object sender, TextCompositionEventArgs e)
{
if (!Regex.IsMatch(e.Text, "^[0-9]"))
{
e.Handled = true;
}
}
private void ListView_PreviewMouseWheel(object sender, MouseWheelEventArgs e)
{
if (!e.Handled)

4
货架标准上位机/Views/Windows/UserLoginView.xaml.cs
View File

@ -74,14 +74,14 @@ namespace 货架标准上位机
};
var Result = ApiHelp.GetDataFromHttp<ResponseBase<UserModel>>(LocalFile.Config.ApiIpHost + "user/userLogin",
body, "POST");
if (Result.Code != 200 || Result.Data == null)
if (Result!= null && Result.Code != 200)
{
HandyControl.Controls.MessageBox.Warning(Result.Message, "提示");
return;
}
else
{
viewModel.User = Result.Data;
viewModel.User = Result?.Data;
}
}
catch (Exception ex)