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

优化接口

Browse Source
This commit is contained in:
tongfei
2024-04-16 11:53:23 +08:00
parent ae823fad3e
commit e94e37b767
6 changed files with 82 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2573,6 +2573,11 @@
是否作废
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.SaleBillNo">
<summary>
销售订单号
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.ReceiveBoxRequeset">
<summary>
已收货的箱子请求对象

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

@@ -5985,6 +5985,22 @@
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.LoginService.Online(System.String,System.String)">
<summary>
</summary>
<param name="accessToken"></param>
<param name="refreshToken"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.LoginService.Offline(System.String,System.String)">
<summary>
</summary>
<param name="accessToken"></param>
<param name="refreshToken"></param>
<returns></returns>
</member>
<member name="T:WMS.Web.Domain.Services.Public.OpsService">
<summary>
ops服务

6
src/WMS.Web.Core/Dto/InStockTask/InStockTaskQueryResponse.cs
View File

@@ -138,5 +138,11 @@ namespace WMS.Web.Core.Dto
/// </summary>
[Column("是否作废")]
public bool IsRepeal { get; set; }
/// <summary>
/// 销售订单号
/// </summary>
[Column("销售订单号")]
public string SaleBillNo { get; set; }
}
}

30
src/WMS.Web.Core/Help/HttpClientHelp.cs
View File

@@ -110,6 +110,36 @@ namespace WMS.Web.Core.Help
}
public async Task<string> PostHttp(string url, string accessToken, string refreshToken)
{
try
{
HttpClient client = new HttpClient();
//请求头添加其他值
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", accessToken);
client.DefaultRequestHeaders.Add("Refresh-Authorization", "Bearer " + refreshToken);
client.DefaultRequestHeaders.Connection.Add("Keep-Alive");
client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
client.DefaultRequestHeaders.AcceptCharset.Add(new StringWithQualityHeaderValue("utf-8"));
HttpResponseMessage response = await client.PostAsync(url,null);
if (response.IsSuccessStatusCode)
{
var resData = response.Content.ReadAsStringAsync().Result;
return resData;
}
else
{
var resData = response.Content.ReadAsStringAsync().Result;
return resData;
}
}
catch (Exception ex)
{
return "";
}
}
public string GetHttpOut(string url, LoginOutAuthorizeRequest reqData)
{
try

24
src/WMS.Web.Domain/Services/Public/LoginService.cs
View File

@@ -515,5 +515,29 @@ namespace WMS.Web.Domain.Services.Public
return result.Data.ToList();
return null;
}
/// <summary>
///
/// </summary>
/// <param name="accessToken"></param>
/// <param name="refreshToken"></param>
/// <returns></returns>
public async Task<Result> Online(string accessToken,string refreshToken)
{
string result = await _httpClientHelp.PostHttp(_soaOptions.Url_V3 + "/uc/online",accessToken,refreshToken);
return Result.ReSuccess();
}
/// <summary>
///
/// </summary>
/// <param name="accessToken"></param>
/// <param name="refreshToken"></param>
/// <returns></returns>
public async Task<Result> Offline(string accessToken, string refreshToken)
{
string result = await _httpClientHelp.PostHttp(_soaOptions.Url_V3 + "/uc/offline", accessToken, refreshToken);
return Result.ReSuccess();
}
}
}

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

@@ -835,6 +835,7 @@ namespace WMS.Web.Repositories
CreateTime = s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
Remark = s.detail.Remark,
IsRepeal = s.detail.IsRepeal ?? false,
SaleBillNo=s.detail.SaleBillNo,
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
return (list, total);