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

Merge branch '软著申请修改' into 煤科院货架液晶显示屏

Browse Source
This commit is contained in:
hehaibing-1996
2024-10-31 13:58:02 +08:00
parent 21d12b0003 baa7b9716c
commit 0386f95bc2
14 changed files with 12 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
WCS.WebApi/Controllers/FileDownLoadController.cs
View File

@ -20,12 +20,9 @@ namespace WCS.WebApi.Controllers
[Route("[controller]")] [Route("[controller]")]
public class FileDownLoadController : ControllerBase public class FileDownLoadController : ControllerBase
{ {
public FileDownLoadController() public FileDownLoadController()
{ {
} }
[HttpPost("uploadApp")] [HttpPost("uploadApp")]
public async Task<ResponseBase> uploadApp([FromForm] IFormFile excelFile, [FromForm] string version, [FromForm] string content) public async Task<ResponseBase> uploadApp([FromForm] IFormFile excelFile, [FromForm] string version, [FromForm] string content)
{ {
@ -75,7 +72,6 @@ namespace WCS.WebApi.Controllers
{ {
await excelFile.CopyToAsync(stream); await excelFile.CopyToAsync(stream);
} }
#region 保存数据 #region 保存数据
var appVersion = new AppVersion() var appVersion = new AppVersion()
{ {
@ -85,7 +81,6 @@ namespace WCS.WebApi.Controllers
}; };
DbHelp.db.Insertable(appVersion).ExecuteCommand(); DbHelp.db.Insertable(appVersion).ExecuteCommand();
#endregion #endregion
// 文件上传成功，返回成功信息 // 文件上传成功，返回成功信息
return new ResponseCommon() return new ResponseCommon()
{ {
@ -103,20 +98,16 @@ namespace WCS.WebApi.Controllers
}; };
} }
} }
[HttpGet("downloadApp")] [HttpGet("downloadApp")]
public IActionResult downloadApp(string fileName) public IActionResult downloadApp(string fileName)
{ {
// 这里是文件的物理路径，你需要根据实际情况提供 // 这里是文件的物理路径，你需要根据实际情况提供
var filePath = Path.Combine(Directory.GetCurrentDirectory(), $"Files/{fileName}"); var filePath = Path.Combine(Directory.GetCurrentDirectory(), $"Files/{fileName}");
// 检查文件是否存在 // 检查文件是否存在
if (!System.IO.File.Exists(filePath)) if (!System.IO.File.Exists(filePath))
{ {
return NotFound(); return NotFound();
} }
// 获取文件流 // 获取文件流
var stream = System.IO.File.OpenRead(filePath); var stream = System.IO.File.OpenRead(filePath);
// 设置HTTP响应头，使浏览器知道这是一个附件，应该下载而不是打开 // 设置HTTP响应头，使浏览器知道这是一个附件，应该下载而不是打开
@ -134,7 +125,6 @@ namespace WCS.WebApi.Controllers
FileInfo[] files = Directory.GetFiles(directoryPath, "*.APK") FileInfo[] files = Directory.GetFiles(directoryPath, "*.APK")
.Select(file => new FileInfo(file)) .Select(file => new FileInfo(file))
.ToArray(); .ToArray();
if (files == null || files.Length == 0) if (files == null || files.Length == 0)
{ {
return new ResponseCommon<string>() return new ResponseCommon<string>()
@ -160,7 +150,6 @@ namespace WCS.WebApi.Controllers
Code = 201, Code = 201,
Message = "服务器不存在App安装包" Message = "服务器不存在App安装包"
}; };
} }
} }

2
WCS.WebApi/Program.cs
View File

@ -1,4 +1,3 @@
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Server.Kestrel.Core;
using System.Configuration; using System.Configuration;
@ -88,7 +87,6 @@ namespace WebApi
builder.Services.AddScoped<IWarningService, WarningService>(); builder.Services.AddScoped<IWarningService, WarningService>();
builder.Services.AddScoped<IInOutRecordService, InOutRecordService>(); builder.Services.AddScoped<IInOutRecordService, InOutRecordService>();
builder.Services.AddScoped<IUploadService, UploadService>(); builder.Services.AddScoped<IUploadService, UploadService>();
builder.Services.AddScoped<ISingleLightService, SingleLightService>(); builder.Services.AddScoped<ISingleLightService, SingleLightService>();
builder.Services.AddScoped<IMXL4Service, MXL4Service>(); builder.Services.AddScoped<IMXL4Service, MXL4Service>();

3
货架标准上位机/ViewModels/HomeViewModel.cs
View File

@ -39,12 +39,10 @@ namespace 智能仓储WCS管理系统.ViewModel
Thread.Sleep(2000); Thread.Sleep(2000);
} }
}); });
#region 启动自检 #region 启动自检
SelfCheck(); SelfCheck();
#endregion #endregion
} }
#region 绑定 #region 绑定
private string textErr; private string textErr;
/// <summary> /// <summary>
@ -146,7 +144,6 @@ namespace 智能仓储WCS管理系统.ViewModel
#endregion #endregion
} }
#endregion #endregion
#region 页面加载时任务 #region 页面加载时任务
/// <summary> /// <summary>
/// 页面第一次加载时执行的任务 /// 页面第一次加载时执行的任务

5
货架标准上位机/ViewModels/InInventoryViewModel.cs
View File

@ -121,11 +121,9 @@ namespace 智能仓储WCS管理系统.ViewModel
} }
catch (Exception ex) catch (Exception ex)
{ {
} }
finally finally
{ {
} }
}); });
} }
@ -207,7 +205,6 @@ namespace 智能仓储WCS管理系统.ViewModel
} }
} }
} }
/// <summary> /// <summary>
/// 扫到模组码的数据处理 /// 扫到模组码的数据处理
/// </summary> /// </summary>
@ -257,7 +254,6 @@ namespace 智能仓储WCS管理系统.ViewModel
#endregion #endregion
} }
} }
//调用接口 本次扫码的货架进入入库模式 //调用接口 本次扫码的货架进入入库模式
#region 调用接口进入入库模式 #region 调用接口进入入库模式
try try
@ -392,7 +388,6 @@ namespace 智能仓储WCS管理系统.ViewModel
} }
#endregion #endregion
} }
public ICommand BtnEndCommand { get => new DelegateCommand(BtnEnd); } public ICommand BtnEndCommand { get => new DelegateCommand(BtnEnd); }
public void BtnEnd() public void BtnEnd()
{ {

2
货架标准上位机/ViewModels/OutInventoryViewModel.cs
View File

@ -33,7 +33,6 @@ namespace 智能仓储WCS管理系统.ViewModel
{ {
RefreshOutOrderList(); RefreshOutOrderList();
} }
#region Property #region Property
private OutOrderModel selectedOutOrder; private OutOrderModel selectedOutOrder;
public OutOrderModel SelectedOutOrder public OutOrderModel SelectedOutOrder
@ -124,7 +123,6 @@ namespace 智能仓储WCS管理系统.ViewModel
}); });
} }
#endregion #endregion
#region Command #region Command
public ICommand BtnOutOrderCommand { get => new DelegateCommand(BtnOutOrder); } public ICommand BtnOutOrderCommand { get => new DelegateCommand(BtnOutOrder); }
public void BtnOutOrder() public void BtnOutOrder()

39
货架标准上位机/Views/HomeView.xaml
View File

@ -17,7 +17,6 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<!--内容区--> <!--内容区-->
<!--<Grid Grid.Row="0" Margin="5,5,5,0">-->
<!--货架状态显示区--> <!--货架状态显示区-->
<Border Grid.Row="0" Margin="5,5,5,0" BorderThickness="1" Background="White" BorderBrush="DodgerBlue" CornerRadius="3"> <Border Grid.Row="0" Margin="5,5,5,0" BorderThickness="1" Background="White" BorderBrush="DodgerBlue" CornerRadius="3">
<hc:ScrollViewer IsInertiaEnabled="True" hc:ScrollViewerAttach.AutoHide="False"> <hc:ScrollViewer IsInertiaEnabled="True" hc:ScrollViewerAttach.AutoHide="False">
@ -25,36 +24,18 @@
</WrapPanel> </WrapPanel>
</hc:ScrollViewer> </hc:ScrollViewer>
</Border> </Border>
<!--</Grid>-->
<!--消息区--> <!--消息区-->
<Border Grid.Row="1" Margin="5" Height="auto" BorderThickness="1" Background="White" BorderBrush="DodgerBlue" CornerRadius="3"> <Border Grid.Row="1" Margin="5" Height="auto" BorderThickness="1" Background="White" BorderBrush="DodgerBlue" CornerRadius="3">
<!--<Grid> <GroupBox Grid.Column="1" Background="White" Padding="0" Style="{StaticResource GroupBoxTab}" >
<Grid.ColumnDefinitions> <GroupBox.Header>
--><!--<ColumnDefinition Width="4*"/>--><!-- <Grid Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type GroupBox}}}">
<ColumnDefinition Width="6*"/> <TextBlock Margin="5,0" HorizontalAlignment="Left" VerticalAlignment="Center">日志</TextBlock>
</Grid.ColumnDefinitions>--> <Button Grid.Row="2" Command="{Binding SelfCheckCommand}" Background="AliceBlue" Content="手 动 自 检" ></Button>
<!--报警--><!-- <Button HorizontalAlignment="Right" Height="25" Margin="10,0" Padding="10,0" FontFamily="{StaticResource IconFont}" Command="{Binding ClearTextInfoCommand}">&#xe652; 清空</Button>
<GroupBox Grid.Column="0" Background="White" Padding="0" Style="{StaticResource GroupBoxTab}" Margin="5,5,5,5"> </Grid>
<GroupBox.Header> </GroupBox.Header>
<Grid Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type GroupBox}}}"> <pi:TextBoxLog Token="selfCheck" Style="{StaticResource TextBoxExtend.Multi}" Margin="-1" hc:InfoElement.Placeholder="没有日志信息" Foreground="CornflowerBlue"></pi:TextBoxLog>
<TextBlock Margin="5,0" HorizontalAlignment="Left" VerticalAlignment="Center">报警</TextBlock> </GroupBox>
<Button HorizontalAlignment="Right" Height="25" Margin="10,0" Padding="10,0" FontFamily="{StaticResource IconFont}" Command="{Binding ClearTextErrCommand}">&#xe652; 清除</Button>
</Grid>
</GroupBox.Header>
<TextBox Style="{StaticResource TextBoxExtend.Multi}" IsReadOnly="True" Margin="-1" Text="{Binding TextErr}" Foreground="Tomato" hc:InfoElement.Placeholder="没有报警信息"></TextBox>
</GroupBox>-->
<!--日志-->
<GroupBox Grid.Column="1" Background="White" Padding="0" Style="{StaticResource GroupBoxTab}" >
<GroupBox.Header>
<Grid Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type GroupBox}}}">
<TextBlock Margin="5,0" HorizontalAlignment="Left" VerticalAlignment="Center">日志</TextBlock>
<Button Grid.Row="2" Command="{Binding SelfCheckCommand}" Background="AliceBlue" Content="手 动 自 检" ></Button>
<Button HorizontalAlignment="Right" Height="25" Margin="10,0" Padding="10,0" FontFamily="{StaticResource IconFont}" Command="{Binding ClearTextInfoCommand}">&#xe652; 清空</Button>
</Grid>
</GroupBox.Header>
<pi:TextBoxLog Token="selfCheck" Style="{StaticResource TextBoxExtend.Multi}" Margin="-1" hc:InfoElement.Placeholder="没有日志信息" Foreground="CornflowerBlue"></pi:TextBoxLog>
</GroupBox>
<!--</Grid>-->
</Border> </Border>
</Grid> </Grid>

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

@ -25,13 +25,11 @@ namespace 智能仓储WCS管理系统
public partial class HomeView : UserControlBase public partial class HomeView : UserControlBase
{ {
public static HomeViewModel viewModel = new HomeViewModel(); public static HomeViewModel viewModel = new HomeViewModel();
public HomeView() public HomeView()
{ {
InitializeComponent(); InitializeComponent();
this.DataContext = viewModel; this.DataContext = viewModel;
} }
private void loadFir(object sender, EventArgs e) private void loadFir(object sender, EventArgs e)
{ {
viewModel.wrapPanel = shelfsWrapPanel; viewModel.wrapPanel = shelfsWrapPanel;
@ -40,8 +38,6 @@ namespace 智能仓储WCS管理系统
viewModel.LoadTask(); viewModel.LoadTask();
} }
private void vis(object sender, DependencyPropertyChangedEventArgs e) private void vis(object sender, DependencyPropertyChangedEventArgs e)
{ {
if (IsInDesignMode) if (IsInDesignMode)

10
货架标准上位机/Views/InInventoryView.xaml
View File

@ -39,7 +39,6 @@
</StackPanel> </StackPanel>
</Grid> </Grid>
</Border> </Border>
<Grid Grid.Row="1"> <Grid Grid.Row="1">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="3*"></ColumnDefinition> <ColumnDefinition Width="3*"></ColumnDefinition>
@ -53,20 +52,12 @@
<TextBlock Margin="5" FontWeight="Bold" FontSize="24" Text="停止入库码"></TextBlock> <TextBlock Margin="5" FontWeight="Bold" FontSize="24" Text="停止入库码"></TextBlock>
<Image Margin="5" Width="125" Height="125" Source="/Resources/goOutInstore.png"></Image> <Image Margin="5" Width="125" Height="125" Source="/Resources/goOutInstore.png"></Image>
</StackPanel> </StackPanel>
<!--<GroupBox Grid.Column="1" Header="停止入库码" Padding="10">-->
<!--<Border Background="{DynamicResource RegionBrush}" CornerRadius="4">-->
<!--</Border>-->
<!--</GroupBox>-->
</Grid> </Grid>
<Border Grid.Row="2" Margin="5,5,5,5" BorderThickness="1" Background="White" BorderBrush="DodgerBlue" CornerRadius="3"> <Border Grid.Row="2" Margin="5,5,5,5" BorderThickness="1" Background="White" BorderBrush="DodgerBlue" CornerRadius="3">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*"></ColumnDefinition> <ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<GroupBox Grid.Column="1" Background="White" Padding="0" Style="{StaticResource GroupBoxTab}"> <GroupBox Grid.Column="1" Background="White" Padding="0" Style="{StaticResource GroupBoxTab}">
<GroupBox.Header> <GroupBox.Header>
<Grid Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type GroupBox}}}"> <Grid Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type GroupBox}}}">
@ -78,7 +69,6 @@
</GroupBox> </GroupBox>
</Grid> </Grid>
</Border> </Border>
</Grid> </Grid>
</Border> </Border>
</pi:UserControlBase> </pi:UserControlBase>

7
货架标准上位机/Views/InInventoryView.xaml.cs
View File

@ -27,8 +27,7 @@ namespace 智能仓储WCS管理系统
{ {
InitializeComponent(); InitializeComponent();
this.DataContext = viewModel; this.DataContext = viewModel;
//初始化扫码枪
var scanners = ScannerManager.Scanners.Select(t => t).ToList(); var scanners = ScannerManager.Scanners.Select(t => t).ToList();
scanners.ForEach(t => scanners.ForEach(t =>
{ {
@ -45,24 +44,20 @@ namespace 智能仓储WCS管理系统
private void UserControlBase_Loaded(object sender, RoutedEventArgs e) private void UserControlBase_Loaded(object sender, RoutedEventArgs e)
{ {
} }
private void Border_MouseUp(object sender, MouseButtonEventArgs e) private void Border_MouseUp(object sender, MouseButtonEventArgs e)
{ {
} }
private void UserControlBase_LoadedVisibleFirst(object sender, EventArgs e) private void UserControlBase_LoadedVisibleFirst(object sender, EventArgs e)
{ {
if (IsInDesignMode) if (IsInDesignMode)
return; return;
} }
private void UserControlBase_LoadedVisible(object sender, EventArgs e) private void UserControlBase_LoadedVisible(object sender, EventArgs e)
{ {
} }
private void Button_PreviewKeyDown(object sender, KeyEventArgs e) private void Button_PreviewKeyDown(object sender, KeyEventArgs e)

25
货架标准上位机/Views/MainWindows/MainWindow1.xaml
View File

@ -15,7 +15,6 @@
<hc:Window.NonClientAreaContent> <hc:Window.NonClientAreaContent>
<StackPanel HorizontalAlignment="Right"> <StackPanel HorizontalAlignment="Right">
<Menu Height="29" Background="#FFDCEEFF"> <Menu Height="29" Background="#FFDCEEFF">
<!--<MenuItem Height="29" Command="{Binding OpenUserCommand}" Visibility="{Binding IsLogin,Converter={StaticResource Boolean2VisibilityConverter}}">-->
<MenuItem Height="29" Command="{Binding OpenUserCommand}"> <MenuItem Height="29" Command="{Binding OpenUserCommand}">
<MenuItem.Header> <MenuItem.Header>
<TextBlock Text="{Binding LoginName,Source={x:Static local:UserInfoView.viewModel},TargetNullValue=登录}" Foreground="DimGray" Margin="-5,0"></TextBlock> <TextBlock Text="{Binding LoginName,Source={x:Static local:UserInfoView.viewModel},TargetNullValue=登录}" Foreground="DimGray" Margin="-5,0"></TextBlock>
@ -24,26 +23,6 @@
<TextBlock Text="&#xe61a;" FontSize="16" FontFamily="{StaticResource IconFont}"></TextBlock> <TextBlock Text="&#xe61a;" FontSize="16" FontFamily="{StaticResource IconFont}"></TextBlock>
</MenuItem.Icon> </MenuItem.Icon>
</MenuItem> </MenuItem>
<!--<MenuItem Height="29" Width="35" Header="">
<MenuItem.Icon>
<TextBlock Text="&#xe62b;" FontSize="15" FontFamily="{StaticResource IconFont}"></TextBlock>
</MenuItem.Icon>
<MenuItem Width="120" Header="蓝色">
<MenuItem.Icon>
<TextBlock Text="&#xe604;" Foreground="Blue" FontSize="16" FontFamily="{StaticResource IconFont}"></TextBlock>
</MenuItem.Icon>
</MenuItem>
<MenuItem Width="120" Header="紫色">
<MenuItem.Icon>
<TextBlock Text="&#xe604;" Foreground="Purple" FontSize="16" FontFamily="{StaticResource IconFont}"></TextBlock>
</MenuItem.Icon>
</MenuItem>
<MenuItem Width="120" Header="黑夜">
<MenuItem.Icon>
<TextBlock Text="&#xe604;" Foreground="Black" FontSize="16" FontFamily="{StaticResource IconFont}"></TextBlock>
</MenuItem.Icon>
</MenuItem>
</MenuItem>-->
<MenuItem Height="29" Width="35"> <MenuItem Height="29" Width="35">
<MenuItem.Icon> <MenuItem.Icon>
<TextBlock Text="&#xe617;" FontSize="15" FontFamily="{StaticResource IconFont}"></TextBlock> <TextBlock Text="&#xe617;" FontSize="15" FontFamily="{StaticResource IconFont}"></TextBlock>
@ -287,10 +266,6 @@
<!--状态栏--> <!--状态栏-->
<Border Margin="5,3" Grid.Row="2" Grid.ColumnSpan="2" Background="AliceBlue" CornerRadius="3"> <Border Margin="5,3" Grid.Row="2" Grid.ColumnSpan="2" Background="AliceBlue" CornerRadius="3">
<Grid> <Grid>
<!--<StackPanel Margin="5" Orientation="Horizontal" HorizontalAlignment="Left">
<pi:IotState Content="WebSocket连接" IsOk="False" Height="auto" Width="auto" InteriorHeight="13" Foreground="Gray" Background="{x:Null}"></pi:IotState>
<Button Content="手动重连" ></Button>
</StackPanel>-->
<StackPanel Margin="5" Orientation="Horizontal" HorizontalAlignment="Right"> <StackPanel Margin="5" Orientation="Horizontal" HorizontalAlignment="Right">
<TextBlock Margin="0,0" Text="{Binding Time,StringFormat=yyyy-MM-dd HH:mm:ss,FallbackValue=2000-01-01 00:00:00}" Foreground="#FF3A90C1" VerticalAlignment="Center"></TextBlock> <TextBlock Margin="0,0" Text="{Binding Time,StringFormat=yyyy-MM-dd HH:mm:ss,FallbackValue=2000-01-01 00:00:00}" Foreground="#FF3A90C1" VerticalAlignment="Center"></TextBlock>
</StackPanel> </StackPanel>

16
货架标准上位机/Views/OutInventoryDocumentView.xaml
View File

@ -43,15 +43,12 @@
<TextBox Grid.Column="3" Text="{Binding OrderType}" <TextBox Grid.Column="3" Text="{Binding OrderType}"
VerticalAlignment="Center" HorizontalAlignment="Left" VerticalAlignment="Center" HorizontalAlignment="Left"
FontSize="18" MinWidth="120" ></TextBox> FontSize="18" MinWidth="120" ></TextBox>
<TextBlock Grid.Row="1" Grid.Column="0" <TextBlock Grid.Row="1" Grid.Column="0"
VerticalAlignment="Center" HorizontalAlignment="Right" VerticalAlignment="Center" HorizontalAlignment="Right"
Text="单据来源：" FontSize="18" ></TextBlock> Text="单据来源：" FontSize="18" ></TextBlock>
<TextBox Grid.Row="1" Grid.Column="1" Text="{Binding OrderSource}" <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding OrderSource}"
VerticalAlignment="Center" HorizontalAlignment="Left" VerticalAlignment="Center" HorizontalAlignment="Left"
FontSize="18" MinWidth="120" ></TextBox> FontSize="18" MinWidth="120" ></TextBox>
<Button Style="{StaticResource ButtonSuccess}" <Button Style="{StaticResource ButtonSuccess}"
Command="{Binding BtnSearchCommand}" Command="{Binding BtnSearchCommand}"
hc:BorderElement.CornerRadius="15" hc:BorderElement.CornerRadius="15"
@ -62,10 +59,8 @@
hc:BorderElement.CornerRadius="15" hc:BorderElement.CornerRadius="15"
Grid.Column="7" MinHeight="40" FontSize="18" Content="&#xe652; 重置" FontFamily="{StaticResource IconFont}" Margin="0,0,0,-10" > Grid.Column="7" MinHeight="40" FontSize="18" Content="&#xe652; 重置" FontFamily="{StaticResource IconFont}" Margin="0,0,0,-10" >
</Button> </Button>
</Grid> </Grid>
</Border> </Border>
<Border Grid.Row="1" Margin="2" Background="AliceBlue" CornerRadius="5" Padding="0"> <Border Grid.Row="1" Margin="2" Background="AliceBlue" CornerRadius="5" Padding="0">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
@ -77,11 +72,9 @@
<Button MinHeight="40" FontSize="18" Margin="5" Command="{Binding BtnOrderDetailCommand}" <Button MinHeight="40" FontSize="18" Margin="5" Command="{Binding BtnOrderDetailCommand}"
Content="&#xe6e2;单据明细" FontFamily="{StaticResource IconFont}" Background="#bccbb0" Foreground="White"> Content="&#xe6e2;单据明细" FontFamily="{StaticResource IconFont}" Background="#bccbb0" Foreground="White">
</Button> </Button>
<Button MinHeight="40" FontSize="18" Margin="5" Command="{Binding BtnOrderMatDetailCommand}" <Button MinHeight="40" FontSize="18" Margin="5" Command="{Binding BtnOrderMatDetailCommand}"
Content="&#xe6e2;发料明细" FontFamily="{StaticResource IconFont}" Background="#bccbb0" Foreground="White"> Content="&#xe6e2;发料明细" FontFamily="{StaticResource IconFont}" Background="#bccbb0" Foreground="White">
</Button> </Button>
<Button MinHeight="40" FontSize="18" Margin="5" Command="{Binding BtnStartCommand}" <Button MinHeight="40" FontSize="18" Margin="5" Command="{Binding BtnStartCommand}"
Content="&#xec61;开始发料" FontFamily="{StaticResource IconFont}" Background="CadetBlue" Foreground="White"> Content="&#xec61;开始发料" FontFamily="{StaticResource IconFont}" Background="CadetBlue" Foreground="White">
</Button> </Button>
@ -127,7 +120,6 @@
<DataGridTextColumn IsReadOnly="True" Header="创建人" Binding="{Binding CreateUser}"></DataGridTextColumn> <DataGridTextColumn IsReadOnly="True" Header="创建人" Binding="{Binding CreateUser}"></DataGridTextColumn>
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>
<Grid Grid.Row="2"> <Grid Grid.Row="2">
<Border CornerRadius="3" Background="Transparent" VerticalAlignment="Center" > <Border CornerRadius="3" Background="Transparent" VerticalAlignment="Center" >
<Grid HorizontalAlignment="Stretch" Margin="0" VerticalAlignment="Top" Width="Auto" MinHeight="26"> <Grid HorizontalAlignment="Stretch" Margin="0" VerticalAlignment="Top" Width="Auto" MinHeight="26">
@ -144,15 +136,11 @@
<TextBlock FontSize="14" VerticalAlignment="Center" Text="共"></TextBlock> <TextBlock FontSize="14" VerticalAlignment="Center" Text="共"></TextBlock>
<TextBlock FontSize="14" VerticalAlignment="Center" Text="{Binding TotalCount ,FallbackValue=0}"></TextBlock> <TextBlock FontSize="14" VerticalAlignment="Center" Text="{Binding TotalCount ,FallbackValue=0}"></TextBlock>
<TextBlock FontSize="14" VerticalAlignment="Center" Text="条记录 "></TextBlock> <TextBlock FontSize="14" VerticalAlignment="Center" Text="条记录 "></TextBlock>
<TextBlock FontSize="14" VerticalAlignment="Center" Text="第"></TextBlock> <TextBlock FontSize="14" VerticalAlignment="Center" Text="第"></TextBlock>
<TextBlock FontSize="14" VerticalAlignment="Center" Text="{Binding CurrentPage,FallbackValue=0}"></TextBlock> <TextBlock FontSize="14" VerticalAlignment="Center" Text="{Binding CurrentPage,FallbackValue=0}"></TextBlock>
<TextBlock FontSize="14" VerticalAlignment="Center" Text="/"></TextBlock> <TextBlock FontSize="14" VerticalAlignment="Center" Text="/"></TextBlock>
<TextBlock FontSize="14" VerticalAlignment="Center" Text="{Binding MaxPage,FallbackValue=0}"></TextBlock> <TextBlock FontSize="14" VerticalAlignment="Center" Text="{Binding MaxPage,FallbackValue=0}"></TextBlock>
<TextBlock FontSize="14" VerticalAlignment="Center" Text="页 "></TextBlock> <TextBlock FontSize="14" VerticalAlignment="Center" Text="页 "></TextBlock>
<ComboBox FontSize="14" VerticalAlignment="Center" SelectedValue="{Binding PageSize}" SelectedValuePath="Tag"> <ComboBox FontSize="14" VerticalAlignment="Center" SelectedValue="{Binding PageSize}" SelectedValuePath="Tag">
<ComboBoxItem Tag="10" IsSelected="True">10条/页</ComboBoxItem> <ComboBoxItem Tag="10" IsSelected="True">10条/页</ComboBoxItem>
<ComboBoxItem Tag="20">20条/页</ComboBoxItem> <ComboBoxItem Tag="20">20条/页</ComboBoxItem>
@ -161,8 +149,6 @@
<ComboBoxItem Tag="500">500条/页</ComboBoxItem> <ComboBoxItem Tag="500">500条/页</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Grid.Column="1"> <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Grid.Column="1">
<Grid> <Grid>
<Grid.RowDefinitions > <Grid.RowDefinitions >
@ -175,7 +161,6 @@
<ColumnDefinition Width="auto"/> <ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/> <ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Button BorderBrush="Transparent" Background="Transparent" Grid.Column="0" Name="btnFirst" Content="首页" Foreground="Black" FontSize="14" <Button BorderBrush="Transparent" Background="Transparent" Grid.Column="0" Name="btnFirst" Content="首页" Foreground="Black" FontSize="14"
Command="{Binding BtnFirstPageCommand}"/> Command="{Binding BtnFirstPageCommand}"/>
<Button BorderBrush="Transparent" Background="Transparent" Grid.Column="1" Name="btnPrev" Content="上一页" FontSize="14" <Button BorderBrush="Transparent" Background="Transparent" Grid.Column="1" Name="btnPrev" Content="上一页" FontSize="14"
@ -188,7 +173,6 @@
Command="{Binding BtnLastPageCommand}"/> Command="{Binding BtnLastPageCommand}"/>
</Grid> </Grid>
</StackPanel> </StackPanel>
</Grid> </Grid>
</Border> </Border>
</Grid> </Grid>

5
货架标准上位机/Views/OutInventoryDocumentView.xaml.cs
View File

@ -29,7 +29,6 @@ namespace 智能仓储WCS管理系统
InitializeComponent(); InitializeComponent();
this.DataContext = viewModel; this.DataContext = viewModel;
} }
private void DataGrid_SelectedCellsChanged(object sender, SelectedCellsChangedEventArgs e) private void DataGrid_SelectedCellsChanged(object sender, SelectedCellsChangedEventArgs e)
{ {
try try
@ -39,14 +38,11 @@ namespace 智能仓储WCS管理系统
viewModel.SelectedataGridItem.IsSelected = !viewModel.SelectedataGridItem.IsSelected; viewModel.SelectedataGridItem.IsSelected = !viewModel.SelectedataGridItem.IsSelected;
this.dg.UnselectAllCells();//取消选中 避免手动点击check选项时反选失败 和重新点击该项时反选失败 this.dg.UnselectAllCells();//取消选中 避免手动点击check选项时反选失败 和重新点击该项时反选失败
} }
} }
catch catch
{ {
} }
} }
private void DataGrid_ItemDataBound(object sender, DataGridItemEventArgs e) private void DataGrid_ItemDataBound(object sender, DataGridItemEventArgs e)
{ {
if (e.Item.ItemType != ListItemType.Header && e.Item.ItemType != ListItemType.Pager) if (e.Item.ItemType != ListItemType.Header && e.Item.ItemType != ListItemType.Pager)
@ -61,6 +57,5 @@ namespace 智能仓储WCS管理系统
} }
} }
} }
} }
} }

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

@ -15,10 +15,7 @@
<RowDefinition Height="0.9*"></RowDefinition> <RowDefinition Height="0.9*"></RowDefinition>
<RowDefinition Height="0.9*"></RowDefinition> <RowDefinition Height="0.9*"></RowDefinition>
<RowDefinition Height="9*"></RowDefinition> <RowDefinition Height="9*"></RowDefinition>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Border Grid.Row="0" Margin="0" Background="AliceBlue" Padding="0"> <Border Grid.Row="0" Margin="0" Background="AliceBlue" Padding="0">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
@ -28,12 +25,9 @@
<ColumnDefinition></ColumnDefinition> <ColumnDefinition></ColumnDefinition>
<ColumnDefinition></ColumnDefinition> <ColumnDefinition></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Button Style="{StaticResource ButtonSuccess}" hc:BorderElement.CornerRadius="15" <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}" Command="{Binding BtnStartCommand}">
>
</Button> </Button>
<Button Style="{StaticResource ButtonWarning}" hc:BorderElement.CornerRadius="15" <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}"
@ -41,7 +35,6 @@
</Button> </Button>
</Grid> </Grid>
</Border> </Border>
<Border Grid.Row="1" Margin="0" Background="LightGray" Padding="0"> <Border Grid.Row="1" Margin="0" Background="LightGray" Padding="0">
<Border Margin="0" CornerRadius="3" Background="AliceBlue" Padding="0"> <Border Margin="0" CornerRadius="3" Background="AliceBlue" Padding="0">
<Grid > <Grid >
@ -54,13 +47,6 @@
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition></RowDefinition> <RowDefinition></RowDefinition>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<!--<Button
hc:BorderElement.CornerRadius="15"
Background="Green" Foreground="White"
Grid.Column="1" MinHeight="45" FontSize="28" Content="&#xe63a; 发 料 单" FontFamily="{StaticResource IconFont}"
Command="{Binding BtnOutOrderCommand}">
</Button>-->
<StackPanel Grid.Column="2" VerticalAlignment="Center" Orientation="Horizontal"> <StackPanel Grid.Column="2" VerticalAlignment="Center" Orientation="Horizontal">
<TextBlock FontSize="26" Text="发料单号："> <TextBlock FontSize="26" Text="发料单号：">
</TextBlock> </TextBlock>
@ -69,9 +55,7 @@
</StackPanel> </StackPanel>
</Grid> </Grid>
</Border> </Border>
<!--</TabItem>-->
</Border> </Border>
<Border Grid.Row="2" Margin="0" Background="AliceBlue" Padding="0"> <Border Grid.Row="2" Margin="0" Background="AliceBlue" Padding="0">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
@ -82,7 +66,6 @@
<ColumnDefinition Width="2*"></ColumnDefinition> <ColumnDefinition Width="2*"></ColumnDefinition>
<ColumnDefinition Width="6*"></ColumnDefinition> <ColumnDefinition Width="6*"></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="1*"></RowDefinition> <RowDefinition Height="1*"></RowDefinition>
@ -107,21 +90,11 @@
</ScrollViewer> </ScrollViewer>
</Border> </Border>
</Grid> </Grid>
<Border CornerRadius="3" Margin="1" Grid.Row="0" Grid.Column="1" Background="AliceBlue" BorderBrush="CadetBlue" BorderThickness="1.5"> <Border CornerRadius="3" Margin="1" Grid.Row="0" Grid.Column="1" Background="AliceBlue" BorderBrush="CadetBlue" BorderThickness="1.5">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<!--<RowDefinition Height="1*"></RowDefinition>-->
<RowDefinition Height="12*"></RowDefinition> <RowDefinition Height="12*"></RowDefinition>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<!--<StackPanel VerticalAlignment="Center" Orientation="Horizontal" >
<TextBlock FontSize="24">
</TextBlock>
<TextBlock Text="{Binding SelectedOutOrderNumber}" FontSize="24">
</TextBlock>
</StackPanel>-->
<DataGrid Grid.Row="0" <DataGrid Grid.Row="0"
SelectedCellsChanged="DataGrid_SelectedCellsChanged" SelectedCellsChanged="DataGrid_SelectedCellsChanged"
ItemsSource="{Binding DataGridItemSource}" ItemsSource="{Binding DataGridItemSource}"
@ -146,7 +119,6 @@
<DataGridTextColumn MaxWidth="150" Header="数量" Binding="{Binding MatQty}"></DataGridTextColumn> <DataGridTextColumn MaxWidth="150" Header="数量" Binding="{Binding MatQty}"></DataGridTextColumn>
<DataGridTextColumn MaxWidth="150" Header="规格" Binding="{Binding MatSpec}"></DataGridTextColumn> <DataGridTextColumn MaxWidth="150" Header="规格" Binding="{Binding MatSpec}"></DataGridTextColumn>
<DataGridTextColumn MaxWidth="150" Header="批次" Binding="{Binding MatBatch}"></DataGridTextColumn> <DataGridTextColumn MaxWidth="150" Header="批次" Binding="{Binding MatBatch}"></DataGridTextColumn>
<DataGridTextColumn IsReadOnly="False" Header="物料SN" Binding="{Binding MatSN}"></DataGridTextColumn> <DataGridTextColumn IsReadOnly="False" Header="物料SN" Binding="{Binding MatSN}"></DataGridTextColumn>
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>
@ -187,7 +159,6 @@
</Grid> </Grid>
</Grid> </Grid>
</Border> </Border>
</Grid> </Grid>
</Border> </Border>
</pi:UserControlBase> </pi:UserControlBase>

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

@ -25,7 +25,6 @@ namespace 智能仓储WCS管理系统
InitializeComponent(); InitializeComponent();
this.DataContext = viewModel; this.DataContext = viewModel;
} }
private void DataGrid_SelectedCellsChanged(object sender, SelectedCellsChangedEventArgs e) private void DataGrid_SelectedCellsChanged(object sender, SelectedCellsChangedEventArgs e)
{ {
try try
@ -41,10 +40,8 @@ namespace 智能仓储WCS管理系统
} }
catch catch
{ {
} }
} }
private void ListView_PreviewMouseWheel(object sender, MouseWheelEventArgs e) private void ListView_PreviewMouseWheel(object sender, MouseWheelEventArgs e)
{ {
if (!e.Handled) if (!e.Handled)
@ -60,7 +57,6 @@ namespace 智能仓储WCS管理系统
parent.RaiseEvent(eventArg); parent.RaiseEvent(eventArg);
} }
} }
private void TextBlock_MouseDown(object sender, MouseButtonEventArgs e) private void TextBlock_MouseDown(object sender, MouseButtonEventArgs e)
{ {
viewModel.RefreshOutOrderList(viewModel.SelectedOutOrderNumber); viewModel.RefreshOutOrderList(viewModel.SelectedOutOrderNumber);