diff --git a/src/WMS.Web.Api/Controllers/InStockTaskController.cs b/src/WMS.Web.Api/Controllers/InStockTaskController.cs index 816dec34..6ae29277 100644 --- a/src/WMS.Web.Api/Controllers/InStockTaskController.cs +++ b/src/WMS.Web.Api/Controllers/InStockTaskController.cs @@ -48,7 +48,7 @@ namespace WMS.Web.Api.Controllers } /// - /// 收货 + /// 收货-pad /// /// /// @@ -62,5 +62,22 @@ namespace WMS.Web.Api.Controllers return await _inStockService.Receive(dto, loginInfo); } + + /// + /// 采购订单-单据编号模糊-pad + /// + /// + /// + [HttpPost] + [Route("Purchase/{code}")] + public async Task> Purchase([FromRoute] string code) + { + var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); + if (loginInfo == null || loginInfo.UserInfo == null) + return ResultList.ReFailure(ResultCodes.Token_Invalid_Error); + + var list= await _inStockTaskRepositories.GetListBy(code); + return ResultList.ReSuccess(list); + } } } diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml index 38f34843..22b95af7 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml @@ -89,11 +89,18 @@ - 收货 + 收货-pad + + + 采购订单-单据编号模糊-pad + + + + 即时库存相关-接口 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 601c6eee..a9cf4f8f 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -760,11 +760,111 @@ 备注 + + + ID + + + + + 单据头ID + + + + + 物料ID + + + + + 物料名称 + + + + + 物料编码 + + + + + 物料规格型号 + + + + + 数量 + + 入库任务单-详情信息 + + + ID + + + + + 单据编号 + + + + + 来源单号 + + + + + 明细 + + + + + 来源单号模糊查询响应对象 + + + + + ID + + + + + 明细ID + + + + + 来源单号 + + + + + 物料ID + + + + + 物料名称 + + + + + 物料编码 + + + + + 物料规格型号 + + + + + 数量 + + 修改-入库任务单-明细对象 @@ -805,6 +905,181 @@ 明细 + + + 入库任务-查询请求对象 + + + + + 来源单号 + + + + + 入库类型 + + + + + 入库状态 + + + + + 收货人 + + + + + 上架人 + + + + + 创建时间（入库时间） + + + + + 创建时间（入库时间） + + + + + 供应商ID + + + + + 组织ID + + + + + 物料编码 + + + + + 仓库ID + + + + + 入库任务表-查询对象 + + + + + ID + + + + + 明细ID + + + + + 单据编号 + + + + + 来源单号 + + + + + 入库状态 + + + + + 入库类型 + + + + + 供应商Id + + + + + 组织ID + + + + + 物料名称 + + + + + 物料编码 + + + + + 物料规格型号 + + + + + 出厂价 + + + + + 收货仓库 + + + + + 应入数量 + + + + + 收货数量 + + + + + 实际入库数量 + + + + + 收货人 + + + + + 收货时间 + + + + + 上架人 + + + + + 入库时间 + + + + + 明细备注 + + + + + 创建时间（erp那边的创建时间） + + 入库单查询请求对象 @@ -2360,181 +2635,6 @@ 盘点日期-结束 - - - 入库任务-查询请求对象 - - - - - 来源单号 - - - - - 入库类型 - - - - - 入库状态 - - - - - 收货人 - - - - - 上架人 - - - - - 创建时间（入库时间） - - - - - 创建时间（入库时间） - - - - - 供应商ID - - - - - 组织ID - - - - - 物料编码 - - - - - 仓库ID - - - - - 入库任务表-查询对象 - - - - - ID - - - - - 明细ID - - - - - 单据编号 - - - - - 来源单号 - - - - - 入库状态 - - - - - 入库类型 - - - - - 供应商Id - - - - - 组织ID - - - - - 物料名称 - - - - - 物料编码 - - - - - 物料规格型号 - - - - - 出厂价 - - - - - 收货仓库 - - - - - 应入数量 - - - - - 收货数量 - - - - - 实际入库数量 - - - - - 收货人 - - - - - 收货时间 - - - - - 上架人 - - - - - 入库时间 - - - - - 明细备注 - - - - - 创建时间（erp那边的创建时间） - - 基类 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index e0ffc0be..c52d7b75 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -1181,6 +1181,13 @@ + + + 列表-根据来源单号模糊 + + + + 批量添加 diff --git a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskDetailsInfoDto.cs b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskDetailsInfoDto.cs new file mode 100644 index 00000000..2057c84a --- /dev/null +++ b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskDetailsInfoDto.cs @@ -0,0 +1,41 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto.InStockTask +{ + public class InStockTaskDetailsInfoDto + { + /// + /// ID + /// + public int Id { get; set; } + /// + /// 单据头ID + /// + public int Fid { get; set; } + + /// + /// 物料ID + /// + public int MaterialId { get; set; } + + /// + /// 物料名称 + /// + public string MaterialName { get; set; } + /// + /// 物料编码 + /// + public string MaterialNumber { get; set; } + /// + /// 物料规格型号 + /// + public string Specifications { get; set; } + + /// + /// 数量 + /// + public decimal AccruedQty { get; set; } + } +} diff --git a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskInfoDto.cs b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskInfoDto.cs index 1cef8279..626f01dd 100644 --- a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskInfoDto.cs +++ b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskInfoDto.cs @@ -9,5 +9,22 @@ namespace WMS.Web.Core.Dto.InStockTask /// public class InStockTaskInfoDto { + /// + /// ID + /// + public int Id { get; set; } + /// + /// 单据编号 + /// + public string BillNo { get; set; } + /// + /// 来源单号 + /// + public string SourceBillNo { get; set; } + + /// + /// 明细 + /// + public List Details = new List(); } } diff --git a/src/WMS.Web.Core/Dto/TaskInStock/InStockTaskQueryRequest.cs b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskQueryRequest.cs similarity index 100% rename from src/WMS.Web.Core/Dto/TaskInStock/InStockTaskQueryRequest.cs rename to src/WMS.Web.Core/Dto/InStockTask/InStockTaskQueryRequest.cs diff --git a/src/WMS.Web.Core/Dto/TaskInStock/InStockTaskQueryResponse.cs b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskQueryResponse.cs similarity index 100% rename from src/WMS.Web.Core/Dto/TaskInStock/InStockTaskQueryResponse.cs rename to src/WMS.Web.Core/Dto/InStockTask/InStockTaskQueryResponse.cs diff --git a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskResponse.cs b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskResponse.cs new file mode 100644 index 00000000..9c5734cf --- /dev/null +++ b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskResponse.cs @@ -0,0 +1,49 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto.InStockTask +{ + /// + /// 来源单号模糊查询响应对象 + /// + public class InStockTaskBillNoQueryResponse + { + /// + /// ID + /// + public int Id { get; set; } + /// + /// 明细ID + /// + public int DetailsId { get; set; } + + /// + /// 来源单号 + /// + public string SourceBillNo { get; set; } + + /// + /// 物料ID + /// + public int MaterialId { get; set; } + + /// + /// 物料名称 + /// + public string MaterialName { get; set; } + /// + /// 物料编码 + /// + public string MaterialNumber { get; set; } + /// + /// 物料规格型号 + /// + public string Specifications { get; set; } + + /// + /// 数量 + /// + public decimal Qty { get; set; } + } +} diff --git a/src/WMS.Web.Domain/Infrastructure/IInStockTaskRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IInStockTaskRepositories.cs index eb77ea50..b7d7dd76 100644 --- a/src/WMS.Web.Domain/Infrastructure/IInStockTaskRepositories.cs +++ b/src/WMS.Web.Domain/Infrastructure/IInStockTaskRepositories.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.InStockTask; using WMS.Web.Core.Internal.Results; using WMS.Web.Domain.Entitys; @@ -41,6 +42,13 @@ namespace WMS.Web.Domain.Infrastructure /// Task> GetListBy(List sourceBillNos); + /// + /// 列表-根据来源单号模糊 + /// + /// + /// + Task> GetListBy(string sourceBillNo); + /// /// 批量添加 /// diff --git a/src/WMS.Web.Domain/Mappers/InStockMapper.cs b/src/WMS.Web.Domain/Mappers/InStockMapper.cs index 38c90439..34dd693e 100644 --- a/src/WMS.Web.Domain/Mappers/InStockMapper.cs +++ b/src/WMS.Web.Domain/Mappers/InStockMapper.cs @@ -31,13 +31,14 @@ namespace WMS.Web.Domain.Mappers .ForMember(x => x.OrgId, ops => ops.MapFrom(x => x.FPurchaseOrgId)) .ForMember(x => x.MaterialId, ops => ops.MapFrom(x => x.FMaterialId)) .ForMember(x => x.StockId, ops => ops.MapFrom(x => x.FSOSTOCKID)) + .ForMember(x => x.StockCode, ops => ops.MapFrom(x => x.StockFNumber)) .ForMember(x => x.FactoryPrice, ops => ops.MapFrom(x => x.FCHUCHANGPRICE)) .ForMember(x => x.AccruedQty, ops => ops.MapFrom(x => x.FQty)) .ForMember(x => x.Remark, ops => ops.MapFrom(x => x.FEntryNote)) .ForMember(x => x.CreateTime, ops => ops.MapFrom(x => x.FCreateDate)) - .ReverseMap(); + } } } diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs index 26645ea7..79f1b91d 100644 --- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs @@ -8,9 +8,11 @@ using System.Text; using System.Threading.Tasks; using WMS.Web.Core; using WMS.Web.Core.Dto; +using WMS.Web.Core.Dto.InStockTask; using WMS.Web.Core.Internal.Results; using WMS.Web.Domain.Entitys; using WMS.Web.Domain.Infrastructure; +using WMS.Web.Domain.Mappers; using WMS.Web.Repositories.Configuration; namespace WMS.Web.Repositories @@ -94,7 +96,7 @@ namespace WMS.Web.Repositories RealityQty = s.detail.RealityQty, Receiver = "", //ReceiveTime= s.order.ReceiveTime.ToString("yyyy-MM-dd HH:mm:ss.fff"), - ReceiveTime = s.order.ReceiveTime.HasValue? s.order.ReceiveTime.Value.ToString("yyyy-MM-dd HH:mm:ss.fff") : "", + ReceiveTime = s.order.ReceiveTime.HasValue ? s.order.ReceiveTime.Value.ToString("yyyy-MM-dd HH:mm:ss.fff") : "", Shelfer = "", //ShelfTime= s.order.ShelfTime.ToString("yyyy-MM-dd HH:mm:ss.fff"), ShelfTime = s.order.ShelfTime.HasValue ? s.order.ShelfTime.Value.ToString("yyyy-MM-dd HH:mm:ss.fff") : "", @@ -135,7 +137,7 @@ namespace WMS.Web.Repositories /// /// /// - public async Task> GetListBy(List sourceBillNos) + public async Task> GetListBy(List sourceBillNos) { return await _context.InStockTask .Include(s => s.Details) @@ -143,6 +145,33 @@ namespace WMS.Web.Repositories .ToListAsync(); } + /// + /// 列表-根据来源单号模糊 + /// + /// + /// + public async Task> GetListBy(string sourceBillNo) + { + var query = _context.InStockTaskDetails + .GroupJoin(_context.InStockTask, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders }) + .SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order }) + .Where(w => EF.Functions.Like(w.order.SourceBillNo, "%" + sourceBillNo + "%")); + + var list = await query.Select(s => new InStockTaskBillNoQueryResponse() + { + Id=s.detail.Id, + DetailsId=s.detail.Id, + SourceBillNo=s.order.SourceBillNo, + MaterialName = "", + MaterialNumber = "", + Specifications = "", + Qty=s.detail.AccruedQty + }).ToListAsync(); + return list; + + + } + /// /// 批量添加 /// @@ -245,7 +274,7 @@ namespace WMS.Web.Repositories /// /// /// - public async Task Update(InStockTask entity,bool isTransaction = true) + public async Task Update(InStockTask entity, bool isTransaction = true) { IDbContextTransaction _transaction = null; if (isTransaction)