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
2025-03-03 14:59:17 +08:00
parent d99f72ecf4
commit cbf43d04c4
7 changed files with 138 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WCS.BLL/DbModels/STZL/LocationInfo.cs
View File

@ -110,6 +110,8 @@ namespace WCS.DAL.DbModels
[SugarColumn(IsIgnore = true)] [SugarColumn(IsIgnore = true)]
public List<string> AllowShelfTypesName { get; set; } = new List<string>(); public List<string> AllowShelfTypesName { get; set; } = new List<string>();
[SugarColumn(IsIgnore = true)]
public string AllowShelfTypesNameStr { get { return string.Join(",", AllowShelfTypesName); } }
/// <summary> /// <summary>
/// 是否已经选择 /// 是否已经选择
/// </summary> /// </summary>

10
WCS.BLL/Services/IService/ILocationInfoService.cs
View File

@ -15,13 +15,19 @@ namespace WCS.BLL.Services.IService
public interface ILocationInfoService public interface ILocationInfoService
{ {
/// <summary> /// <summary>
/// 查询货架列表 /// 查询位置列表
/// </summary> /// </summary>
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
public Task<PageQueryResponse<LocationInfo>> GetLocationInfos(GetLocationInfosRequest request); public Task<PageQueryResponse<LocationInfo>> GetLocationInfos(GetLocationInfosRequest request);
/// <summary> /// <summary>
/// 添加、更新、删除货架 /// 导出位置列表
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public Task<PageQueryResponse<LocationInfo>> ExportLocationInfos(GetLocationInfosRequest request);
/// <summary>
/// 添加、更新、删除位置
/// </summary> /// </summary>
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>

58
WCS.BLL/Services/Service/LocationInfoService.cs
View File

@ -25,7 +25,11 @@ namespace WCS.BLL.Services.Service
{ {
public class LocationInfoService : ILocationInfoService public class LocationInfoService : ILocationInfoService
{ {
/// <summary>
/// 获取位置数据
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public async Task<PageQueryResponse<LocationInfo>> GetLocationInfos(GetLocationInfosRequest request) public async Task<PageQueryResponse<LocationInfo>> GetLocationInfos(GetLocationInfosRequest request)
{ {
try try
@ -74,6 +78,58 @@ namespace WCS.BLL.Services.Service
} }
} }
/// <summary>
/// 导出位置数据
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public async Task<PageQueryResponse<LocationInfo>> ExportLocationInfos(GetLocationInfosRequest request)
{
try
{
var recordsQueryable = DbHelp.db.Queryable<LocationInfo>()
.WhereIF(request.LocationAreaId != null, t => t.LocationAreaId == request.LocationAreaId)
.WhereIF(request.IsEnable != null, t => t.IsEnable == request.IsEnable)
.WhereIF(!string.IsNullOrEmpty(request.LocationCode), t => t.LocationCode.Contains(request.LocationCode));
var totalCount = await recordsQueryable.CountAsync();
var records = await recordsQueryable
.Take(65535)
.ToListAsync();
//获取系统内货架类型
var shelfTypes = await DbHelp.db.Queryable<ShelfTypeInfo>().ToListAsync();
var index = 1;
//生成序号
for (int i = 0; i < records.Count; i++)
{
records[i].AllowShelfTypesName = shelfTypes.Where(s => records[i].AllowShelfTypes.Contains(s.Id))
.Select(t => t.ShelfTypeName)
.ToList();
records[i].RowNumber = index++;
}
return new PageQueryResponse<LocationInfo>()
{
Code = 200,
Message = $"success",
Data = new PageQueryResponseData<LocationInfo>()
{
TotalCount = totalCount,
MaxPage = request.PageSize == 0 ? 0 : (int)Math.Ceiling((decimal)totalCount / request.PageSize),
Count = records.Count,
Lists = records.ToList()
}
};
}
catch (Exception ex)
{
return new PageQueryResponse<LocationInfo>()
{
Code = 300,
Message = $"操作失败:{ex.Message}",
};
}
}
public async Task<ResponseCommon<object>> addOrUpdateLocationInfo(AddLocaionInfoRequest<LocationInfo> request) public async Task<ResponseCommon<object>> addOrUpdateLocationInfo(AddLocaionInfoRequest<LocationInfo> request)
{ {
try try

27
WCS.WebApi/Controllers/LocationInfoController.cs
View File

@ -10,6 +10,8 @@ using WCS.DAL.DbModels;
using WCS.DAL.Db; using WCS.DAL.Db;
using WCS.Model.ApiModel.Home; using WCS.Model.ApiModel.Home;
using WCS.Model.ApiModel.LocationInfo; using WCS.Model.ApiModel.LocationInfo;
using WCS.Model.ApiModel.MatDetailCurrentInfo;
using WCS.WebApi.Helper;
namespace WCS.WebApi.Controllers namespace WCS.WebApi.Controllers
{ {
@ -69,6 +71,31 @@ namespace WCS.WebApi.Controllers
return await _locationInfoService.GetLocationInfos(request); return await _locationInfoService.GetLocationInfos(request);
} }
[Route("exportLocationInfos")]
[HttpPost(Name = "exportLocationInfos")]
public async Task<IActionResult> ExportLocationInfos(GetLocationInfosRequest request)
{
var result = await _locationInfoService.ExportLocationInfos(request);
var data = result.Data?.Lists;
var columns = new[]
{
new ExportableColumn("序号","RowNumber"),
new ExportableColumn("位置区域","LocationArea"),
new ExportableColumn("位置编号","LocationCode"),
new ExportableColumn("RCS库位编号","RcsStoreCode"),
new ExportableColumn("可放置货架类型","AllowShelfTypesNameStr"),
new ExportableColumn("启用状态","IsEnableStr"),
new ExportableColumn("更新人", "ModifyUser"),
new ExportableColumn("更新时间", "ModifyTime"),
};
if (data == null)
{
return NotFound();
}
else
return ExportExcelHelper.Export("导出数据", columns, data);
}
[HttpPost("addOrUpdateLocationInfo")] [HttpPost("addOrUpdateLocationInfo")]
public async Task<ResponseCommon<object>> addOrUpdateLocationInfo(AddLocaionInfoRequest<LocationInfo> request) public async Task<ResponseCommon<object>> addOrUpdateLocationInfo(AddLocaionInfoRequest<LocationInfo> request)
{ {

40
货架标准上位机/ViewModels/LocaionInfoViewModel.cs
View File

@ -20,6 +20,7 @@ using WCS.Model.ApiModel.User;
using WCS.Model.ApiModel; using WCS.Model.ApiModel;
using Newtonsoft.Json.Bson; using Newtonsoft.Json.Bson;
using WCS.Model.ApiModel.LocationInfo; using WCS.Model.ApiModel.LocationInfo;
using WCS.Model.ApiModel.MatDetailCurrentInfo;
namespace 智慧物流软件系统.ViewModel namespace 智慧物流软件系统.ViewModel
{ {
@ -282,6 +283,45 @@ namespace 智慧物流软件系统.ViewModel
// } // }
//} //}
} }
public ICommand BtnExportCommand { get => new DelegateCommand(BtnExport); }
public async void BtnExport()
{
try
{
#region 选择文件保存路径
Microsoft.Win32.SaveFileDialog sfd = new Microsoft.Win32.SaveFileDialog();
sfd.Title = "选择文件保存路径";
sfd.Filter = ".xlsx文件(*.xlsx)|*.xlsx";
sfd.FileName = "位置管理" + DateTime.Now.ToString("yyyyMMddhhmmss");
sfd.OverwritePrompt = true;
if (sfd.ShowDialog() != true)
{
return;
}
string path = sfd.FileName;
#endregion
var body = new GetLocationInfosRequest()
{
LocationAreaId = SelectedLocationAreaItems == null ? null : SelectedLocationAreaItems.Id,
LocationCode = LocationCode,
IsEnable = IsEnable,
UserName = LocalStatic.CurrentUser,
DeviceType = LocalFile.Config.DeviceType,
PageNumber = CurrentPage,
PageSize = PageSize,
};
await ApiHelp.PostDownloadFileAsync(path, System.Net.Http.HttpMethod.Post, LocalFile.Config.ApiIpHost + "locationInfo/exportLocationInfos", body);
Growl.Success("导出成功！");
}
catch (Exception ex)
{
Growl.Error("导出失败：" + ex.Message);
}
}
#endregion #endregion
#region PageOperation 分页操作 #region PageOperation 分页操作

101
货架标准上位机/Views/LocationInfoView.xaml
View File

@ -18,12 +18,12 @@
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="1.9*"></ColumnDefinition> <ColumnDefinition Width="1.9*"></ColumnDefinition>
<ColumnDefinition Width="2*"></ColumnDefinition> <ColumnDefinition Width="4*"></ColumnDefinition>
<ColumnDefinition Width="1.9*"></ColumnDefinition> <ColumnDefinition Width="1.9*"></ColumnDefinition>
<ColumnDefinition Width="2*"></ColumnDefinition> <ColumnDefinition Width="2*"></ColumnDefinition>
<ColumnDefinition Width="1.9*"></ColumnDefinition> <ColumnDefinition Width="1.9*"></ColumnDefinition>
<ColumnDefinition Width="2*"></ColumnDefinition> <ColumnDefinition Width="2*"></ColumnDefinition>
<ColumnDefinition Width="1.9*"></ColumnDefinition> <ColumnDefinition Width="0.1*"></ColumnDefinition>
<ColumnDefinition Width="2*"></ColumnDefinition> <ColumnDefinition Width="2*"></ColumnDefinition>
<ColumnDefinition Width="2*"></ColumnDefinition> <ColumnDefinition Width="2*"></ColumnDefinition>
@ -116,12 +116,12 @@
> >
</Button>--> </Button>-->
<!--<Button MinHeight="40" FontSize="18" Margin="5" <Button MinHeight="40" FontSize="18" Margin="5"
Content="&#xe866;导 出" FontFamily="{StaticResource IconFont}" Content="&#xe866;导 出" FontFamily="{StaticResource IconFont}"
Command="{Binding BtnExportCommand}" Command="{Binding BtnExportCommand}"
Foreground="WhiteSmoke" Foreground="WhiteSmoke"
Background="DarkOrange"> Background="DarkOrange">
</Button>--> </Button>
</StackPanel> </StackPanel>
<DataGrid Grid.Row="1" <DataGrid Grid.Row="1"
@ -172,9 +172,6 @@
<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>
@ -215,101 +212,11 @@
Command="{Binding BtnLastPageCommand}"/> Command="{Binding BtnLastPageCommand}"/>
</Grid> </Grid>
</StackPanel> </StackPanel>
</Grid> </Grid>
</Border> </Border>
</Grid> </Grid>
</Grid> </Grid>
</Border> </Border>
<!--<Border Grid.Row="1" Margin="3" Background="AliceBlue" CornerRadius="3" Padding="0">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="0.8*"></RowDefinition>
<RowDefinition Height="8*"></RowDefinition>
<RowDefinition Height="0.7*"></RowDefinition>
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal">
<Button MinHeight="40" FontSize="18" Margin="5" Command="{Binding BtnExportCommand}"
Content="&#xe866; 导 出" FontFamily="{StaticResource IconFont}"
Style="{StaticResource ButtonWarning}" Background="DarkOrange">
</Button>
</StackPanel>
<DataGrid Grid.Row="1"
SelectedCellsChanged="DataGrid_SelectedCellsChanged"
ItemsSource="{Binding DataGridItemSource}"
RowHeight="39"
AutoGenerateColumns="False"
FontSize="13">
<DataGrid.Columns>
<DataGridTextColumn Header="序号" Binding="{Binding RowNumber}"></DataGridTextColumn>
<DataGridTextColumn Header="接口地址" Binding="{Binding RequestUrl}"></DataGridTextColumn>
<DataGridTextColumn Header="设备IP" Binding="{Binding DeviceIp}"></DataGridTextColumn>
<DataGridTextColumn Header="请求参数" Binding="{Binding RequestBody}" MaxWidth="100"></DataGridTextColumn>
<DataGridTextColumn Header="QueryString" Binding="{Binding QueryString}" MaxWidth="100"></DataGridTextColumn>
<DataGridTextColumn Header="请求时间" Binding="{Binding RequestTime,StringFormat='yyyy-MM-dd HH:mm:ss'}"></DataGridTextColumn>
<DataGridTextColumn Header="返回参数" Binding="{Binding ResponseJson}" MaxWidth="100"></DataGridTextColumn>
<DataGridTextColumn Header="返回时间" Binding="{Binding ResponseTime,StringFormat='yyyy-MM-dd HH:mm:ss'}"></DataGridTextColumn>
<DataGridTextColumn Header="耗时(ms)" Binding="{Binding ExecutionTime}"></DataGridTextColumn>
</DataGrid.Columns>
</DataGrid>
<Grid Grid.Row="2">
<Border CornerRadius="3" Background="Transparent" VerticalAlignment="Center" >
<Grid HorizontalAlignment="Stretch" Margin="0" VerticalAlignment="Top" Width="Auto" MinHeight="26">
<Grid.RowDefinitions>
<RowDefinition/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="5*"></ColumnDefinition>
<ColumnDefinition Width="5*"></ColumnDefinition>
<ColumnDefinition Width="5*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal" Margin="5">
<TextBlock FontSize="14" Text="共"></TextBlock>
<TextBlock FontSize="14" Text="{Binding TotalCount ,FallbackValue=0}"></TextBlock>
<TextBlock FontSize="14" Text="条记录 "></TextBlock>
<TextBlock FontSize="14" Text="第"></TextBlock>
<TextBlock FontSize="14" Text="{Binding CurrentPage,FallbackValue=0}"></TextBlock>
<TextBlock FontSize="14" Text="/"></TextBlock>
<TextBlock FontSize="14" Text="{Binding MaxPage,FallbackValue=0}"></TextBlock>
<TextBlock FontSize="14" Text="页"></TextBlock>
</StackPanel>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Grid.Column="1">
<Grid>
<Grid.RowDefinitions >
<RowDefinition Height="30"></RowDefinition>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<Button BorderBrush="Transparent" Background="Transparent" Grid.Column="0" Name="btnFirst" Content="首页" Foreground="Black" FontSize="14"
Command="{Binding BtnFirstPageCommand}"/>
<Button BorderBrush="Transparent" Background="Transparent" Grid.Column="1" Name="btnPrev" Content="上一页" FontSize="14"
Command="{Binding BtnPrePageCommand}"/>
<TextBox BorderBrush="Transparent" Grid.Column="2" FontSize="14" MinWidth="50" HorizontalAlignment="Center" VerticalAlignment="Center" Cursor="IBeam" IsEnabled="False"
Text ="{Binding CurrentPage}" TextAlignment="Center"
/>
<Button BorderBrush="Transparent" Background="Transparent" Grid.Column="3" Name="btnNext" Content="下一页" FontSize="14"
Command="{Binding BtnNextPageCommand}"/>
<Button BorderBrush="Transparent" Background="Transparent" Grid.Column="4" Name="btnLast" Content="末页" FontSize="14"
Command="{Binding BtnLastPageCommand}"/>
</Grid>
</StackPanel>
</Grid>
</Border>
</Grid>
</Grid>
</Border>-->
</Grid> </Grid>
</Border> </Border>
</pi:UserControlBase> </pi:UserControlBase>

11
货架标准上位机/Views/LocationInfoView.xaml.cs
View File

@ -51,18 +51,7 @@ namespace 智慧物流软件系统
private void DataGrid_SelectedCellsChanged(object sender, SelectedCellsChangedEventArgs e) private void DataGrid_SelectedCellsChanged(object sender, SelectedCellsChangedEventArgs e)
{ {
//try
//{
// if (viewModel.SelectedataGridItem != null)
// {
// viewModel.SelectedataGridItem.IsSelected = !viewModel.SelectedataGridItem.IsSelected;
// }
//}
//catch
//{
//}
} }
private void allChecked_Checked(object sender, RoutedEventArgs e) private void allChecked_Checked(object sender, RoutedEventArgs e)