修改了报表

This commit is contained in:
2025-06-23 11:12:33 +08:00
parent 291d8c2521
commit 02ba589422
7 changed files with 237 additions and 1 deletions

View File

@@ -44,6 +44,40 @@ namespace WMS.Web.Domain.IService.Public
/// <param name="materialNumber"></param>
string GetMaterialName(List<ErpMaterialDto> erpMaterials, string materialNumber);
/// <summary>
/// 获取物料产品1级
/// </summary>
/// <param name="erpMaterials"></param>
/// <param name="materialNumber"></param>
/// <returns></returns>
public string GetMaterialFProductLines1FName(List<ErpMaterialDto> erpMaterials, string materialNumber);
/// <summary>
/// 获取物料产品2级
/// </summary>
/// <param name="erpMaterials"></param>
/// <param name="materialNumber"></param>
/// <returns></returns>
public string GetMaterialFProductCATs1FName(List<ErpMaterialDto> erpMaterials, string materialNumber);
/// <summary>
/// 获取物料产品3级
/// </summary>
/// <param name="erpMaterials"></param>
/// <param name="materialNumber"></param>
/// <returns></returns>
public string GetMaterialFMaterialGroupFName(List<ErpMaterialDto> erpMaterials, string materialNumber);
/// <summary>
/// 获取物料spu
/// </summary>
/// <param name="erpMaterials"></param>
/// <param name="materialNumber"></param>
/// <returns></returns>
public string GetMaterialF_Product(List<ErpMaterialDto> erpMaterials, string materialNumber);
/// <summary>
/// 获取物料规格型号
/// </summary>

View File

@@ -120,6 +120,100 @@ namespace WMS.Web.Domain.Services.Public
}
return mat.MaterialName;
}
/// <summary>
/// 获取物料产品线(1级)
/// </summary>
/// <param name="erpMaterials"></param>
/// <param name="materialNumber"></param>
/// <returns></returns>
public string GetMaterialFProductLines1FName(List<ErpMaterialDto> erpMaterials, string materialNumber)
{
if (erpMaterials == null || erpMaterials.Count == 0)
return "";
var mat = erpMaterials.Where(x => x.MaterialNumber == materialNumber).FirstOrDefault();
if (mat == null)
{
var result = _erpService.BillQueryForMaterial(materialNumber).GetAwaiter().GetResult();
if (!result.IsSuccess)
return "";
return result.Data == null ? "" : result.Data.FProductLines1FName;
}
return mat.FProductLines1FName;
}
/// <summary>
/// 获取物料产品分类(2级)
/// </summary>
/// <param name="erpMaterials"></param>
/// <param name="materialNumber"></param>
/// <returns></returns>
public string GetMaterialFProductCATs1FName(List<ErpMaterialDto> erpMaterials, string materialNumber)
{
if (erpMaterials == null || erpMaterials.Count == 0)
return "";
var mat = erpMaterials.Where(x => x.MaterialNumber == materialNumber).FirstOrDefault();
if (mat == null)
{
var result = _erpService.BillQueryForMaterial(materialNumber).GetAwaiter().GetResult();
if (!result.IsSuccess)
return "";
return result.Data == null ? "" : result.Data.FProductCATs1FName;
}
return mat.FProductCATs1FName;
}
/// <summary>
/// 获取物料产品分组(3级)
/// </summary>
/// <param name="erpMaterials"></param>
/// <param name="materialNumber"></param>
/// <returns></returns>
public string GetMaterialFMaterialGroupFName(List<ErpMaterialDto> erpMaterials, string materialNumber)
{
if (erpMaterials == null || erpMaterials.Count == 0)
return "";
var mat = erpMaterials.Where(x => x.MaterialNumber == materialNumber).FirstOrDefault();
if (mat == null)
{
var result = _erpService.BillQueryForMaterial(materialNumber).GetAwaiter().GetResult();
if (!result.IsSuccess)
return "";
return result.Data == null ? "" : result.Data.FMaterialGroupFName;
}
return mat.FMaterialGroupFName;
}
/// <summary>
/// 获取物料SPU
/// </summary>
/// <param name="erpMaterials"></param>
/// <param name="materialNumber"></param>
/// <returns></returns>
public string GetMaterialF_Product(List<ErpMaterialDto> erpMaterials, string materialNumber)
{
if (erpMaterials == null || erpMaterials.Count == 0)
return "";
var mat = erpMaterials.Where(x => x.MaterialNumber == materialNumber).FirstOrDefault();
if (mat == null)
{
var result = _erpService.BillQueryForMaterial(materialNumber).GetAwaiter().GetResult();
if (!result.IsSuccess)
return "";
return result.Data == null ? "" : result.Data.F_Product;
}
return mat.F_Product;
}
/// <summary>
/// 获取物料编码
/// </summary>