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

盘点单增加子仓库

Browse Source
This commit is contained in:
18942506660
2023-11-09 16:04:18 +08:00
parent 1f04cc0b6d
commit d88a738a0d
3 changed files with 53 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,7 +92,7 @@ namespace WMS.Web.Domain.Services.Public
/// <param name="billNo">模糊搜索</param>
/// <param name="sourceBillNos">单据编号集合精确查找</param>
/// <returns></returns>
public async Task<ResultList<ErpPurchaseInStockResultDto>> BillQueryForPurchaseInStock(string billNo="", List<string> sourceBillNos = null)
public async Task<ResultList<ErpPurchaseInStockResultDto>> BillQueryForPurchaseInStock(string billNo = "", List<string> sourceBillNos = null)
{
try
{
@@ -122,7 +122,7 @@ namespace WMS.Web.Domain.Services.Public
//3.单据类型：标准采购订单和标准委外订单
//4.明细关闭状态：正常
//5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
param.FilterString = "FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "' and FDocumentStatus='C' and (FBillTypeID='83d822ca3e374b4ab01e5dd46a0062bd' or FBillTypeID='6d01d059713d42a28bb976c90a121142') and FMRPCloseStatus='A'";
param.FilterString = "FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "' and FDocumentStatus='C' and (FBillTypeID='83d822ca3e374b4ab01e5dd46a0062bd' or FBillTypeID='6d01d059713d42a28bb976c90a121142') and FMRPCloseStatus='A'";
param.FilterString = param.FilterString + " and FSOSTOCKID.FNumber in (";
var str = "";
@@ -138,9 +138,9 @@ namespace WMS.Web.Domain.Services.Public
param.FilterString = param.FilterString + str + ")";
//单据编号模糊查询
if (!string.IsNullOrEmpty(billNo))
if (!string.IsNullOrEmpty(billNo))
{
param.FilterString = param.FilterString + " and FBillNo like '%"+billNo+"%'";
param.FilterString = param.FilterString + " and FBillNo like '%" + billNo + "%'";
}
//根据原订单号查询
@@ -272,7 +272,7 @@ namespace WMS.Web.Domain.Services.Public
return ResultList<ErpMaterialDto>.ReFailure(ResultCodes.ErpMaterialError);
}
}
@@ -551,34 +551,46 @@ namespace WMS.Web.Domain.Services.Public
{
try
{
var token_result = await this.Init();
if (!token_result.IsSuccess)
return ResultList<ErpStockDto>.ReFailure(token_result);
var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.BD_STOCK.ToString());
param.FieldKeys = "FStockFlexDetail_FDetailID,FFlexEntryName,FFlexEntryId,'0'";
param.Limit = 100000;
if (!string.IsNullOrEmpty(code))
param.FilterString = "FNumber='" + code + "'";//FNumber='C'
query.Data = JsonConvert.SerializeObject(param);
var json = JsonConvert.SerializeObject(query);
var result_json = await _client.ExecuteBillQueryAsync(json);
var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
var list = new List<ErpStockDto>();
foreach (var item in result)
//1.获取缓存中的仓库数据；
var cache_key = "erp_substock_list";
var stocks = _memoryCache.Get<List<ErpStockDto>>(cache_key);
if (stocks == null || stocks.Count == 0)
{
var lis = new ErpStockDto();
lis.Id = int.Parse(item[0]);
lis.Name = item[1];
lis.Code = item[2];
lis.OrgId = Convert.ToInt32(item[3]);
list.Add(lis);
var token_result = await this.Init();
if (!token_result.IsSuccess)
return ResultList<ErpStockDto>.ReFailure(token_result);
var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.BD_STOCK.ToString());
param.FieldKeys = "FStockFlexDetail_FDetailID,FFlexEntryName,FFlexEntryId,'0'";
param.Limit = 100000;
if (!string.IsNullOrEmpty(code))
param.FilterString = "FNumber='" + code + "'";//FNumber='C'
query.Data = JsonConvert.SerializeObject(param);
var json = JsonConvert.SerializeObject(query);
var result_json = await _client.ExecuteBillQueryAsync(json);
var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
var list = new List<ErpStockDto>();
foreach (var item in result)
{
var lis = new ErpStockDto();
lis.Id = int.Parse(item[0]);
lis.Name = item[1];
lis.Code = item[2];
lis.OrgId = Convert.ToInt32(item[3]);
list.Add(lis);
}
//5.供应商集合进行缓存
_memoryCache.Set(cache_key, list, new MemoryCacheEntryOptions().SetAbsoluteExpiration(TimeSpan.FromHours(12)));
_logger.LogInformation($"子仓库拉取-总条数：{list.Count}");
return ResultList<ErpStockDto>.ReSuccess(list);
}
else
{
return ResultList<ErpStockDto>.ReSuccess(stocks);
}
return ResultList<ErpStockDto>.ReSuccess(list);
}
catch (Exception)
{
@@ -1089,7 +1101,7 @@ namespace WMS.Web.Domain.Services.Public
}
}
#endregion
}