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

erp物料数据在没有找的情况下重新找一遍

Browse Source
This commit is contained in:
tongfei
2023-11-29 16:47:23 +08:00
parent 65c7ef2bb1
commit 904f6a11f6
4 changed files with 225 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2721,10 +2721,17 @@
</member>
<member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForMaterial">
<summary>
erp:单据查询-物料
erp:单据查询-物料集合
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForMaterial(System.Int32)">
<summary>
erp:基础数据-物料信息
</summary>
<param name="id"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForOrg">
<summary>
@@ -4001,10 +4008,31 @@
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForMaterial">
<summary>
erp:单据查询-物料
erp:单据查询-物料集合
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForMaterial(System.Int32)">
<summary>
erp:基础数据-物料信息
</summary>
<param name="id"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForMaterialPagedList(System.String)">
<summary>
erp:基础数据-物料-分页查询
</summary>
<param name="cache_key"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForMaterialById(System.Int32)">
<summary>
erp:基础数据-物料-ids查询
</summary>
<param name="id"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForOrg">
<summary>
erp:单据查询-组织数据

9
src/WMS.Web.Domain/IService/Public/IErpService.cs
View File

@@ -92,11 +92,18 @@ namespace WMS.Web.Domain.IService.Public
/// <returns></returns>
Task<ResultList<ErpDeliveryNoticeOutStockResultDto>> BillQueryForMisDeliveryOutStock(List<string> sourceBillNos = null, DateTime? beginTime = null);
/// <summary>
/// erp:单据查询-物料
/// erp:单据查询-物料集合
/// </summary>
/// <returns></returns>
Task<ResultList<ErpMaterialDto>> BillQueryForMaterial();
/// <summary>
/// erp:基础数据-物料信息
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
Task<Result<ErpMaterialDto>> BillQueryForMaterial(int id);
/// <summary>
///
/// </summary>

31
src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs
View File

@@ -18,13 +18,15 @@ namespace WMS.Web.Domain.Services.Public
public class ErpBasicDataExtendService: IErpBasicDataExtendService
{
private readonly IMapper _mapper;
private readonly IErpService _erpService;
private readonly ILoginService _loginService;
private readonly IBasicsRepositories _basicsRepositories;
public ErpBasicDataExtendService(IMapper mapper, ILoginService loginService,
public ErpBasicDataExtendService(IMapper mapper, ILoginService loginService, IErpService erpService,
IBasicsRepositories basicsRepositories)
{
_mapper = mapper;
_erpService = erpService;
_loginService = loginService;
_basicsRepositories = basicsRepositories;
@@ -39,7 +41,14 @@ namespace WMS.Web.Domain.Services.Public
public string GetMaterialName(List<ErpMaterialDto> erpMaterials,int materialId)
{
var mat= erpMaterials.Where(x => x.MaterialId == materialId).FirstOrDefault();
return mat == null ? "" : mat.MaterialName;
if (mat == null)
{
var result= _erpService.BillQueryForMaterial(materialId).Result;
if (!result.IsSuccess)
return "";
return result.Data == null ? "" : result.Data.MaterialName;
}
return mat.MaterialName;
}
/// <summary>
@@ -51,7 +60,14 @@ namespace WMS.Web.Domain.Services.Public
public string GetMaterialNumber(List<ErpMaterialDto> erpMaterials, int materialId)
{
var mat = erpMaterials.Where(x => x.MaterialId == materialId).FirstOrDefault();
return mat == null ? "" : mat.MaterialNumber;
if (mat == null)
{
var result = _erpService.BillQueryForMaterial(materialId).Result;
if (!result.IsSuccess)
return "";
return result.Data == null ? "" : result.Data.MaterialNumber;
}
return mat.MaterialNumber;
}
/// <summary>
@@ -63,7 +79,14 @@ namespace WMS.Web.Domain.Services.Public
public string GetMaterialSpecifications(List<ErpMaterialDto> erpMaterials, int materialId)
{
var mat = erpMaterials.Where(x => x.MaterialId == materialId).FirstOrDefault();
return mat == null ? "" : mat.Specifications;
if (mat == null)
{
var result = _erpService.BillQueryForMaterial(materialId).Result;
if (!result.IsSuccess)
return "";
return result.Data == null ? "" : result.Data.Specifications;
}
return mat.Specifications;
}
/// <summary>

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

@@ -763,7 +763,7 @@ namespace WMS.Web.Domain.Services.Public
}
/// <summary>
/// erp:单据查询-物料
/// erp:单据查询-物料集合
/// </summary>
/// <returns></returns>
public async Task<ResultList<ErpMaterialDto>> BillQueryForMaterial()
@@ -774,6 +774,61 @@ namespace WMS.Web.Domain.Services.Public
var cache_key = "erp_materials_list";
var materials = _memoryCache.Get<List<ErpMaterialDto>>(cache_key);
if (materials == null || materials.Count == 0)
{
return await this.BillQueryForMaterialPagedList(cache_key);
}
else
{
return ResultList<ErpMaterialDto>.ReSuccess(materials);
}
}
catch (Exception)
{
return ResultList<ErpMaterialDto>.ReFailure(ResultCodes.ErpMaterialError);
}
}
/// <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();
@@ -835,18 +890,62 @@ namespace WMS.Web.Domain.Services.Public
_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 ResultList<ErpMaterialDto>.ReSuccess(materials);
}
}
catch (Exception)
{
return ResultList<ErpMaterialDto>.ReFailure(ResultCodes.ErpMaterialError);
}
return erp_materials_list.FirstOrDefault();
}
/// <summary>