diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 7b0bcdd7..c2d8c31c 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -2573,6 +2573,11 @@ 是否作废 + + + 销售订单号 + + 已收货的箱子请求对象 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index f1ba02cb..e88e674f 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -5985,6 +5985,22 @@ + + + + + + + + + + + + + + + + ops服务 diff --git a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskQueryResponse.cs b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskQueryResponse.cs index 3da119e5..7063e6a5 100644 --- a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskQueryResponse.cs +++ b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskQueryResponse.cs @@ -138,5 +138,11 @@ namespace WMS.Web.Core.Dto /// [Column("是否作废")] public bool IsRepeal { get; set; } + + /// + /// 销售订单号 + /// + [Column("销售订单号")] + public string SaleBillNo { get; set; } } } diff --git a/src/WMS.Web.Core/Help/HttpClientHelp.cs b/src/WMS.Web.Core/Help/HttpClientHelp.cs index f1a6088a..c1d83576 100644 --- a/src/WMS.Web.Core/Help/HttpClientHelp.cs +++ b/src/WMS.Web.Core/Help/HttpClientHelp.cs @@ -110,6 +110,36 @@ namespace WMS.Web.Core.Help } + public async Task 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 diff --git a/src/WMS.Web.Domain/Services/Public/LoginService.cs b/src/WMS.Web.Domain/Services/Public/LoginService.cs index d907d571..8bf655a1 100644 --- a/src/WMS.Web.Domain/Services/Public/LoginService.cs +++ b/src/WMS.Web.Domain/Services/Public/LoginService.cs @@ -515,5 +515,29 @@ namespace WMS.Web.Domain.Services.Public return result.Data.ToList(); return null; } + + /// + /// + /// + /// + /// + /// + public async Task Online(string accessToken,string refreshToken) + { + string result = await _httpClientHelp.PostHttp(_soaOptions.Url_V3 + "/uc/online",accessToken,refreshToken); + return Result.ReSuccess(); + } + + /// + /// + /// + /// + /// + /// + public async Task Offline(string accessToken, string refreshToken) + { + string result = await _httpClientHelp.PostHttp(_soaOptions.Url_V3 + "/uc/offline", accessToken, refreshToken); + return Result.ReSuccess(); + } } } diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs index 3d1799bd..7e152d1e 100644 --- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs @@ -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);