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
2023-12-20 17:52:14 +08:00
parent 93c533d86d
commit 4df9e97289
9 changed files with 122 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/WMS.Web.Domain/Services/Public/ErpService.cs
View File

@@ -1240,21 +1240,21 @@ namespace WMS.Web.Domain.Services.Public
/// </summary>
/// <param name="code"></param>
/// <returns></returns>
public async Task<ResultList<ErpStockDto>> BillQueryForSubStock()
public async Task<ResultList<Erp_SubStockDto>> BillQueryForSubStock()
{
try
{
//1.获取缓存中的仓库数据；
var cache_key = "erp_substock_list";
var stocks = _memoryCache.Get<List<ErpStockDto>>(cache_key);
var stocks = _memoryCache.Get<List<Erp_SubStockDto>>(cache_key);
if (stocks == null || stocks.Count == 0)
{
var token_result = await this.Init();
if (!token_result.IsSuccess)
return ResultList<ErpStockDto>.ReFailure(token_result);
return ResultList<Erp_SubStockDto>.ReFailure(token_result);
var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.BD_STOCK.ToString());
param.FieldKeys = "FStockFlexDetail_FDetailID,FFlexEntryName,FFlexEntryId.FNumber,FUseOrgId.FNumber";
param.FieldKeys = "FStockFlexDetail_FDetailID,FFlexEntryName,FFlexEntryId.FNumber,FUseOrgId.FNumber,FNumber";
param.Limit = 100000;
param.FilterString = $"FNumber='HD' or FNumber='GD'";//FNumber='C'
query.Data = JsonConvert.SerializeObject(param);
@@ -1263,31 +1263,32 @@ namespace WMS.Web.Domain.Services.Public
var result_json = await _client.ExecuteBillQueryAsync(json);
var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
var list = new List<ErpStockDto>();
var list = new List<Erp_SubStockDto>();
foreach (var item in result)
{
var lis = new ErpStockDto();
var lis = new Erp_SubStockDto();
if (item[0] == "0") continue;
lis.Id = int.Parse(item[0]);
lis.Name = item[1];
lis.Code = item[2];
lis.OrgCode = item[3];
lis.StockCode = item[4];
list.Add(lis);
}
//5.供应商集合进行缓存 只有查询全部的时候才缓存
_memoryCache.Set(cache_key, list, new MemoryCacheEntryOptions().SetAbsoluteExpiration(TimeSpan.FromHours(12)));
_logger.LogInformation($"子仓库拉取-总条数：{list.Count}");
return ResultList<ErpStockDto>.ReSuccess(list);
return ResultList<Erp_SubStockDto>.ReSuccess(list);
}
else
{
return ResultList<ErpStockDto>.ReSuccess(stocks);
return ResultList<Erp_SubStockDto>.ReSuccess(stocks);
}
}
catch (Exception)
{
return ResultList<ErpStockDto>.ReFailure("错误", 10002);
return ResultList<Erp_SubStockDto>.ReFailure("错误", 10002);
}
}