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 13:44:56 +08:00
parent 53da585693
commit da5f3cdb33
10 changed files with 152 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,7 +92,7 @@ namespace WMS.Web.Api.Controllers
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);
var r = await _basicsRepositories.GetUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), name, loginInfo.UserInfo.CompanyId);
return ResultList<UcStockResponse>.ReSuccess(r);
}
@@ -104,12 +104,12 @@ namespace WMS.Web.Api.Controllers
/// <returns></returns>
[HttpGet]
[Route("GetSubUcStock/{id}")]
public async Task<Result<List<UcStockResponse>>> GetSubUcStock([FromRoute] int id, [FromQuery] string name)
public async Task<Result<List<UcStockResponse>>> GetSubUcStock([FromRoute] int id)
{
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);
var r = await _basicsRepositories.GetSubUcStockAsync(id);
return Result<List<UcStockResponse>>.ReSuccess(r);
}

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

@@ -241,7 +241,7 @@
<param name="name">仓库模糊匹配 不必填</param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.SysConfigController.GetSubUcStock(System.Int32,System.String)">
<member name="M:WMS.Web.Api.Controllers.SysConfigController.GetSubUcStock(System.Int32)">
<summary>
根据仓库获取仓位
</summary>

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

@@ -605,6 +605,31 @@
仓库编码
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.ErpStockDto">
<summary>
仓库信息
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpStockDto.Id">
<summary>
id
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpStockDto.Code">
<summary>
编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpStockDto.Name">
<summary>
名字
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpStockDto.OrgCode">
<summary>
业务组织(使用组织)编码
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.ErpSave`1">
<summary>
Erp同步数据时单据头
@@ -627,7 +652,7 @@
</member>
<member name="P:WMS.Web.Core.Dto.Erp.TakeStock.ErpTakeStockSaveDto.Type">
<summary>
单据类型(标准盘亏单; 标准盘盈单)
单据类型(标准盘亏单; 标准盘盈单 PY01_SYS) 盘亏 PK01_SYS
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.TakeStock.ErpTakeStockSaveDto.StockOrgId">
@@ -637,7 +662,7 @@
</member>
<member name="P:WMS.Web.Core.Dto.Erp.TakeStock.ErpTakeStockSaveDto.FOwnerTypeIdHead">
<summary>
货主类型: 默认为业务组织
货主类型: 默认为业务组织 BD_OwnerOrg
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.TakeStock.ErpTakeStockSaveDto.BillNo">
@@ -657,17 +682,17 @@
</member>
<member name="P:WMS.Web.Core.Dto.Erp.TakeStock.ErpTakeStockDetailsSaveDto.FStockStatusId">
<summary>
库存状态
库存状态 KCZT001
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.TakeStock.ErpTakeStockDetailsSaveDto.FOwnerTypeId">
<summary>
货主类型: 默认为业务组织
<summary>
货主类型: 默认为业务组织 BD_OwnerOrg
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.TakeStock.ErpTakeStockDetailsSaveDto.FOwnerid">
<summary>
取仓库对应的货主信息
取仓库对应的货主信息 货主: 等于库存组织
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.TakeStock.ErpTakeStockDetailsSaveDto.FKeeperTypeId">
@@ -677,7 +702,7 @@
</member>
<member name="P:WMS.Web.Core.Dto.Erp.TakeStock.ErpTakeStockDetailsSaveDto.FKeeperId">
<summary>
保管者
保管者 仓库”库存组织”
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.TakeStock.ErpTakeStockDetailsSaveDto.MaterialId">
@@ -2130,6 +2155,21 @@
是否禁用：true为禁用，false为启用
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.SingleData.SystemCodeRequest">
<summary>
系统code获取
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SingleData.SystemCodeRequest.Code">
<summary>
系统code
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SingleData.SystemCodeRequest.Name">
<summary>
仓库名称
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.SingleData.UcStockResponse">
<summary>
仓库响应

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

@@ -1073,14 +1073,14 @@
<param name="CompanyId"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Infrastructure.IBasicsRepositories.GetSubUcStockAsync(System.Int32,System.String)">
<member name="M:WMS.Web.Domain.Infrastructure.IBasicsRepositories.GetSubUcStockAsync(System.Int32)">
<summary>
根据仓库获取子仓库
</summary>
<param name="id">仓库id</param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Infrastructure.IBasicsRepositories.GetUcStockAsync(System.String,System.Int32)">
<member name="M:WMS.Web.Domain.Infrastructure.IBasicsRepositories.GetUcStockAsync(System.String,System.String,System.Int32)">
<summary>
获取仓库
</summary>
@@ -1393,6 +1393,12 @@
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForStock">
<summary>
获取仓库信息
</summary>
<returns></returns>
</member>
<member name="T:WMS.Web.Domain.IService.Public.ILoginService">
<summary>
登录服务接口
@@ -2013,6 +2019,12 @@
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForStock">
<summary>
获取使用组织
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.HttpClientService.GetAsync``1(System.String,System.Int32)">
<summary>
Get方法
@@ -2436,6 +2448,11 @@
供应商
</summary>
</member>
<member name="F:WMS.Web.Domain.Values.Erp.FormIdParam.BD_STOCK">
<summary>
仓库
</summary>
</member>
<member name="T:WMS.Web.Domain.Values.InstockStatus">
<summary>
入库状态
@@ -2506,6 +2523,16 @@
出库
</summary>
</member>
<member name="T:WMS.Web.Domain.Values.ManagementSystemCode">
<summary>
管理系统的编码：这里的枚举值跟单点的（仓库管理系统表）数据同步编码就行了
</summary>
</member>
<member name="F:WMS.Web.Domain.Values.ManagementSystemCode.GLXT0004">
<summary>
WMS系统
</summary>
</member>
<member name="T:WMS.Web.Domain.Values.MoveBoxType">
<summary>
移箱类型
@@ -2923,7 +2950,7 @@
</member>
<member name="F:WMS.Web.Domain.Values.Single.SysConfigAction.GetChildWarehouseByPid">
<summary>
仓位-根据仓库和名称
仓位-根据仓库
</summary>
</member>
<member name="F:WMS.Web.Domain.Values.Single.SysConfigAction.GetChildWarehouse">
@@ -3026,6 +3053,11 @@
获取全部员工：根据公司和组织
</summary>
</member>
<member name="F:WMS.Web.Domain.Values.Single.SysConfigAction.GetWmsWarehouseBySystemCodeAndNameAndCompany">
<summary>
获取仓库:：根据管理系统code和仓库名称和公司ID，备注系统code和公司ID是必填
</summary>
</member>
<member name="T:WMS.Web.Domain.Values.TakeStockType">
<summary>
盘点单类型

6
src/WMS.Web.Core/Dto/SingleData/SubStockRequest.cs
View File

@@ -7,15 +7,13 @@ namespace WMS.Web.Core.Dto.SingleData
/// <summary>
/// 仓位
/// </summary>
public class SubStockRequest:NameRequest
public class SubStockRequest
{
public SubStockRequest() { }
public SubStockRequest(int stockId,string name,int companyId)
public SubStockRequest(int stockId)
{
this.StockId = stockId;
this.Name = name;
this.CompanyId = companyId;
}
/// <summary>

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

@@ -0,0 +1,32 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Text;
namespace WMS.Web.Core.Dto.SingleData
{
/// <summary>
/// 系统code获取
/// </summary>
public class SystemCodeRequest : SingleDataRequest
{
public SystemCodeRequest() { }
public SystemCodeRequest(string systemCode,string name, int companyId)
{
this.Code = systemCode;
this.Name = name;
this.CompanyId = companyId;
}
/// <summary>
/// 系统code
/// </summary>
[Required(ErrorMessage = "系统code不能未空")]
public string Code { get; set; }
/// <summary>
/// 仓库名称
/// </summary>
public string Name { get; set; }
}
}

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

@@ -22,11 +22,11 @@ namespace WMS.Web.Domain.Infrastructure
/// </summary>
/// <param name="id">仓库id</param>
/// <returns></returns>
Task<List<UcStockResponse>> GetSubUcStockAsync(int id, string name);
Task<List<UcStockResponse>> GetSubUcStockAsync(int stockId);
/// <summary>
/// 获取仓库
/// </summary>
/// <returns></returns>
Task<List<UcStockResponse>> GetUcStockAsync(string name, int companyId);
Task<List<UcStockResponse>> GetUcStockAsync(string systemCode,string name, int companyId);
}
}

17
src/WMS.Web.Domain/Values/ManagementSystemCode.cs Normal file
View File

@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Domain.Values
{
/// <summary>
/// 管理系统的编码：这里的枚举值跟单点的（仓库管理系统表）数据同步编码就行了
/// </summary>
public enum ManagementSystemCode
{
/// <summary>
/// WMS系统
/// </summary>
GLXT0004=1,
}
}

7
src/WMS.Web.Domain/Values/Single/SysConfigAction.cs
View File

@@ -95,7 +95,7 @@ namespace WMS.Web.Domain.Values.Single
GetWareouseByCustomerAndCompany = 21,
/// <summary>
/// 仓位-根据仓库和名称
/// 仓位-根据仓库
/// </summary>
GetChildWarehouseByPid = 22,
/// <summary>
@@ -182,5 +182,10 @@ namespace WMS.Web.Domain.Values.Single
/// 获取全部员工：根据公司和组织
/// </summary>
GetStaffAllByOrgAndCompany = 42,
/// <summary>
/// 获取仓库:：根据管理系统code和仓库名称和公司ID，备注系统code和公司ID是必填
/// </summary>
GetWmsWarehouseBySystemCodeAndNameAndCompany=43,
}
}

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

@@ -50,21 +50,21 @@ namespace WMS.Web.Repositories
return result.Data.ToList();
}
public async Task<List<UcStockResponse>> GetSubUcStockAsync(int id, string name)
public async Task<List<UcStockResponse>> GetSubUcStockAsync(int stockId)
{
var result = await _singleDataService.GetSysConfigData<ResultList<UcStockResponse>, SubStockRequest>
(new SubStockRequest(id, name, _loginService.CompanyId),
SysConfigAction.GetWareouseByCustomerAndCompany);
(new SubStockRequest(stockId),
SysConfigAction.GetChildWarehouseByPid);
if (!result.Success)
return null;
return result.Data.ToList();
}
public async Task<List<UcStockResponse>> GetUcStockAsync(string name, int companyId)
public async Task<List<UcStockResponse>> GetUcStockAsync(string systemCode, string name, int companyId)
{
var result = await _singleDataService.GetSysConfigData<ResultList<UcStockResponse>, NameRequest>
(new NameRequest(name, companyId),
SysConfigAction.GetWarehouseByNameAndCompany);
var result = await _singleDataService.GetSysConfigData<ResultList<UcStockResponse>, SystemCodeRequest>
(new SystemCodeRequest(systemCode,name, companyId),
SysConfigAction.GetWmsWarehouseBySystemCodeAndNameAndCompany);
if (!result.Success)
return null;
return result.Data.ToList();