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-10-30 15:52:58 +08:00
parent e4c46444d1
commit f2e6ef430d
21 changed files with 767 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/WMS.Web.Api/Controllers/InStockController.cs
View File

@@ -48,19 +48,19 @@ namespace WMS.Web.Api.Controllers
}
/// <summary>
/// 保存
/// 上架
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
[HttpPost]
[Route("Save")]
public async Task<Result> Save(List<SaveInStockRequest> dto)
[Route("Shelf")]
public async Task<Result> Shelf([FromBody] SaveInStockRequest 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 _inStockService.Save(dto, loginInfo);
return await _inStockService.Shelf(dto, loginInfo);
}
/// <summary>
@@ -70,7 +70,7 @@ namespace WMS.Web.Api.Controllers
/// <returns></returns>
[HttpPost]
[Route("Sync")]
public async Task<Result> Sync(OperateRequest dto)
public async Task<Result> Sync([FromBody] OperateRequest dto)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)

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

@@ -5,8 +5,10 @@ using System.Collections.Generic;
using System.Linq;
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.Infrastructure;
using WMS.Web.Domain.IService;
using WMS.Web.Domain.IService.Public;
using WMS.Web.Domain.Values;
@@ -20,10 +22,12 @@ namespace WMS.Web.Api.Controllers
public class InStockTaskController : ControllerBase
{
private readonly ILoginService _loginService;
private readonly IInStockService _inStockService;
private readonly IInStockTaskRepositories _inStockTaskRepositories;
public InStockTaskController(ILoginService loginService, IInStockTaskRepositories inStockTaskRepositories)
public InStockTaskController(ILoginService loginService, IInStockTaskRepositories inStockTaskRepositories, IInStockService inStockService)
{
this._loginService = loginService;
this._inStockService = inStockService;
this._inStockTaskRepositories = inStockTaskRepositories;
}
@@ -42,5 +46,21 @@ namespace WMS.Web.Api.Controllers
var result = await _inStockTaskRepositories.GetPagedList(dto);
return result;
}
/// <summary>
/// 收货
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
[HttpPost]
[Route("Receive")]
public async Task<Result> Receive([FromBody] UpdateInStockTaskRequest 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 _inStockService.Receive(dto, loginInfo);
}
}
}

4
src/WMS.Web.Api/Controllers/SysConfigController.cs
View File

@@ -47,6 +47,10 @@ namespace WMS.Web.Api.Controllers
{
response.InstockType.Add(enumv.ToString(), enumv.GetRemark());
}
foreach (InstockStatus enumv in Enum.GetValues(typeof(InstockStatus)))
{
response.InstockStatus.Add(enumv.ToString(), enumv.GetRemark());
}
//2
//1
return Task.FromResult(Result<EnumStatusResponse>.ReSuccess(response));

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

@@ -35,9 +35,9 @@
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.InStockController.Save(System.Collections.Generic.List{WMS.Web.Core.Dto.InStock.SaveInStockRequest})">
<member name="M:WMS.Web.Api.Controllers.InStockController.Shelf(WMS.Web.Core.Dto.InStock.SaveInStockRequest)">
<summary>
保存
上架
</summary>
<param name="dto"></param>
<returns></returns>
@@ -61,6 +61,13 @@
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.InStockTaskController.Receive(WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskRequest)">
<summary>
收货
</summary>
<param name="dto"></param>
<returns></returns>
</member>
<member name="T:WMS.Web.Api.Controllers.LoginController">
<summary>
登录接口

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

@@ -250,6 +250,11 @@
入库单类型
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.EnumStatusResponse.InstockStatus">
<summary>
入库状态
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.ErpBillQueryDto">
<summary>
ERP：单据查询-dto
@@ -390,6 +395,51 @@
创建时间
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.InStockTask.InStockTaskInfoDto">
<summary>
入库任务单-详情信息
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskDetailsRequest">
<summary>
修改-入库任务单-明细对象
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskDetailsRequest.Id">
<summary>
明细ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskDetailsRequest.Fid">
<summary>
单据头ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskDetailsRequest.MaterialId">
<summary>
物料ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskDetailsRequest.ReceiveQty">
<summary>
收货数量
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskRequest">
<summary>
入库任务-修改请求对象
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskRequest.Id">
<summary>
单据ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskRequest.Details">
<summary>
明细
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.InStockQueryRequest">
<summary>
入库单查询请求对象
@@ -525,6 +575,46 @@
同步成功或者失败
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.InStock.SaveInStockDetailsRequest">
<summary>
保存入库单明细-请求对象
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStock.SaveInStockDetailsRequest.SourceBillNo">
<summary>
来源单号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStock.SaveInStockDetailsRequest.SupplierId">
<summary>
供应商
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStock.SaveInStockDetailsRequest.OrgId">
<summary>
组织
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStock.SaveInStockDetailsRequest.MaterialId">
<summary>
物料Id
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStock.SaveInStockDetailsRequest.StockId">
<summary>
仓库ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStock.SaveInStockDetailsRequest.SubStockId">
<summary>
仓位ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStock.SaveInStockDetailsRequest.Qty">
<summary>
入库数量
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.InStock.SaveInStockRequest">
<summary>
保存入库单-请求对象
@@ -535,41 +625,16 @@
入库类型
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStock.SaveInStockRequest.SourceBillNo">
<summary>
来源单号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStock.SaveInStockRequest.SupplierId">
<member name="P:WMS.Web.Core.Dto.InStock.SaveInStockRequest.TaskId">
<summary>
供应商
任务单ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStock.SaveInStockRequest.OrgId">
<member name="P:WMS.Web.Core.Dto.InStock.SaveInStockRequest.Details">
<summary>
组织
明细
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStock.SaveInStockRequest.MaterialId">
<summary>
物料Id
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStock.SaveInStockRequest.StockId">
<summary>
仓库ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStock.SaveInStockRequest.SubStockId">
<summary>
仓位ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStock.SaveInStockRequest.Qty">
<summary>
入库数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Login.AccessTokenDto.Token">
<summary>
授权token -- 给前端用的验证token
@@ -955,11 +1020,6 @@
用户在单点中维一ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.MoveBoxRecord.MoveBoxRecordQueryInfoResponse.Specifications">
<summary>
规格型号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.MoveBoxRecord.MoveBoxRecordQueryInfoResponse.Box">
<summary>
箱号
@@ -1615,6 +1675,56 @@
来源单号
</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>
入库任务表-查询对象
@@ -1710,12 +1820,12 @@
收货时间
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.Operator">
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.Shelfer">
<summary>
上架人
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.OperateTime">
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.ShelfTime">
<summary>
入库时间
</summary>

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

@@ -270,6 +270,11 @@
ID
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.InStock.TaskId">
<summary>
任务单ID
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.InStock.BillNo">
<summary>
单据编号
@@ -391,14 +396,14 @@
收货时间
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.InStockTask.OperatorId">
<member name="P:WMS.Web.Domain.Entitys.InStockTask.ShelferId">
<summary>
操作人（上架人）
上架人
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.InStockTask.OperateTime">
<member name="P:WMS.Web.Domain.Entitys.InStockTask.ShelfTime">
<summary>
操作时间（入库时间）
入库时间(上架时间)
</summary>
</member>
<member name="F:WMS.Web.Domain.Entitys.InStockTask.Details">
@@ -412,6 +417,18 @@
</summary>
<param name="newId"></param>
</member>
<member name="M:WMS.Web.Domain.Entitys.InStockTask.Receive(System.Int32)">
<summary>
收货
</summary>
<param name="creatorId"></param>
</member>
<member name="M:WMS.Web.Domain.Entitys.InStockTask.Shelf(System.Int32)">
<summary>
上架
</summary>
<param name="creatorId"></param>
</member>
<member name="T:WMS.Web.Domain.Entitys.InStockTaskDetails">
<summary>
erp入库任务明细表
@@ -995,6 +1012,20 @@
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Infrastructure.IInStockTaskRepositories.Get(System.Int32)">
<summary>
详情
</summary>
<param name="id"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Infrastructure.IInStockTaskRepositories.GetList(System.Collections.Generic.List{System.Int32})">
<summary>
列表
</summary>
<param name="ids"></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>
批量添加
@@ -1069,14 +1100,6 @@
入库单服务接口
</summary>
</member>
<member name="M:WMS.Web.Domain.IService.IInStockService.Save(System.Collections.Generic.List{WMS.Web.Core.Dto.InStock.SaveInStockRequest},WMS.Web.Core.Dto.Login.LoginInDto)">
<summary>
保存
</summary>
<param name="dto"></param>
<param name="loginInfo"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.IInStockService.Sync(WMS.Web.Core.Dto.OperateRequest)">
<summary>
同步金蝶
@@ -1084,6 +1107,51 @@
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.IInStockService.Receive(WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskRequest,WMS.Web.Core.Dto.Login.LoginInDto)">
<summary>
收货
</summary>
<param name="dto"></param>
<param name="loginInfo"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.IInStockService.Shelf(WMS.Web.Core.Dto.InStock.SaveInStockRequest,WMS.Web.Core.Dto.Login.LoginInDto)">
<summary>
上架
</summary>
<param name="instock"></param>
<param name="loginInfo"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.IInStockService.Save(WMS.Web.Core.Dto.InStock.SaveInStockRequest,System.Int32,System.Boolean)">
<summary>
保存-出库单
</summary>
<param name="dto"></param>
<param name="staffId"></param>
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.IInStockService.Update(WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskRequest,System.Int32,System.Boolean,System.Boolean)">
<summary>
修改-入库任务信息
</summary>
<param name="dto"></param>
<param name="staffId"></param>
<param name="isReceive"></param>
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.IInStockService.UpdateRange(System.Collections.Generic.List{System.Int32},System.Int32,System.Boolean,System.Boolean)">
<summary>
批量修改-入库任务信息
</summary>
<param name="ids"></param>
<param name="staffId"></param>
<param name="isReceive"></param>
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="T:WMS.Web.Domain.IService.IOutStockService">
<summary>
出库服务
@@ -1582,14 +1650,6 @@
入库单服务
</summary>
</member>
<member name="M:WMS.Web.Domain.Services.InStockService.Save(System.Collections.Generic.List{WMS.Web.Core.Dto.InStock.SaveInStockRequest},WMS.Web.Core.Dto.Login.LoginInDto)">
<summary>
出库单
</summary>
<param name="dto"></param>
<param name="loginInfo"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.InStockService.Sync(WMS.Web.Core.Dto.OperateRequest)">
<summary>
同步金蝶
@@ -1597,6 +1657,51 @@
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.InStockService.Receive(WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskRequest,WMS.Web.Core.Dto.Login.LoginInDto)">
<summary>
收货
</summary>
<param name="dto"></param>
<param name="loginInfo"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.InStockService.Shelf(WMS.Web.Core.Dto.InStock.SaveInStockRequest,WMS.Web.Core.Dto.Login.LoginInDto)">
<summary>
上架
</summary>
<param name="instock"></param>
<param name="loginInfo"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.InStockService.Save(WMS.Web.Core.Dto.InStock.SaveInStockRequest,System.Int32,System.Boolean)">
<summary>
保存-出库单
</summary>
<param name="dto"></param>
<param name="staffId"></param>
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.InStockService.Update(WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskRequest,System.Int32,System.Boolean,System.Boolean)">
<summary>
修改-入库任务信息
</summary>
<param name="dto"></param>
<param name="staffId"></param>
<param name="isReceive"></param>
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.InStockService.UpdateRange(System.Collections.Generic.List{System.Int32},System.Int32,System.Boolean,System.Boolean)">
<summary>
批量修改-入库任务信息
</summary>
<param name="ids"></param>
<param name="staffId"></param>
<param name="isReceive"></param>
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="T:WMS.Web.Domain.Services.OutStockService">
<summary>
出库服务