erp物料数据在没有找的情况下重新找一遍
This commit is contained in:
tongfei
@@ -763,7 +763,7 @@ namespace WMS.Web.Domain.Services.Public
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// erp:单据查询-物料
|
||||
/// erp:单据查询-物料集合
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public async Task<ResultList<ErpMaterialDto>> BillQueryForMaterial()
|
||||
@@ -775,65 +775,7 @@ namespace WMS.Web.Domain.Services.Public
|
||||
var materials = _memoryCache.Get<List<ErpMaterialDto>>(cache_key);
|
||||
if (materials == null || materials.Count == 0)
|
||||
{
|
||||
//2.先登录金蝶-拿到token
|
||||
var token_result = await this.Init();
|
||||
if (!token_result.IsSuccess)
|
||||
return ResultList<ErpMaterialDto>.ReFailure(token_result);
|
||||
|
||||
//3.获取金蝶物料：拼接参数和条件
|
||||
var query = new ErpBillQueryDto(token_result.Data);
|
||||
var param = new ErpBillQueryParamDto(FormIdParam.BD_MATERIAL.ToString());
|
||||
param.FieldKeys = "FMATERIALID,FName,FNumber,FSpecification,FBaseUnitId,FBaseUnitId.FName";
|
||||
param.Limit = 10000;
|
||||
|
||||
//查询条件：备注其中的条件值以金蝶的值为准！！！
|
||||
//1.审核状态：已审核
|
||||
//2.禁用状态：A否，B是
|
||||
//3.使用组织：只查询“深圳市元创时代科技有限公司”这个组织；组织ID=100008--固定值查询（测试端和正式是一样的）
|
||||
param.FilterString = "FDocumentStatus='C' and FForbidStatus='A' and FUseOrgId=100008";
|
||||
param.OrderString = "FCreateDate ASC";
|
||||
|
||||
//4.循环拿金蝶数据
|
||||
bool isHave = true;
|
||||
var erp_materials_list = new List<ErpMaterialDto>();
|
||||
int skip = 0;
|
||||
var beginTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
|
||||
_logger.LogInformation($"物料拉取-开始时间：{beginTime}");
|
||||
while (isHave)
|
||||
{
|
||||
//4.1.页码：页码按照金蝶的要求从0开始
|
||||
param.StartRow = (Convert.ToInt32(skip) * param.Limit);
|
||||
//4.2.参数json化
|
||||
query.Data = JsonConvert.SerializeObject(param);
|
||||
var json = JsonConvert.SerializeObject(query);
|
||||
|
||||
//4.3.请求查询接口并返回数据
|
||||
var result_json = await _client.ExecuteBillQueryAsync(json);
|
||||
var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
|
||||
//4.4.判断数据是否全部拉取完成：并停止循环的条件
|
||||
if (result == null || result.Count == 0)
|
||||
isHave = false;
|
||||
//4.5.拼装
|
||||
foreach (var item in result)
|
||||
{
|
||||
var lis = new ErpMaterialDto();
|
||||
lis.MaterialId = Convert.ToInt32(item[0]);
|
||||
lis.MaterialName = item[1];
|
||||
lis.MaterialNumber = item[2];
|
||||
lis.Specifications = item[3];
|
||||
lis.BaseUnitId = Convert.ToInt32(item[4]);
|
||||
lis.BaseUnitName = item[5];
|
||||
erp_materials_list.Add(lis);
|
||||
}
|
||||
//4.6页面的叠加
|
||||
skip++;
|
||||
}
|
||||
var endTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
|
||||
_logger.LogInformation($"物料拉取-结束时间：{endTime}");
|
||||
//5.物料集合进行缓存
|
||||
_memoryCache.Set(cache_key, erp_materials_list, new MemoryCacheEntryOptions().SetAbsoluteExpiration(TimeSpan.FromHours(12)));
|
||||
_logger.LogInformation($"物料拉取-总条数：{erp_materials_list.Count}");
|
||||
return ResultList<ErpMaterialDto>.ReSuccess(erp_materials_list);
|
||||
return await this.BillQueryForMaterialPagedList(cache_key);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -849,6 +791,163 @@ namespace WMS.Web.Domain.Services.Public
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// erp:基础数据-物料信息
|
||||
/// </summary>
|
||||
/// <param name="id"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<Result<ErpMaterialDto>> BillQueryForMaterial(int id)
|
||||
{
|
||||
//1.获取缓存中的物料数据；
|
||||
var cache_key = "erp_materials_list";
|
||||
var materials = _memoryCache.Get<List<ErpMaterialDto>>(cache_key);
|
||||
if (materials == null || materials.Count == 0)
|
||||
return Result<ErpMaterialDto>.ReSuccess(null);
|
||||
//2.通过ID取当前物料列表中的
|
||||
var mater = materials.Where(x => x.MaterialId == id).FirstOrDefault();
|
||||
if (mater == null)
|
||||
{
|
||||
//2.1没有的话：去金蝶取
|
||||
mater = await this.BillQueryForMaterialById(id);
|
||||
if (mater != null)
|
||||
{
|
||||
//把取到的数据放集合中并重新给缓存
|
||||
materials.Add(mater);
|
||||
_memoryCache.Set(cache_key, materials, new MemoryCacheEntryOptions().SetAbsoluteExpiration(TimeSpan.FromHours(12)));
|
||||
return Result<ErpMaterialDto>.ReSuccess(mater);
|
||||
}
|
||||
else
|
||||
return Result<ErpMaterialDto>.ReSuccess(null);
|
||||
}
|
||||
return Result<ErpMaterialDto>.ReSuccess(mater);
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// erp:基础数据-物料-分页查询
|
||||
/// </summary>
|
||||
/// <param name="cache_key"></param>
|
||||
/// <returns></returns>
|
||||
private async Task<ResultList<ErpMaterialDto>> BillQueryForMaterialPagedList(string cache_key)
|
||||
{
|
||||
//2.先登录金蝶-拿到token
|
||||
var token_result = await this.Init();
|
||||
if (!token_result.IsSuccess)
|
||||
return ResultList<ErpMaterialDto>.ReFailure(token_result);
|
||||
|
||||
//3.获取金蝶物料：拼接参数和条件
|
||||
var query = new ErpBillQueryDto(token_result.Data);
|
||||
var param = new ErpBillQueryParamDto(FormIdParam.BD_MATERIAL.ToString());
|
||||
param.FieldKeys = "FMATERIALID,FName,FNumber,FSpecification,FBaseUnitId,FBaseUnitId.FName";
|
||||
param.Limit = 10000;
|
||||
|
||||
//查询条件：备注其中的条件值以金蝶的值为准！！！
|
||||
//1.审核状态：已审核
|
||||
//2.禁用状态：A否，B是
|
||||
//3.使用组织：只查询“深圳市元创时代科技有限公司”这个组织；组织ID=100008--固定值查询（测试端和正式是一样的）
|
||||
param.FilterString = "FDocumentStatus='C' and FForbidStatus='A' and FUseOrgId=100008";
|
||||
param.OrderString = "FCreateDate ASC";
|
||||
|
||||
//4.循环拿金蝶数据
|
||||
bool isHave = true;
|
||||
var erp_materials_list = new List<ErpMaterialDto>();
|
||||
int skip = 0;
|
||||
var beginTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
|
||||
_logger.LogInformation($"物料拉取-开始时间：{beginTime}");
|
||||
while (isHave)
|
||||
{
|
||||
//4.1.页码：页码按照金蝶的要求从0开始
|
||||
param.StartRow = (Convert.ToInt32(skip) * param.Limit);
|
||||
//4.2.参数json化
|
||||
query.Data = JsonConvert.SerializeObject(param);
|
||||
var json = JsonConvert.SerializeObject(query);
|
||||
|
||||
//4.3.请求查询接口并返回数据
|
||||
var result_json = await _client.ExecuteBillQueryAsync(json);
|
||||
var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
|
||||
//4.4.判断数据是否全部拉取完成：并停止循环的条件
|
||||
if (result == null || result.Count == 0)
|
||||
isHave = false;
|
||||
//4.5.拼装
|
||||
foreach (var item in result)
|
||||
{
|
||||
var lis = new ErpMaterialDto();
|
||||
lis.MaterialId = Convert.ToInt32(item[0]);
|
||||
lis.MaterialName = item[1];
|
||||
lis.MaterialNumber = item[2];
|
||||
lis.Specifications = item[3];
|
||||
lis.BaseUnitId = Convert.ToInt32(item[4]);
|
||||
lis.BaseUnitName = item[5];
|
||||
erp_materials_list.Add(lis);
|
||||
}
|
||||
//4.6页面的叠加
|
||||
skip++;
|
||||
}
|
||||
var endTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
|
||||
_logger.LogInformation($"物料拉取-结束时间：{endTime}");
|
||||
//5.物料集合进行缓存
|
||||
_memoryCache.Set(cache_key, erp_materials_list, new MemoryCacheEntryOptions().SetAbsoluteExpiration(TimeSpan.FromHours(12)));
|
||||
_logger.LogInformation($"物料拉取-总条数：{erp_materials_list.Count}");
|
||||
return ResultList<ErpMaterialDto>.ReSuccess(erp_materials_list);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// erp:基础数据-物料-ids查询
|
||||
/// </summary>
|
||||
/// <param name="id"></param>
|
||||
/// <returns></returns>
|
||||
private async Task<ErpMaterialDto> BillQueryForMaterialById(int id)
|
||||
{
|
||||
//2.先登录金蝶-拿到token
|
||||
var token_result = await this.Init();
|
||||
if (!token_result.IsSuccess)
|
||||
return null;
|
||||
|
||||
//3.获取金蝶物料：拼接参数和条件
|
||||
var query = new ErpBillQueryDto(token_result.Data);
|
||||
var param = new ErpBillQueryParamDto(FormIdParam.BD_MATERIAL.ToString());
|
||||
param.FieldKeys = "FMATERIALID,FName,FNumber,FSpecification,FBaseUnitId,FBaseUnitId.FName";
|
||||
param.Limit = 10000;
|
||||
|
||||
//查询条件：备注其中的条件值以金蝶的值为准！！！
|
||||
//1.审核状态：已审核
|
||||
//2.禁用状态：A否，B是
|
||||
//3.使用组织：只查询“深圳市元创时代科技有限公司”这个组织；组织ID=100008--固定值查询（测试端和正式是一样的）---按ID查询就不需要固定组织条件了
|
||||
param.FilterString = "FDocumentStatus='C' and FForbidStatus='A'";
|
||||
param.OrderString = "FCreateDate ASC";
|
||||
|
||||
//根据物料ID查询
|
||||
param.FilterString = param.FilterString + $" and FMATERIALID={id}";
|
||||
|
||||
//4.循环拿金蝶数据
|
||||
var erp_materials_list = new List<ErpMaterialDto>();
|
||||
|
||||
//4.2.参数json化
|
||||
query.Data = JsonConvert.SerializeObject(param);
|
||||
var json = JsonConvert.SerializeObject(query);
|
||||
|
||||
//4.3.请求查询接口并返回数据
|
||||
var result_json = await _client.ExecuteBillQueryAsync(json);
|
||||
var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
|
||||
|
||||
//4.5.拼装
|
||||
foreach (var item in result)
|
||||
{
|
||||
var lis = new ErpMaterialDto();
|
||||
lis.MaterialId = Convert.ToInt32(item[0]);
|
||||
lis.MaterialName = item[1];
|
||||
lis.MaterialNumber = item[2];
|
||||
lis.Specifications = item[3];
|
||||
lis.BaseUnitId = Convert.ToInt32(item[4]);
|
||||
lis.BaseUnitName = item[5];
|
||||
erp_materials_list.Add(lis);
|
||||
}
|
||||
if (erp_materials_list.Count == 0)
|
||||
return null;
|
||||
else
|
||||
return erp_materials_list.FirstOrDefault();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// erp:单据查询-组织数据
|
||||
/// </summary>
|
||||
@@ -1131,7 +1230,7 @@ namespace WMS.Web.Domain.Services.Public
|
||||
/// </summary>
|
||||
/// <param name="code"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<ResultList<ErpStockDto>> BillQueryForSubStock(string code = null,string orgCode=null)
|
||||
public async Task<ResultList<ErpStockDto>> BillQueryForSubStock(string code = null, string orgCode = null)
|
||||
{
|
||||
try
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user