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

修复bug

Browse Source
This commit is contained in:
18942506660
2024-10-17 10:05:32 +08:00
parent f85e04fe97
commit 7499682041
10 changed files with 122 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/WMS.Web.Api/Controllers/ProductInventoryController.cs
View File

@@ -55,6 +55,9 @@ namespace WMS.Web.Api.Controllers
if (loginInfo == null || loginInfo.UserInfo == null)
return ResultList<UcStockHeadOfficeResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
var r = await _basicsRepositories.GetUcStockByHeadOfficeAsync(name, loginInfo.UserInfo.CompanyId);
var response = r.Where(w => w.ManagementSystem == 1 || w.ManagementSystem == 4
|| (w.ManagementSystem == 2 && !string.IsNullOrEmpty(w.WarehouseCodeOfJushuitan))
||(w.ManagementSystem == 3 && !string.IsNullOrEmpty(w.WarehouseCodeOfLingxing))).ToList();
return ResultList<UcStockHeadOfficeResponse>.ReSuccess(r);
}

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

@@ -30,6 +30,7 @@ using SkiaSharp;
using Google.Protobuf.Collections;
using NPOI.SS.Formula.Functions;
using System.Text.Json;
using WMS.Web.Core.Dto.LingXing;
namespace WMS.Web.Api.Controllers
{
@@ -103,6 +104,11 @@ namespace WMS.Web.Api.Controllers
//var m2 = my2.Object;
//var md = m2.code;
//LingXingResponse<LingXingStockResponse> r = new LingXingResponse<LingXingStockResponse>();
//string str = "{\"code\":0,\"message\":\"success\",\"error_details\":[],\"request_id\":\"7A739491-8740-01AC-304E-0203AF887AE2\",\"response_time\":\"2024-10-16 17:58:57\",\"data\":[{\"wid\":437,\"type\":1,\"name\":\"ORICO_OD\",\"is_delete\":0}],\"total\":1}";
//var ss=JsonConvert.DeserializeObject<LingXingResponse<LingXingStockResponse>>(str);
//var b = System.Text.Json.JsonSerializer.Deserialize<LingXingResponse<LingXingStockResponse>>(str);
await _lingXingService.GetStock();
//List<string> list = new List<string>();

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

@@ -3969,6 +3969,46 @@
wms箱ID
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.LingXing.LingXingInventoryRequest">
<summary>
领星即时库存
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.LingXing.LingXingInventoryRequest.wid">
<summary>
仓库Id 1,3,234,33
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.LingXing.LingXingInventoryResponse">
<summary>
领星即时库存
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.LingXing.LingXingInventoryResponse.StockId">
<summary>
仓库Id
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.LingXing.LingXingInventoryResponse.SKU">
<summary>
SKU
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.LingXing.LingXingInventoryResponse.SellerId">
<summary>
店铺id
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.LingXing.LingXingInventoryResponse.Product_Total">
<summary>
库存总量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.LingXing.LingXingInventoryResponse.Product_Valid_Num">
<summary>
可用量
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.LingXing.LingXingLoginRequest">
<summary>
领星登录
@@ -3994,11 +4034,26 @@
页码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.LingXing.LingXingRequest.ength">
<member name="P:WMS.Web.Core.Dto.LingXing.LingXingRequest.length">
<summary>
页条数
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.LingXing.LingXingStockResponse.Id">
<summary>
id
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.LingXing.LingXingStockResponse.JType">
<summary>
id
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.LingXing.LingXingStockResponse.Name">
<summary>
name
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Login.AccessTokenDto.ClientName">
<summary>
客户端名称
@@ -5951,7 +6006,12 @@
</member>
<member name="P:WMS.Web.Core.Dto.SingleData.UcStockHeadOfficeResponse.WarehouseUseTo">
<summary>
用途
用途 0 总公司
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.SingleData.UcStockHeadOfficeResponse.ManagementSystem">
<summary>
管理系统 1 金蝶 2 聚水潭 3 领星 4WMS
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.SingleData.UcStockResponse">

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

@@ -4315,6 +4315,18 @@
领星服务接口
</summary>
</member>
<member name="M:WMS.Web.Domain.IService.Public.ILingXingService.GetStock">
<summary>
获取领星所有仓库
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.Public.ILingXingService.GetInventory(WMS.Web.Core.Dto.LingXing.LingXingInventoryRequest)">
<summary>
获取即时库存
</summary>
<returns></returns>
</member>
<member name="T:WMS.Web.Domain.IService.Public.ILoginService">
<summary>
登录服务接口
@@ -4749,6 +4761,11 @@
erp-Id
</summary>
</member>
<member name="T:WMS.Web.Domain.Options.lingXingOptions">
<summary>
领星配置
</summary>
</member>
<member name="T:WMS.Web.Domain.Options.OpsOptions">
<summary>
老ops对接
@@ -6287,6 +6304,14 @@
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.LingXingService.GetInventory(WMS.Web.Core.Dto.LingXing.LingXingInventoryRequest)">
<summary>
获取即使库存
</summary>
<param name="dto"></param>
<returns></returns>
<exception cref="T:System.NotImplementedException"></exception>
</member>
<member name="M:WMS.Web.Domain.Services.Public.LingXingService.MD5Encrypt(System.String,System.Boolean)">
<summary>
32位MD5加密

6
src/WMS.Web.Core/Dto/LingXing/LingXingRequest.cs
View File

@@ -14,11 +14,11 @@ namespace WMS.Web.Core.Dto.LingXing
/// 页码
/// </summary>
[JsonProperty("offset")]
public int offset { get; set; } = 1;
public int offset { get; set; } = 0;
/// <summary>
/// 页条数
/// </summary>
[JsonProperty("ength")]
public int ength { get; set; } = 1000;
[JsonProperty("length")]
public int length { get; set; } = 800;
}
}

2
src/WMS.Web.Core/Dto/LingXing/LingXingResponse.cs
View File

@@ -2,10 +2,10 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Text.Json.Serialization;
namespace WMS.Web.Core.Dto.LingXing
{
[Serializable]
public class LingXingResponse<T>
{
public LingXingResponse() { }

7
src/WMS.Web.Core/Dto/LingXing/LingXingStockResponse.cs
View File

@@ -5,12 +5,17 @@ using System.Text;
namespace WMS.Web.Core.Dto.LingXing
{
[Serializable]
public class LingXingStockResponse
{
public LingXingStockResponse() { }
/// <summary>
/// id
/// </summary>
[JsonProperty("wid")]
public int Id { get; set; }
/// <summary>
/// name
/// </summary>
[JsonProperty("name")]
public string Name { get; set; }
}

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

@@ -19,8 +19,12 @@ namespace WMS.Web.Core.Dto.SingleData
/// </summary>
public string WarehouseCodeOfJushuitan { get; set; }
/// <summary>
/// 用途
/// 用途 0 总公司
/// </summary>
public int? WarehouseUseTo { get; set; }
/// <summary>
/// 管理系统 1 金蝶 2 聚水潭 3 领星 4WMS
/// </summary>
public int? ManagementSystem { get; set; }
}
}

17
src/WMS.Web.Domain/Services/Public/HttpClientService.cs
View File

@@ -1,4 +1,5 @@
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Net.Http;
@@ -48,8 +49,9 @@ namespace WMS.Web.Domain.Services.Public
var responseContent = await response.Content.ReadAsStringAsync(); //2.当前使用这里是为了迎合错误信息观看
if (response.IsSuccessStatusCode)
{
var t = JsonSerializer.Deserialize<T>(responseContent, new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
//var t = JsonSerializer.Deserialize<T>(responseContent, new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
//var t = await JsonSerializer.DeserializeAsync<T>(responseContent, new JsonSerializerOptions { PropertyNameCaseInsensitive = true });//3.配合1的ReadAsStream使用
var t = JsonConvert.DeserializeObject<T>(responseContent);
return t;
}
@@ -80,8 +82,9 @@ namespace WMS.Web.Domain.Services.Public
var responseContent = await response.Content.ReadAsStringAsync(); //2.当前使用这里是为了迎合错误信息观看
if (response.IsSuccessStatusCode)
{
var t = JsonSerializer.Deserialize<T>(responseContent, new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
//var t = JsonSerializer.Deserialize<T>(responseContent, new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
//var t = await JsonSerializer.DeserializeAsync<T>(responseContent, new JsonSerializerOptions { PropertyNameCaseInsensitive = true });//3.配合1的ReadAsStream使用
var t = JsonConvert.DeserializeObject<T>(responseContent);
return t;
}
@@ -111,7 +114,8 @@ namespace WMS.Web.Domain.Services.Public
var responseContent = await response.Content.ReadAsStringAsync();
if (response.IsSuccessStatusCode)
{
var t = JsonSerializer.Deserialize<T>(responseContent, new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
//var t = JsonSerializer.Deserialize<T>(responseContent, new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
var t = JsonConvert.DeserializeObject<T>(responseContent);
return t;
}
@@ -135,7 +139,8 @@ namespace WMS.Web.Domain.Services.Public
var responseContent = await response.Content.ReadAsStringAsync();
if (response.IsSuccessStatusCode)
{
var t = JsonSerializer.Deserialize<T>(responseContent, new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
//var t = JsonSerializer.Deserialize<T>(responseContent, new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
var t = JsonConvert.DeserializeObject<T>(responseContent);
if (t == null)
_logger.LogInformation($"获取单点数据为空---{responseContent}");
return t;
@@ -163,8 +168,8 @@ namespace WMS.Web.Domain.Services.Public
var responseContent = await response.Content.ReadAsStringAsync();
if (response.IsSuccessStatusCode)
{
var t = JsonSerializer.Deserialize<T>(responseContent, new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
//var t = JsonSerializer.Deserialize<T>(responseContent, new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
var t = JsonConvert.DeserializeObject<T>(responseContent);
return t;
}