优化接口
This commit is contained in:
@@ -2573,6 +2573,11 @@
|
|||||||
是否作废
|
是否作废
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.InStockTaskQueryResponse.SaleBillNo">
|
||||||
|
<summary>
|
||||||
|
销售订单号
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
<member name="T:WMS.Web.Core.Dto.ReceiveBoxRequeset">
|
<member name="T:WMS.Web.Core.Dto.ReceiveBoxRequeset">
|
||||||
<summary>
|
<summary>
|
||||||
已收货的箱子请求对象
|
已收货的箱子请求对象
|
||||||
|
|||||||
@@ -5985,6 +5985,22 @@
|
|||||||
</summary>
|
</summary>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</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">
|
<member name="T:WMS.Web.Domain.Services.Public.OpsService">
|
||||||
<summary>
|
<summary>
|
||||||
ops服务
|
ops服务
|
||||||
|
|||||||
@@ -138,5 +138,11 @@ namespace WMS.Web.Core.Dto
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
[Column("是否作废")]
|
[Column("是否作废")]
|
||||||
public bool IsRepeal { get; set; }
|
public bool IsRepeal { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 销售订单号
|
||||||
|
/// </summary>
|
||||||
|
[Column("销售订单号")]
|
||||||
|
public string SaleBillNo { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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)
|
public string GetHttpOut(string url, LoginOutAuthorizeRequest reqData)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
|||||||
@@ -515,5 +515,29 @@ namespace WMS.Web.Domain.Services.Public
|
|||||||
return result.Data.ToList();
|
return result.Data.ToList();
|
||||||
return null;
|
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();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -835,6 +835,7 @@ namespace WMS.Web.Repositories
|
|||||||
CreateTime = s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
|
CreateTime = s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||||
Remark = s.detail.Remark,
|
Remark = s.detail.Remark,
|
||||||
IsRepeal = s.detail.IsRepeal ?? false,
|
IsRepeal = s.detail.IsRepeal ?? false,
|
||||||
|
SaleBillNo=s.detail.SaleBillNo,
|
||||||
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
|
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
|
||||||
|
|
||||||
return (list, total);
|
return (list, total);
|
||||||
|
|||||||
Reference in New Issue
Block a user