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

仓库和仓位接口

Browse Source
This commit is contained in:
18942506660
2023-10-30 15:22:03 +08:00
parent 74d62aaea7
commit ed5dc43e42
10 changed files with 260 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,10 @@ using System.Linq;
using System.Threading.Tasks;
using WMS.Web.Core;
using WMS.Web.Core.Dto;
using WMS.Web.Core.Dto.SingleData;
using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Infrastructure;
using WMS.Web.Domain.IService.Public;
using WMS.Web.Domain.Values;
namespace WMS.Web.Api.Controllers
@@ -18,8 +21,12 @@ namespace WMS.Web.Api.Controllers
[ApiController]
public class SysConfigController : ControllerBase
{
public SysConfigController()
private readonly ILoginService _loginService;
private readonly IBasicsRepositories _basicsRepositories;
public SysConfigController(ILoginService loginService, IBasicsRepositories basicsRepositories)
{
_loginService = loginService;
_basicsRepositories = basicsRepositories;
}
/// <summary>
@@ -51,5 +58,38 @@ namespace WMS.Web.Api.Controllers
//1
return Task.FromResult(Result<EnumStatusResponse>.ReSuccess(response));
}
/// <summary>
/// 获取仓库
/// </summary>
/// <param name="name">仓库模糊匹配 不必填</param>
/// <returns></returns>
[HttpGet]
[Route("GetUcStock")]
public async Task<ResultList<UcStockResponse>> GetUcStock([FromQuery] string name)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
return ResultList<UcStockResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
var r = await _basicsRepositories.GetUcStockAsync(name, loginInfo.UserInfo.CompanyId);
return ResultList<UcStockResponse>.ReSuccess(r);
}
/// <summary>
/// 根据仓库获取仓位
/// </summary>
/// <param name="id">仓库id</param>
/// <param name="name">仓库模糊匹配 不必填</param>
/// <returns></returns>
[HttpGet]
[Route("GetSubUcStock/{id}")]
public async Task<Result<List<UcStockResponse>>> GetSubUcStock([FromRoute] int id, [FromQuery] string name)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
return Result<List<UcStockResponse>>.ReFailure(ResultCodes.Token_Invalid_Error);
var r = await _basicsRepositories.GetSubUcStockAsync(id, name);
return Result<List<UcStockResponse>>.ReSuccess(r);
}
}
}

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

@@ -175,6 +175,21 @@
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.SysConfigController.GetUcStock(System.String)">
<summary>
获取仓库
</summary>
<param name="name">仓库模糊匹配 不必填</param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.SysConfigController.GetSubUcStock(System.Int32,System.String)">
<summary>
根据仓库获取仓位
</summary>
<param name="id">仓库id</param>
<param name="name">仓库模糊匹配 不必填</param>
<returns></returns>
</member>
<member name="T:WMS.Web.Api.Controllers.TakeStockController">
<summary>
盘点单

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

@@ -85,36 +85,6 @@
<member name="P:ERP.AccessResult.AccessToken">
<remarks/>
</member>
<member name="T:WMS.Web.Core.Dto.Basics.SysStaffResponse">
<summary>
员工响应
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Basics.SysStaffResponse.Id">
<summary>
StaffID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Basics.SysStaffResponse.Name">
<summary>
名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Basics.SysStaffResponse.DeptId">
<summary>
部门ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Basics.SysStaffResponse.Telephone">
<summary>
电话
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Basics.SysStaffResponse.Disable">
<summary>
是否禁用：true为禁用，false为启用
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryRequest">
<summary>
改箱列表请求
@@ -1445,6 +1415,16 @@
每页条数 不传默认每页10 条
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.SingleData.NameRequest">
<summary>
名称请求对象
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SingleData.NameRequest.Name">
<summary>
名称
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.SingleData.SingleDataRequest">
<summary>
单点数据-请求统一对象
@@ -1485,6 +1465,71 @@
是否禁用：true为禁用，false为启用
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.SingleData.SubStockRequest">
<summary>
仓位
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SingleData.SubStockRequest.StockId">
<summary>
仓库ID
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.SingleData.SysStaffResponse">
<summary>
员工响应
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SingleData.SysStaffResponse.Id">
<summary>
StaffID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SingleData.SysStaffResponse.Name">
<summary>
名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SingleData.SysStaffResponse.DeptId">
<summary>
部门ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SingleData.SysStaffResponse.Telephone">
<summary>
电话
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SingleData.SysStaffResponse.Disable">
<summary>
是否禁用：true为禁用，false为启用
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.SingleData.UcStockResponse">
<summary>
仓库响应
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SingleData.UcStockResponse.Id">
<summary>
id
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SingleData.UcStockResponse.Name">
<summary>
名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SingleData.UcStockResponse.Code">
<summary>
编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SingleData.UcStockResponse.Disable">
<summary>
是否禁用：true为禁用，false为启用
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.TakeStock.SaveTakeStockRequest">
<summary>
盘点单明细

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

@@ -975,6 +975,19 @@
<param name="CompanyId"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Infrastructure.IBasicsRepositories.GetSubUcStockAsync(System.Int32,System.String)">
<summary>
根据仓库获取子仓库
</summary>
<param name="id">仓库id</param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Infrastructure.IBasicsRepositories.GetUcStockAsync(System.String,System.Int32)">
<summary>
获取仓库
</summary>
<returns></returns>
</member>
<member name="T:WMS.Web.Domain.Infrastructure.IInStockRepositories">
<summary>
wms入库单-仓储接口

25
src/WMS.Web.Core/Dto/SingleData/NameRequest.cs Normal file
View File

@@ -0,0 +1,25 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Core.Dto.SingleData
{
/// <summary>
/// 名称请求对象
/// </summary>
public class NameRequest:SingleDataRequest
{
public NameRequest() { }
public NameRequest(string name,int companyId)
{
this.Name = name;
this.CompanyId = companyId;
}
/// <summary>
/// 名称
/// </summary>
public string Name { get; set; }
}
}

26
src/WMS.Web.Core/Dto/SingleData/SubStockRequest.cs Normal file
View File

@@ -0,0 +1,26 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Core.Dto.SingleData
{
/// <summary>
/// 仓位
/// </summary>
public class SubStockRequest:NameRequest
{
public SubStockRequest() { }
public SubStockRequest(int stockId,string name,int companyId)
{
this.StockId = stockId;
this.Name = name;
this.CompanyId = companyId;
}
/// <summary>
/// 仓库ID
/// </summary>
public int StockId { get; set; }
}
}

2
src/WMS.Web.Core/Dto/Basics/SysStaffResponse.cs → src/WMS.Web.Core/Dto/SingleData/SysStaffResponse.cs
View File

@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Core.Dto.Basics
namespace WMS.Web.Core.Dto.SingleData
{
/// <summary>
/// 员工响应

32
src/WMS.Web.Core/Dto/SingleData/UcStockResponse.cs Normal file
View File

@@ -0,0 +1,32 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
using System.Text;
namespace WMS.Web.Core.Dto.SingleData
{
/// <summary>
/// 仓库响应
/// </summary>
public class UcStockResponse
{
/// <summary>
/// id
/// </summary>
public int Id { get; set; }
/// <summary>
/// 名称
/// </summary>
public string Name { get; set; }
/// <summary>
/// 编码
/// </summary>
public string Code { get; set; }
/// <summary>
/// 是否禁用：true为禁用，false为启用
/// </summary>
public bool Disable { get; set; }
}
}

13
src/WMS.Web.Domain/Infrastructure/IBasicsRepositories.cs
View File

@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;
using System.Threading.Tasks;
using WMS.Web.Core.Dto.Basics;
using WMS.Web.Core.Dto.SingleData;
namespace WMS.Web.Domain.Infrastructure
{
@@ -17,5 +17,16 @@ namespace WMS.Web.Domain.Infrastructure
/// <param name="CompanyId"></param>
/// <returns></returns>
Task<List<SysStaffResponse>> GetStaffListAsync(int CompanyId);
/// <summary>
/// 根据仓库获取子仓库
/// </summary>
/// <param name="id">仓库id</param>
/// <returns></returns>
Task<List<UcStockResponse>> GetSubUcStockAsync(int id, string name);
/// <summary>
/// 获取仓库
/// </summary>
/// <returns></returns>
Task<List<UcStockResponse>> GetUcStockAsync(string name, int companyId);
}
}

21
src/WMS.Web.Repositories/BasicsRepositories.cs
View File

@@ -4,7 +4,6 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WMS.Web.Core.Dto.Basics;
using WMS.Web.Core.Dto.SingleData;
using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Infrastructure;
@@ -50,5 +49,25 @@ namespace WMS.Web.Repositories
return null;
return result.Data.ToList();
}
public async Task<List<UcStockResponse>> GetSubUcStockAsync(int id, string name)
{
var result = await _singleDataService.GetSysConfigData<ResultList<UcStockResponse>, SubStockRequest>
(new SubStockRequest(id, name, _loginService.CompanyId),
SysConfigAction.GetWareouseByCustomerAndCompany);
if (!result.Success)
return null;
return result.Data.ToList();
}
public async Task<List<UcStockResponse>> GetUcStockAsync(string name, int companyId)
{
var result = await _singleDataService.GetSysConfigData<ResultList<UcStockResponse>, NameRequest>
(new NameRequest(name, companyId),
SysConfigAction.GetWarehouseByNameAndCompany);
if (!result.Success)
return null;
return result.Data.ToList();
}
}
}