From db74dc89dfe9ceb5f608188a5d620fdc7c2a299e Mon Sep 17 00:00:00 2001 From: tongfei <244188119@qq.com> Date: Wed, 15 Nov 2023 15:50:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/InStockController.cs | 17 ++ .../Controllers/InventoryController.cs | 2 +- src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml | 7 + src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 215 ++++++++++-------- src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 17 ++ .../Dto/InStock/InStockInfoResponse.cs | 29 +++ src/WMS.Web.Domain/Entitys/InStock.cs | 10 + .../Infrastructure/IInStockRepositories.cs | 8 + .../InStockRepositories.cs | 22 ++ 9 files changed, 231 insertions(+), 96 deletions(-) create mode 100644 src/WMS.Web.Core/Dto/InStock/InStockInfoResponse.cs diff --git a/src/WMS.Web.Api/Controllers/InStockController.cs b/src/WMS.Web.Api/Controllers/InStockController.cs index 1e8e3df9..9d269785 100644 --- a/src/WMS.Web.Api/Controllers/InStockController.cs +++ b/src/WMS.Web.Api/Controllers/InStockController.cs @@ -60,6 +60,23 @@ namespace WMS.Web.Api.Controllers return ResultPagedList.ReSuccess(list, count); } + + /// + /// 获取详情 + /// + /// + /// + [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 _inStockRepositories.GetInfo(id); + return Result.ReSuccess(response); + } /// /// 导出 /// diff --git a/src/WMS.Web.Api/Controllers/InventoryController.cs b/src/WMS.Web.Api/Controllers/InventoryController.cs index ec7830ce..4bd82585 100644 --- a/src/WMS.Web.Api/Controllers/InventoryController.cs +++ b/src/WMS.Web.Api/Controllers/InventoryController.cs @@ -169,7 +169,7 @@ namespace WMS.Web.Api.Controllers /// /// /// - [HttpPost] + [HttpGet] [Route("GetBoxInventoryDetails/{boxBillNo}")] public async Task> GetBoxInventoryDetails([FromRoute] string boxBillNo) { diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml index 0d486a03..ef9748ca 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml @@ -86,6 +86,13 @@ + + + 获取详情 + + + + 导出 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 354c3690..f5f4812f 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -1725,6 +1725,126 @@ 创建时间（erp那边的创建时间） + + + 入库单详情 + + + + + 创建人 + + + + + 创建时间（入库时间） + + + + + 操作人 + + + + + 同步时间 + + + + + 非采购单上架请求对象-按箱 + + + + + 单据ID(等同-入库任务单ID) + + + + + 上架方式 + + + + + 箱集合 + + + + + 入库单明细 + + + + + 采购上架-请求对象 + + + + + 箱IDS + + + + + 明细 + + + + + 保存入库单明细-请求对象 + + + + + 单据ID(等同-入库任务单ID) + + + + + 来源单号 + + + + + 供应商 + + + + + 组织 + + + + + 物料Id + + + + + 仓库编码 + + + + + 仓位ID + + + + + 入库数量 + + + + + 序列号集 + + + + + 保存入库单-请求对象 + + 入库单查询请求对象 @@ -1860,101 +1980,6 @@ 同步成功或者失败 - - - 非采购单上架请求对象-按箱 - - - - - 单据ID(等同-入库任务单ID) - - - - - 上架方式 - - - - - 箱集合 - - - - - 入库单明细 - - - - - 采购上架-请求对象 - - - - - 箱IDS - - - - - 明细 - - - - - 保存入库单明细-请求对象 - - - - - 单据ID(等同-入库任务单ID) - - - - - 来源单号 - - - - - 供应商 - - - - - 组织 - - - - - 物料Id - - - - - 仓库编码 - - - - - 仓位ID - - - - - 入库数量 - - - - - 序列号集 - - - - - 保存入库单-请求对象 - - 出入库回退上下架-箱库存处理对象 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 3e94ade7..125ad751 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -471,6 +471,16 @@ 同步成功或者失败 + + + 操作人 + + + + + 同步时间 + + 明细 @@ -1660,6 +1670,13 @@ + + + 详情 + + + + 入库任务-仓储接口 diff --git a/src/WMS.Web.Core/Dto/InStock/InStockInfoResponse.cs b/src/WMS.Web.Core/Dto/InStock/InStockInfoResponse.cs new file mode 100644 index 00000000..02d61c52 --- /dev/null +++ b/src/WMS.Web.Core/Dto/InStock/InStockInfoResponse.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto.InStock +{ + /// + /// 入库单详情 + /// + public class InStockInfoResponse + { + /// + /// 创建人 + /// + public string Creator { get; set; } + /// + /// 创建时间（入库时间） + /// + public string CreateTime { get; set; } + /// + /// 操作人 + /// + public string Operate { get; set; } + /// + /// 同步时间 + /// + public string SyncTime { get; set; } + } +} diff --git a/src/WMS.Web.Domain/Entitys/InStock.cs b/src/WMS.Web.Domain/Entitys/InStock.cs index d1d809ef..abb9cd24 100644 --- a/src/WMS.Web.Domain/Entitys/InStock.cs +++ b/src/WMS.Web.Domain/Entitys/InStock.cs @@ -39,6 +39,16 @@ namespace WMS.Web.Domain.Entitys /// public bool? SuccessSync { get; set; } + /// + /// 操作人 + /// + public int OperateId { get; set; } + + /// + /// 同步时间 + /// + public DateTime? SyncTime { get; set; } + /// /// 明细 /// diff --git a/src/WMS.Web.Domain/Infrastructure/IInStockRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IInStockRepositories.cs index 1d66d23f..974a9fcd 100644 --- a/src/WMS.Web.Domain/Infrastructure/IInStockRepositories.cs +++ b/src/WMS.Web.Domain/Infrastructure/IInStockRepositories.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Text; using System.Threading.Tasks; using WMS.Web.Core.Dto; +using WMS.Web.Core.Dto.InStock; using WMS.Web.Core.Internal.Results; using WMS.Web.Domain.Entitys; @@ -27,5 +28,12 @@ namespace WMS.Web.Domain.Infrastructure /// /// Task Add(InStock entity, bool isTransaction = true); + + /// + /// 详情 + /// + /// + /// + Task GetInfo(int id); } } diff --git a/src/WMS.Web.Repositories/InStockRepositories.cs b/src/WMS.Web.Repositories/InStockRepositories.cs index 7229f881..2cd699f8 100644 --- a/src/WMS.Web.Repositories/InStockRepositories.cs +++ b/src/WMS.Web.Repositories/InStockRepositories.cs @@ -8,6 +8,8 @@ using System.Text; using System.Threading.Tasks; using WMS.Web.Core; using WMS.Web.Core.Dto; +using WMS.Web.Core.Dto.InStock; +using WMS.Web.Core.Help; using WMS.Web.Core.Internal.Results; using WMS.Web.Domain.Entitys; using WMS.Web.Domain.Infrastructure; @@ -178,5 +180,25 @@ namespace WMS.Web.Repositories { return await GetPagedList(dto); } + + /// + /// 获取详情 + /// + /// + /// + public async Task GetInfo(int id) + { + var res = await _context.Instock + .FirstOrDefaultAsync(f => id == f.Id); + if (res == null) return null; + var response = new InStockInfoResponse() + { + 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; + } } }