From 3ee611e4d2987dfb2f976cfbf55672f63cc1273f Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Thu, 9 Nov 2023 15:45:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=87=91=E8=9D=B6=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/OutStockController.cs | 18 +++++++++++ .../Controllers/OutStockTaskController.cs | 19 ++++++++++-- src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml | 7 +++++ src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 30 +++++++++++++++++++ src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 23 +++++++++++++- src/WMS.Web.Core/Dto/OperateRequest.cs | 7 +++++ .../Dto/OutStock/OutStockInfoResponse.cs | 29 ++++++++++++++++++ .../Infrastructure/IOutStockRepositories.cs | 2 ++ .../OutStockRepositories.cs | 19 ++++++++++++ 9 files changed, 151 insertions(+), 3 deletions(-) create mode 100644 src/WMS.Web.Core/Dto/OutStock/OutStockInfoResponse.cs diff --git a/src/WMS.Web.Api/Controllers/OutStockController.cs b/src/WMS.Web.Api/Controllers/OutStockController.cs index 6133f004..ae68fd50 100644 --- a/src/WMS.Web.Api/Controllers/OutStockController.cs +++ b/src/WMS.Web.Api/Controllers/OutStockController.cs @@ -52,6 +52,24 @@ namespace WMS.Web.Api.Controllers return result; } + /// + /// 获取详情 + /// + /// + /// + [HttpGet] + [Route("GetInfo/{id}")] + public async Task> GetInfo([FromRoute] int id) + { + var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); + if (loginInfo == null || loginInfo.UserInfo == null) + return Result.ReFailure(ResultCodes.Token_Invalid_Error); + + var response = await _repositories.GetInfo(id); + return Result.ReSuccess(response); + } + + /// /// 出库保存(出库)-PDA /// diff --git a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs index 63798774..e12f0c28 100644 --- a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs +++ b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs @@ -67,7 +67,7 @@ namespace WMS.Web.Api.Controllers if (loginInfo == null || loginInfo.UserInfo == null) return Result.ReFailure(ResultCodes.Token_Invalid_Error); - return await _outStockTaskService.Repeal(dto,loginInfo); + return await _outStockTaskService.Repeal(dto, loginInfo); } /// @@ -99,10 +99,25 @@ namespace WMS.Web.Api.Controllers if (loginInfo == null || loginInfo.UserInfo == null) return ResultList.ReFailure(ResultCodes.Token_Invalid_Error); - var res= await _repositories.GetOutStockTaskByNo(billNo); + var res = await _repositories.GetOutStockTaskByNo(billNo); if (res == null) return ResultList.ReFailure(ResultCodes.OutStockTaskNoData); return ResultList.ReSuccess(res); } + /// + /// 刷新金蝶数据 + /// + /// + /// + [HttpPost] + [Route("Refresh")] + public async Task Refresh(OperateStrRequest dto) + { + var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); + if (loginInfo == null || loginInfo.UserInfo == null) + return Result.ReFailure(ResultCodes.Token_Invalid_Error); + + return await _outStockTaskService.Ssyn(dto.Ids); + } } } diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml index 5940d92e..b07172cb 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml @@ -218,6 +218,13 @@ + + + 获取详情 + + + + 出库保存(出库)-PDA diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 6394ed71..6b39690c 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -2695,6 +2695,31 @@ 仓库编码 + + + 出库单详情 + + + + + 创建人 + + + + + 操作人 + + + + + 创建时间（出库时间） + + + + + 同步时间 + + 出库列表详情 @@ -2775,6 +2800,11 @@ 出库数量 + + + 备注 + + 出库单列表请求 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 6c5d079d..cf9938ee 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -742,6 +742,11 @@ 创建人 + + + 操作人 + + 创建时间（出库时间） @@ -752,6 +757,16 @@ 同步成功或者失败 null 就是未同步 + + + 同步时间 + + + + + 备注 + + 明细 @@ -763,6 +778,12 @@ + + + 同步金蝶 + + + 生成单据号 @@ -2442,7 +2463,7 @@ - + 同步金蝶 diff --git a/src/WMS.Web.Core/Dto/OperateRequest.cs b/src/WMS.Web.Core/Dto/OperateRequest.cs index 1d8ba550..b3afdd03 100644 --- a/src/WMS.Web.Core/Dto/OperateRequest.cs +++ b/src/WMS.Web.Core/Dto/OperateRequest.cs @@ -19,4 +19,11 @@ namespace WMS.Web.Core.Dto { public List Ids { get; set; } = new List(); } + /// + /// 操作 string集合 + /// + public class OperateStrRequest + { + public List Ids { get; set; } = new List(); + } } diff --git a/src/WMS.Web.Core/Dto/OutStock/OutStockInfoResponse.cs b/src/WMS.Web.Core/Dto/OutStock/OutStockInfoResponse.cs new file mode 100644 index 00000000..99c491c1 --- /dev/null +++ b/src/WMS.Web.Core/Dto/OutStock/OutStockInfoResponse.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto.OutStock +{ + /// + /// 出库单详情 + /// + public class OutStockInfoResponse + { + /// + /// 创建人 + /// + public string Creator { get; set; } + /// + /// 操作人 + /// + public string Operate { get; set; } + /// + /// 创建时间（出库时间） + /// + public string CreateTime { get; set; } + /// + /// 同步时间 + /// + public string SyncTime { get; set; } + } +} diff --git a/src/WMS.Web.Domain/Infrastructure/IOutStockRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IOutStockRepositories.cs index 50fcfac9..3d42c2f2 100644 --- a/src/WMS.Web.Domain/Infrastructure/IOutStockRepositories.cs +++ b/src/WMS.Web.Domain/Infrastructure/IOutStockRepositories.cs @@ -21,5 +21,7 @@ namespace WMS.Web.Domain.Infrastructure Task> GetEntityList(List ids); /// 修改实体集合 Task EditEntityList(List entitys, bool isTransaction = true); + //获取详情 + Task GetInfo(int id); } } diff --git a/src/WMS.Web.Repositories/OutStockRepositories.cs b/src/WMS.Web.Repositories/OutStockRepositories.cs index 3fbd9b8c..311988da 100644 --- a/src/WMS.Web.Repositories/OutStockRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockRepositories.cs @@ -273,5 +273,24 @@ namespace WMS.Web.Repositories return res.Clone(); } + /// + /// 获取详情 + /// + /// + /// + public async Task GetInfo(int id) + { + var res = await _context.OutStock + .FirstOrDefaultAsync(f => id == f.Id); + if (res == null) return null; + OutStockInfoResponse response = new OutStockInfoResponse() + { + CreateTime = res.CreateTime.DateToStringSeconds(), + SyncTime = res.SyncTime.DateToStringSeconds(), + Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, res.CreatorId), + Operate = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, res.OperateId) + }; + return response; + } } }