18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

导出列表

Browse Source
This commit is contained in:
18942506660
2023-11-14 15:57:57 +08:00
parent 7f6aa9bcb5
commit 89c80bf571
13 changed files with 257 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/WMS.Web.Api/Controllers/ChangeBoxRecordController.cs
View File

@@ -1,17 +1,21 @@
using AutoMapper;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using WMS.Web.Core;
using WMS.Web.Core.Dto;
using WMS.Web.Core.Dto.ChangeBoxRecord;
using WMS.Web.Core.Help;
using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Entitys;
using WMS.Web.Domain.Infrastructure;
using WMS.Web.Domain.IService;
using WMS.Web.Domain.IService.Public;
using WMS.Web.Domain.Options;
using WMS.Web.Domain.Values;
namespace WMS.Web.Api.Controllers
@@ -27,12 +31,17 @@ namespace WMS.Web.Api.Controllers
private readonly ILoginService _loginService;
private readonly IChangeBoxRecordRepositories _repositories;
private readonly IChangeMoveBoxService _changeMoveBoxService;
public ChangeBoxRecordController(IMapper mapper, ILoginService loginService, IChangeBoxRecordRepositories repositories, IChangeMoveBoxService changeMoveBoxService)
private readonly QiniuOptions _option;
private readonly IExportExcelService _exportExcelService;
public ChangeBoxRecordController(IMapper mapper, ILoginService loginService, IChangeBoxRecordRepositories repositories,
IChangeMoveBoxService changeMoveBoxService, IOptions<QiniuOptions> option, IExportExcelService exportExcelServic)
{
_mapper = mapper;
_loginService = loginService;
_repositories = repositories;
_changeMoveBoxService = changeMoveBoxService;
_option = option?.Value;
_exportExcelService = exportExcelServic;
}
/// <summary>
/// 列表
@@ -52,6 +61,28 @@ namespace WMS.Web.Api.Controllers
return result;
}
/// <summary>
/// 导出
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
[HttpPost]
[Route("Export")]
public Task<Result<string>> Export([FromBody] ChangeBoxRecordQueryRequest dto)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null)
return Task.FromResult(Result<string>.ReFailure(ResultCodes.Token_Invalid_Error));
string fileName = FileDownLoadOrderType.ChangeBox.GetRemark() + loginInfo.UserInfo.CompanyId + DateTime.Now.DateTimeToLongTimeStamp() + ".xlsx";
string res = _option.Url + fileName;
Task.Run(async () =>
{
await _exportExcelService.ExportList<ChangeBoxRecordQueryInfoResponse, ChangeBoxRecordQueryRequest>(dto, fileName, loginInfo.UserInfo.StaffId, loginInfo.UserInfo.CompanyId, FileDownLoadOrderType.ChangeBox);
});
return Task.FromResult(Result<string>.ReSuccess(res));
}
/// <summary>
/// 改箱保存-PDA
/// </summary>
/// <param name="dto"></param>

34
src/WMS.Web.Api/Controllers/MoveBoxRecordController.cs
View File

@@ -1,18 +1,22 @@
using AutoMapper;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using WMS.Web.Core;
using WMS.Web.Core.Dto;
using WMS.Web.Core.Dto.ChangeBoxRecord;
using WMS.Web.Core.Dto.MoveBoxRecord;
using WMS.Web.Core.Help;
using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Entitys;
using WMS.Web.Domain.Infrastructure;
using WMS.Web.Domain.IService;
using WMS.Web.Domain.IService.Public;
using WMS.Web.Domain.Options;
using WMS.Web.Domain.Values;
namespace WMS.Web.Api.Controllers
@@ -25,12 +29,18 @@ namespace WMS.Web.Api.Controllers
private readonly ILoginService _loginService;
private readonly IMoveBoxRecordRepositories _repositories;
private readonly IChangeMoveBoxService _changeMoveBoxService;
public MoveBoxRecordController(IMapper mapper, ILoginService loginService, IMoveBoxRecordRepositories repositories, IChangeMoveBoxService changeMoveBoxService)
private readonly QiniuOptions _option;
private readonly IExportExcelService _exportExcelService;
public MoveBoxRecordController(IMapper mapper, ILoginService loginService, IMoveBoxRecordRepositories repositories,
IChangeMoveBoxService changeMoveBoxService
, IOptions<QiniuOptions> option, IExportExcelService exportExcelServic)
{
_mapper = mapper;
_loginService = loginService;
_repositories = repositories;
_changeMoveBoxService = changeMoveBoxService;
_option = option?.Value;
_exportExcelService = exportExcelServic;
}
/// <summary>
/// 列表
@@ -50,6 +60,28 @@ namespace WMS.Web.Api.Controllers
return result;
}
/// <summary>
/// 导出
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
[HttpPost]
[Route("Export")]
public Task<Result<string>> Export([FromBody] MoveBoxRecordQueryRequest dto)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null)
return Task.FromResult(Result<string>.ReFailure(ResultCodes.Token_Invalid_Error));
string fileName = FileDownLoadOrderType.MoveBox.GetRemark() + loginInfo.UserInfo.CompanyId + DateTime.Now.DateTimeToLongTimeStamp() + ".xlsx";
string res = _option.Url + fileName;
Task.Run(async () =>
{
await _exportExcelService.ExportList<MoveBoxRecordQueryInfoResponse, MoveBoxRecordQueryRequest>(dto, fileName, loginInfo.UserInfo.StaffId, loginInfo.UserInfo.CompanyId, FileDownLoadOrderType.MoveBox);
});
return Task.FromResult(Result<string>.ReSuccess(res));
}
/// <summary>
/// 移箱下架保存-PDA
/// </summary>
/// <param name="dto"></param>

32
src/WMS.Web.Api/Controllers/OutStockController.cs
View File

@@ -1,16 +1,20 @@
using AutoMapper;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using WMS.Web.Core;
using WMS.Web.Core.Dto;
using WMS.Web.Core.Dto.OutStock;
using WMS.Web.Core.Help;
using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Infrastructure;
using WMS.Web.Domain.IService;
using WMS.Web.Domain.IService.Public;
using WMS.Web.Domain.Options;
using WMS.Web.Domain.Values;
namespace WMS.Web.Api.Controllers
@@ -26,13 +30,18 @@ namespace WMS.Web.Api.Controllers
private readonly ILoginService _loginService;
private readonly IOutStockRepositories _repositories;
private readonly IOutStockService _outStockService;
private readonly QiniuOptions _option;
private readonly IExportExcelService _exportExcelService;
public OutStockController(IMapper mapper, ILoginService loginService,
IOutStockRepositories repositories, IOutStockService outStockService)
IOutStockRepositories repositories, IOutStockService outStockService
, IOptions<QiniuOptions> option, IExportExcelService exportExcelServic)
{
_mapper = mapper;
_loginService = loginService;
_repositories = repositories;
_outStockService = outStockService;
_option = option?.Value;
_exportExcelService = exportExcelServic;
}
/// <summary>
/// 列表
@@ -51,7 +60,28 @@ namespace WMS.Web.Api.Controllers
var result = ResultPagedList<OutStockQueryInfoResponse>.ReSuccess(list, count);
return result;
}
/// <summary>
/// 导出
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
[HttpPost]
[Route("Export")]
public Task<Result<string>> Export([FromBody] OutStockQueryRequest dto)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null)
return Task.FromResult(Result<string>.ReFailure(ResultCodes.Token_Invalid_Error));
string fileName = FileDownLoadOrderType.OutStock.GetRemark() + loginInfo.UserInfo.CompanyId + DateTime.Now.DateTimeToLongTimeStamp() + ".xlsx";
string res = _option.Url + fileName;
Task.Run(async () =>
{
await _exportExcelService.ExportList<OutStockQueryInfoResponse, OutStockQueryRequest>(dto, fileName, loginInfo.UserInfo.StaffId, loginInfo.UserInfo.CompanyId, FileDownLoadOrderType.OutStock);
});
return Task.FromResult(Result<string>.ReSuccess(res));
}
/// <summary>
/// 获取详情
/// </summary>

32
src/WMS.Web.Api/Controllers/TakeStockController.cs
View File

@@ -1,16 +1,20 @@
using AutoMapper;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using WMS.Web.Core;
using WMS.Web.Core.Dto;
using WMS.Web.Core.Dto.TakeStock;
using WMS.Web.Core.Help;
using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Infrastructure;
using WMS.Web.Domain.IService;
using WMS.Web.Domain.IService.Public;
using WMS.Web.Domain.Options;
using WMS.Web.Domain.Values;
namespace WMS.Web.Api.Controllers
@@ -26,13 +30,18 @@ namespace WMS.Web.Api.Controllers
private readonly ILoginService _loginService;
private readonly ITakeStockRepositories _repositories;
private readonly ITakeStockService _takeStockService;
private readonly QiniuOptions _option;
private readonly IExportExcelService _exportExcelService;
public TakeStockController(IMapper mapper, ILoginService loginService,
ITakeStockRepositories repositories, ITakeStockService takeStockService)
ITakeStockRepositories repositories, ITakeStockService takeStockService
, IOptions<QiniuOptions> option, IExportExcelService exportExcelServic)
{
_mapper = mapper;
_loginService = loginService;
_repositories = repositories;
_takeStockService = takeStockService;
_option = option?.Value;
_exportExcelService = exportExcelServic;
}
/// <summary>
/// 列表
@@ -51,7 +60,28 @@ namespace WMS.Web.Api.Controllers
var result = ResultPagedList<TakeStockQueryInfoResponse>.ReSuccess(list, count);
return result;
}
/// <summary>
/// 导出
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
[HttpPost]
[Route("Export")]
public Task<Result<string>> Export([FromBody] TakeStockQueryRequest dto)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null)
return Task.FromResult(Result<string>.ReFailure(ResultCodes.Token_Invalid_Error));
string fileName = FileDownLoadOrderType.TakeStock.GetRemark() + loginInfo.UserInfo.CompanyId + DateTime.Now.DateTimeToLongTimeStamp() + ".xlsx";
string res = _option.Url + fileName;
Task.Run(async () =>
{
await _exportExcelService.ExportList<TakeStockQueryInfoResponse, TakeStockQueryRequest>(dto, fileName, loginInfo.UserInfo.StaffId, loginInfo.UserInfo.CompanyId, FileDownLoadOrderType.TakeStock);
});
return Task.FromResult(Result<string>.ReSuccess(res));
}
/// <summary>
/// 盘点保存-PDA
/// </summary>

28
src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
View File

@@ -42,6 +42,13 @@
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.ChangeBoxRecordController.Export(WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryRequest)">
<summary>
导出
</summary>
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.ChangeBoxRecordController.Save(WMS.Web.Core.Dto.ChangeBoxRecord.SaveChangeBoxRecordRequest)">
<summary>
改箱保存-PDA
@@ -245,6 +252,13 @@
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.MoveBoxRecordController.Export(WMS.Web.Core.Dto.MoveBoxRecord.MoveBoxRecordQueryRequest)">
<summary>
导出
</summary>
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.MoveBoxRecordController.Down_Save(WMS.Web.Core.Dto.MoveBoxRecord.SaveMoveBoxRecordRequest)">
<summary>
移箱下架保存-PDA
@@ -271,6 +285,13 @@
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.OutStockController.Export(WMS.Web.Core.Dto.OutStock.OutStockQueryRequest)">
<summary>
导出
</summary>
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.OutStockController.GetInfo(System.Int32)">
<summary>
获取详情
@@ -438,6 +459,13 @@
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.TakeStockController.Export(WMS.Web.Core.Dto.TakeStock.TakeStockQueryRequest)">
<summary>
导出
</summary>
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.TakeStockController.Save(System.Collections.Generic.List{WMS.Web.Core.Dto.TakeStock.SaveTakeStockRequest})">
<summary>
盘点保存-PDA

5
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
View File

@@ -2850,6 +2850,11 @@
完成装箱时间
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.OpsBoxResponse.CompleteCartonUser">
<summary>
完成装箱用户
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.OpsBoxResponse.CreateUser">
<summary>
箱子创建用户

35
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
View File

@@ -125,6 +125,11 @@
完成装箱时间
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.Box.CompleteCartonUser">
<summary>
完成装箱用户
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.Box.CreateUser">
<summary>
箱子创建用户
@@ -4028,6 +4033,36 @@
出库任务单
</summary>
</member>
<member name="F:WMS.Web.Domain.Values.FileDownLoadOrderType.OutStock">
<summary>
出库单
</summary>
</member>
<member name="F:WMS.Web.Domain.Values.FileDownLoadOrderType.InStockTask">
<summary>
入库任务单
</summary>
</member>
<member name="F:WMS.Web.Domain.Values.FileDownLoadOrderType.InStock">
<summary>
出库单
</summary>
</member>
<member name="F:WMS.Web.Domain.Values.FileDownLoadOrderType.ChangeBox">
<summary>
改箱
</summary>
</member>
<member name="F:WMS.Web.Domain.Values.FileDownLoadOrderType.MoveBox">
<summary>
移箱
</summary>
</member>
<member name="F:WMS.Web.Domain.Values.FileDownLoadOrderType.TakeStock">
<summary>
盘点
</summary>
</member>
<member name="T:WMS.Web.Domain.Values.InstockStatus">
<summary>
入库状态

30
src/WMS.Web.Domain/Values/FileDownLoadOrderType.cs
View File

@@ -15,5 +15,35 @@ namespace WMS.Web.Domain.Values
/// </summary>
[EnumRemark("出库任务单")]
OutStockTask = 1,
/// <summary>
/// 出库单
/// </summary>
[EnumRemark("出库单")]
OutStock = 2,
/// <summary>
/// 入库任务单
/// </summary>
[EnumRemark("入库任务单")]
InStockTask = 3,
/// <summary>
/// 出库单
/// </summary>
[EnumRemark("入库单")]
InStock = 4,
/// <summary>
/// 改箱
/// </summary>
[EnumRemark("改箱单")]
ChangeBox = 5,
/// <summary>
/// 移箱
/// </summary>
[EnumRemark("移箱单")]
MoveBox = 6,
/// <summary>
/// 盘点
/// </summary>
[EnumRemark("盘点单")]
TakeStock = 7,
}
}

7
src/WMS.Web.Repositories/ChangeBoxRecordRepositories.cs
View File

@@ -18,7 +18,7 @@ using WMS.Web.Repositories.Configuration;
namespace WMS.Web.Repositories
{
public class ChangeBoxRecordRepositories : IChangeBoxRecordRepositories
public class ChangeBoxRecordRepositories : IAllFielRepositories<ChangeBoxRecordQueryRequest>, IChangeBoxRecordRepositories
{
private readonly IMapper _mapper;
private readonly IServiceProvider _serviceProvider;
@@ -175,5 +175,10 @@ namespace WMS.Web.Repositories
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
return (list, total);
}
public async Task<(object obj, int total)> GetListField(ChangeBoxRecordQueryRequest dto, int companyId)
{
return await GetListAsync(dto);
}
}
}

8
src/WMS.Web.Repositories/DependencyInjection/AppBuilderExtensions.cs
View File

@@ -2,7 +2,11 @@
using System;
using System.Collections.Generic;
using System.Text;
using WMS.Web.Core.Dto.ChangeBoxRecord;
using WMS.Web.Core.Dto.MoveBoxRecord;
using WMS.Web.Core.Dto.OutStock;
using WMS.Web.Core.Dto.OutStockTask;
using WMS.Web.Core.Dto.TakeStock;
using WMS.Web.Domain.Infrastructure;
using WMS.Web.Repositories;
using WMS.Web.Repositories.Configuration;
@@ -40,6 +44,10 @@ namespace Microsoft.Extensions.DependencyInjection
#region 导出
services.AddTransient<IAllFielRepositories<OutStockTaskQueryRequest>, OutStockTaskRepositories>();
services.AddTransient<IAllFielRepositories<TakeStockQueryRequest>, TakeStockRepositories>();
services.AddTransient<IAllFielRepositories<OutStockQueryRequest>, OutStockRepositories>();
services.AddTransient<IAllFielRepositories<MoveBoxRecordQueryRequest>, MoveBoxRecordRepositories>();
services.AddTransient<IAllFielRepositories<ChangeBoxRecordQueryRequest>, ChangeBoxRecordRepositories>();
#endregion

7
src/WMS.Web.Repositories/MoveBoxRecordRepositories.cs
View File

@@ -18,7 +18,7 @@ using WMS.Web.Repositories.Configuration;
namespace WMS.Web.Repositories
{
public class MoveBoxRecordRepositories : IMoveBoxRecordRepositories
public class MoveBoxRecordRepositories : IAllFielRepositories<MoveBoxRecordQueryRequest>,IMoveBoxRecordRepositories
{
private readonly IMapper _mapper;
private readonly IServiceProvider _serviceProvider;
@@ -123,5 +123,10 @@ namespace WMS.Web.Repositories
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
return (list, total);
}
public async Task<(object obj, int total)> GetListField(MoveBoxRecordQueryRequest dto, int companyId)
{
return await GetListAsync(dto);
}
}
}

7
src/WMS.Web.Repositories/OutStockRepositories.cs
View File

@@ -19,7 +19,7 @@ using WMS.Web.Repositories.Configuration;
namespace WMS.Web.Repositories
{
public class OutStockRepositories : IOutStockRepositories
public class OutStockRepositories : IAllFielRepositories<OutStockQueryRequest>, IOutStockRepositories
{
private readonly IMapper _mapper;
private readonly IServiceProvider _serviceProvider;
@@ -292,5 +292,10 @@ namespace WMS.Web.Repositories
};
return response;
}
public async Task<(object obj, int total)> GetListField(OutStockQueryRequest dto, int companyId)
{
return await GetListAsync(dto);
}
}
}

7
src/WMS.Web.Repositories/TakeStockRepositories.cs
View File

@@ -18,7 +18,7 @@ using WMS.Web.Repositories.Configuration;
namespace WMS.Web.Repositories
{
public class TakeStockRepositories : ITakeStockRepositories
public class TakeStockRepositories : IAllFielRepositories<TakeStockQueryRequest>, ITakeStockRepositories
{
private readonly IMapper _mapper;
private readonly IServiceProvider _serviceProvider;
@@ -212,5 +212,10 @@ namespace WMS.Web.Repositories
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
return (list, total);
}
public async Task<(object obj, int total)> GetListField(TakeStockQueryRequest dto, int companyId)
{
return await GetListAsync(dto);
}
}
}