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

Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

Browse Source
This commit is contained in:
tongfei
2023-11-15 15:02:41 +08:00
parent 2cbc496e1f bff2ce4b3e
commit eb4d812b9b
20 changed files with 155 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -263,6 +263,23 @@ namespace WMS.Web.Api.Controllers
var r = await _basicsRepositories.GetSubUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), name, loginInfo.UserInfo.CompanyId);
return Result<List<UcSubStockResponse>>.ReSuccess(r);
}
/// <summary>
/// 获取仓位：精确名字
/// </summary>
/// <param name="name">精确名字</param>
/// <returns></returns>
[HttpGet]
[Route("GetSubUcStockPrecisionByName/{name}")]
public async Task<Result<UcSubStockResponse>> GetSubUcStockPrecisionByName([FromRoute] string name)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
return Result<UcSubStockResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
var r = await _basicsRepositories.GetSubUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), name, loginInfo.UserInfo.CompanyId);
var subStock = r.FirstOrDefault(f => f.Name.Equals(name));
if (subStock == null) return Result<UcSubStockResponse>.ReFailure(ResultCodes.NoDateError);
return Result<UcSubStockResponse>.ReSuccess(subStock);
}
/// <summary>
/// 根据箱号获取箱信息

8
src/WMS.Web.Api/Controllers/TestController.cs
View File

@@ -11,6 +11,7 @@ using System.ServiceModel;
using System.Threading.Tasks;
using WMS.Web.Core.Dto;
using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Entitys;
using WMS.Web.Domain.Infrastructure;
using WMS.Web.Domain.IService;
using WMS.Web.Domain.IService.Public;
@@ -26,21 +27,24 @@ namespace WMS.Web.Api.Controllers
private IBasicsRepositories _transactionRepositories;
private readonly IOpsService _opsService;
private readonly IBoxService _boxService;
private readonly IOutStockTaskRepositories _outStockTaskRepositories;
public TestController(IErpService erpService, IInStockTaskService inStockTaskService,
IBasicsRepositories transactionRepositories, IOpsService opsService, IBoxService boxService)
IBasicsRepositories transactionRepositories, IOpsService opsService, IBoxService boxService,
IOutStockTaskRepositories outStockTaskRepositories)
{
this._erpService = erpService;
this._inStockTaskService = inStockTaskService;
this._transactionRepositories = transactionRepositories;
_opsService = opsService;
_boxService = boxService;
_outStockTaskRepositories = outStockTaskRepositories;
}
[HttpGet]
[Route("hj")]
public async Task<string> TestHJ()
{
await _boxService.Sync();
// await _boxService.Sync();
//var res = await this._erpService.BillQueryForDeliveryNoticeOutStock(null,DateTime.Now.AddDays(-300));
//var result= await this._erpService.BillQueryForPurchaseInStock();
//var result = await this._erpService.BillQueryForOrg();

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

@@ -468,6 +468,13 @@
<param name="name">仓位名称模糊匹配</param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.SysConfigController.GetSubUcStockPrecisionByName(System.String)">
<summary>
获取仓位：精确名字
</summary>
<param name="name">精确名字</param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.SysConfigController.GetBox(System.Collections.Generic.List{System.String})">
<summary>
根据箱号获取箱信息

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

@@ -410,6 +410,11 @@
目标箱子ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.SaveChangeBoxRecordRequest.Details">
<summary>
明细
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.ChangeBoxRecord.SaveChangeBoxRecordDetailsRequest">
<summary>
明细

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

@@ -836,11 +836,6 @@
单据编号
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStock.SourceBillNo">
<summary>
来源单号
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStock.Type">
<summary>
单据类型
@@ -923,11 +918,16 @@
单据头Id
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStockDetails.SaleBillNo">
<member name="P:WMS.Web.Domain.Entitys.OutStockDetails.SaleBillNos">
<summary>
销售订单号
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStockDetails.SourceBillNos">
<summary>
来源单号
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStockDetails.MaterialId">
<summary>
物料Id
@@ -1059,7 +1059,7 @@
来源单号(合并后有多个)
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStockTaskDetails.SaleBillNo">
<member name="P:WMS.Web.Domain.Entitys.OutStockTaskDetails.SaleBillNos">
<summary>
销售订单号
</summary>