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

通过编号查询到任务采购单据

Browse Source
This commit is contained in:
tongfei
2023-11-02 16:34:08 +08:00
parent f58556b0c4
commit f1cd7f0f5f
12 changed files with 457 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/WMS.Web.Api/Controllers/InStockTaskController.cs
View File

@@ -48,7 +48,7 @@ namespace WMS.Web.Api.Controllers
}
/// <summary>
/// 收货
/// 收货-pad
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
@@ -62,5 +62,22 @@ namespace WMS.Web.Api.Controllers
return await _inStockService.Receive(dto, loginInfo);
}
/// <summary>
/// 采购订单-单据编号模糊-pad
/// </summary>
/// <param name="code"></param>
/// <returns></returns>
[HttpPost]
[Route("Purchase/{code}")]
public async Task<ResultList<InStockTaskBillNoQueryResponse>> Purchase([FromRoute] string code)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
return ResultList<InStockTaskBillNoQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
var list= await _inStockTaskRepositories.GetListBy(code);
return ResultList<InStockTaskBillNoQueryResponse>.ReSuccess(list);
}
}
}

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

@@ -89,11 +89,18 @@
</member>
<member name="M:WMS.Web.Api.Controllers.InStockTaskController.Receive(WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskRequest)">
<summary>
收货
收货-pad
</summary>
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.InStockTaskController.Purchase(System.String)">
<summary>
采购订单-单据编号模糊-pad
</summary>
<param name="code"></param>
<returns></returns>
</member>
<member name="T:WMS.Web.Api.Controllers.InventoryController">
<summary>
即时库存相关-接口

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

@@ -760,11 +760,111 @@
备注
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskDetailsInfoDto.Id">
<summary>
ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskDetailsInfoDto.Fid">
<summary>
单据头ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskDetailsInfoDto.MaterialId">
<summary>
物料ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskDetailsInfoDto.MaterialName">
<summary>
物料名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskDetailsInfoDto.MaterialNumber">
<summary>
物料编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskDetailsInfoDto.Specifications">
<summary>
物料规格型号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskDetailsInfoDto.AccruedQty">
<summary>
数量
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.InStockTask.InStockTaskInfoDto">
<summary>
入库任务单-详情信息
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskInfoDto.Id">
<summary>
ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskInfoDto.BillNo">
<summary>
单据编号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskInfoDto.SourceBillNo">
<summary>
来源单号
</summary>
</member>
<member name="F:WMS.Web.Core.Dto.InStockTask.InStockTaskInfoDto.Details">
<summary>
明细
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryResponse">
<summary>
来源单号模糊查询响应对象
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryResponse.Id">
<summary>
ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryResponse.DetailsId">
<summary>
明细ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryResponse.SourceBillNo">
<summary>
来源单号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryResponse.MaterialId">
<summary>
物料ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryResponse.MaterialName">
<summary>
物料名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryResponse.MaterialNumber">
<summary>
物料编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryResponse.Specifications">
<summary>
物料规格型号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryResponse.Qty">
<summary>
数量
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskDetailsRequest">
<summary>
修改-入库任务单-明细对象
@@ -805,6 +905,181 @@
明细
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.InStockTaskQueryRequest">
<summary>
入库任务-查询请求对象
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryRequest.SourceBillNo">
<summary>
来源单号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryRequest.Type">
<summary>
入库类型
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryRequest.Status">
<summary>
入库状态
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryRequest.Receiver">
<summary>
收货人
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryRequest.Operator">
<summary>
上架人
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryRequest.CreateBeginDate">
<summary>
创建时间（入库时间）
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryRequest.CreateEndDate">
<summary>
创建时间（入库时间）
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryRequest.SupplierId">
<summary>
供应商ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryRequest.OrgId">
<summary>
组织ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryRequest.MaterialNumber">
<summary>
物料编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryRequest.StockId">
<summary>
仓库ID
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.InStockTaskQueryResponse">
<summary>
入库任务表-查询对象
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.Id">
<summary>
ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.DetailsId">
<summary>
明细ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.BillNo">
<summary>
单据编号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.SourceBillNo">
<summary>
来源单号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.Status">
<summary>
入库状态
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.Type">
<summary>
入库类型
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.Supplier">
<summary>
供应商Id
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.Org">
<summary>
组织ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.MaterialName">
<summary>
物料名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.MaterialNumber">
<summary>
物料编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.Specifications">
<summary>
物料规格型号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.FactoryPrice">
<summary>
出厂价
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.Stock">
<summary>
收货仓库
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.AccruedQty">
<summary>
应入数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.ReceiveQty">
<summary>
收货数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.RealityQty">
<summary>
实际入库数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.Receiver">
<summary>
收货人
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.ReceiveTime">
<summary>
收货时间
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.Shelfer">
<summary>
上架人
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.ShelfTime">
<summary>
入库时间
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.Remark">
<summary>
明细备注
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.CreateTime">
<summary>
创建时间（erp那边的创建时间）
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.InStockQueryRequest">
<summary>
入库单查询请求对象
@@ -2360,181 +2635,6 @@
盘点日期-结束
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.InStockTaskQueryRequest">
<summary>
入库任务-查询请求对象
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryRequest.SourceBillNo">
<summary>
来源单号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryRequest.Type">
<summary>
入库类型
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryRequest.Status">
<summary>
入库状态
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryRequest.Receiver">
<summary>
收货人
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryRequest.Operator">
<summary>
上架人
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryRequest.CreateBeginDate">
<summary>
创建时间（入库时间）
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryRequest.CreateEndDate">
<summary>
创建时间（入库时间）
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryRequest.SupplierId">
<summary>
供应商ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryRequest.OrgId">
<summary>
组织ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryRequest.MaterialNumber">
<summary>
物料编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryRequest.StockId">
<summary>
仓库ID
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.InStockTaskQueryResponse">
<summary>
入库任务表-查询对象
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.Id">
<summary>
ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.DetailsId">
<summary>
明细ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.BillNo">
<summary>
单据编号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.SourceBillNo">
<summary>
来源单号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.Status">
<summary>
入库状态
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.Type">
<summary>
入库类型
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.Supplier">
<summary>
供应商Id
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.Org">
<summary>
组织ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.MaterialName">
<summary>
物料名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.MaterialNumber">
<summary>
物料编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.Specifications">
<summary>
物料规格型号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.FactoryPrice">
<summary>
出厂价
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.Stock">
<summary>
收货仓库
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.AccruedQty">
<summary>
应入数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.ReceiveQty">
<summary>
收货数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.RealityQty">
<summary>
实际入库数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.Receiver">
<summary>
收货人
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.ReceiveTime">
<summary>
收货时间
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.Shelfer">
<summary>
上架人
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.ShelfTime">
<summary>
入库时间
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.Remark">
<summary>
明细备注
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.CreateTime">
<summary>
创建时间（erp那边的创建时间）
</summary>
</member>
<member name="T:WMS.Web.Core.EntityBase">
<summary>
基类

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

@@ -1181,6 +1181,13 @@
<param name="sourceBillNos"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Infrastructure.IInStockTaskRepositories.GetListBy(System.String)">
<summary>
列表-根据来源单号模糊
</summary>
<param name="sourceBillNo"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Infrastructure.IInStockTaskRepositories.AddRange(System.Collections.Generic.List{WMS.Web.Domain.Entitys.InStockTask},System.Boolean)">
<summary>
批量添加

41
src/WMS.Web.Core/Dto/InStockTask/InStockTaskDetailsInfoDto.cs Normal file
View File

@@ -0,0 +1,41 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Core.Dto.InStockTask
{
public class InStockTaskDetailsInfoDto
{
/// <summary>
/// ID
/// </summary>
public int Id { get; set; }
/// <summary>
/// 单据头ID
/// </summary>
public int Fid { get; set; }
/// <summary>
/// 物料ID
/// </summary>
public int MaterialId { get; set; }
/// <summary>
/// 物料名称
/// </summary>
public string MaterialName { get; set; }
/// <summary>
/// 物料编码
/// </summary>
public string MaterialNumber { get; set; }
/// <summary>
/// 物料规格型号
/// </summary>
public string Specifications { get; set; }
/// <summary>
/// 数量
/// </summary>
public decimal AccruedQty { get; set; }
}
}

17
src/WMS.Web.Core/Dto/InStockTask/InStockTaskInfoDto.cs
View File

@@ -9,5 +9,22 @@ namespace WMS.Web.Core.Dto.InStockTask
/// </summary>
public class InStockTaskInfoDto
{
/// <summary>
/// ID
/// </summary>
public int Id { get; set; }
/// <summary>
/// 单据编号
/// </summary>
public string BillNo { get; set; }
/// <summary>
/// 来源单号
/// </summary>
public string SourceBillNo { get; set; }
/// <summary>
/// 明细
/// </summary>
public List<InStockTaskDetailsInfoDto> Details = new List<InStockTaskDetailsInfoDto>();
}
}

0
src/WMS.Web.Core/Dto/TaskInStock/InStockTaskQueryRequest.cs → src/WMS.Web.Core/Dto/InStockTask/InStockTaskQueryRequest.cs
View File

0
src/WMS.Web.Core/Dto/TaskInStock/InStockTaskQueryResponse.cs → src/WMS.Web.Core/Dto/InStockTask/InStockTaskQueryResponse.cs
View File

49
src/WMS.Web.Core/Dto/InStockTask/InStockTaskResponse.cs Normal file
View File

@@ -0,0 +1,49 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Core.Dto.InStockTask
{
/// <summary>
/// 来源单号模糊查询响应对象
/// </summary>
public class InStockTaskBillNoQueryResponse
{
/// <summary>
/// ID
/// </summary>
public int Id { get; set; }
/// <summary>
/// 明细ID
/// </summary>
public int DetailsId { get; set; }
/// <summary>
/// 来源单号
/// </summary>
public string SourceBillNo { get; set; }
/// <summary>
/// 物料ID
/// </summary>
public int MaterialId { get; set; }
/// <summary>
/// 物料名称
/// </summary>
public string MaterialName { get; set; }
/// <summary>
/// 物料编码
/// </summary>
public string MaterialNumber { get; set; }
/// <summary>
/// 物料规格型号
/// </summary>
public string Specifications { get; set; }
/// <summary>
/// 数量
/// </summary>
public decimal Qty { get; set; }
}
}

8
src/WMS.Web.Domain/Infrastructure/IInStockTaskRepositories.cs
View File

@@ -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
/// <returns></returns>
Task<List<InStockTask>> GetListBy(List<string> sourceBillNos);
/// <summary>
/// 列表-根据来源单号模糊
/// </summary>
/// <param name="sourceBillNo"></param>
/// <returns></returns>
Task<List<InStockTaskBillNoQueryResponse>> GetListBy(string sourceBillNo);
/// <summary>
/// 批量添加
/// </summary>

3
src/WMS.Web.Domain/Mappers/InStockMapper.cs
View File

@@ -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();
}
}
}

29
src/WMS.Web.Repositories/InStockTaskRepositories.cs
View File

@@ -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
@@ -143,6 +145,33 @@ namespace WMS.Web.Repositories
.ToListAsync();
}
/// <summary>
/// 列表-根据来源单号模糊
/// </summary>
/// <param name="sourceBillNo"></param>
/// <returns></returns>
public async Task<List<InStockTaskBillNoQueryResponse>> 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;
}
/// <summary>
/// 批量添加
/// </summary>