改物料规格型号
This commit is contained in:
@@ -74,6 +74,7 @@ namespace BarCode.Web.Api.Controllers
|
|||||||
if (materials == null) return ResultList<ErpMaterialDto>.ReFailure(ResultCodes.MateriaNoData);
|
if (materials == null) return ResultList<ErpMaterialDto>.ReFailure(ResultCodes.MateriaNoData);
|
||||||
//没有物料Id 32进制的也过滤掉
|
//没有物料Id 32进制的也过滤掉
|
||||||
var result = materials.Where(x => x.Specifications.Contains(speci)
|
var result = materials.Where(x => x.Specifications.Contains(speci)
|
||||||
|
&& x.isDis=="1"
|
||||||
&& !string.IsNullOrEmpty(x.IdConvertBar.Trim() )).Take(30).ToList();
|
&& !string.IsNullOrEmpty(x.IdConvertBar.Trim() )).Take(30).ToList();
|
||||||
return ResultList<ErpMaterialDto>.ReSuccess(result);
|
return ResultList<ErpMaterialDto>.ReSuccess(result);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1274,6 +1274,11 @@
|
|||||||
创建日期
|
创建日期
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="P:BarCode.Web.Core.Dto.Erp.ErpMaterialDto.isDis">
|
||||||
|
<summary>
|
||||||
|
是否显示
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
<member name="P:BarCode.Web.Core.Dto.Erp.ErpMaterialDto.FProductLines1">
|
<member name="P:BarCode.Web.Core.Dto.Erp.ErpMaterialDto.FProductLines1">
|
||||||
<summary>
|
<summary>
|
||||||
产品线(1级)
|
产品线(1级)
|
||||||
|
|||||||
@@ -74,7 +74,10 @@ namespace BarCode.Web.Core.Dto.Erp
|
|||||||
/// 创建日期
|
/// 创建日期
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public DateTime FCreateDate { get; set; }
|
public DateTime FCreateDate { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 是否显示
|
||||||
|
/// </summary>
|
||||||
|
public string isDis { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 产品线(1级)
|
/// 产品线(1级)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ using BarCode.Web.Domain.Values.Single;
|
|||||||
using System.Text.Json.Nodes;
|
using System.Text.Json.Nodes;
|
||||||
using Quartz.Logging;
|
using Quartz.Logging;
|
||||||
using NPOI.SS.UserModel;
|
using NPOI.SS.UserModel;
|
||||||
|
using NPOI.POIFS.Crypt.Dsig.Facets;
|
||||||
|
|
||||||
namespace BarCode.Web.Domain.Services.Public
|
namespace BarCode.Web.Domain.Services.Public
|
||||||
{
|
{
|
||||||
@@ -422,6 +423,7 @@ namespace BarCode.Web.Domain.Services.Public
|
|||||||
lis.IdConvertBar = item[11].Trim();
|
lis.IdConvertBar = item[11].Trim();
|
||||||
lis.FModifyDate = Convert.ToDateTime(item[12]);
|
lis.FModifyDate = Convert.ToDateTime(item[12]);
|
||||||
lis.FCreateDate = Convert.ToDateTime(item[13]);
|
lis.FCreateDate = Convert.ToDateTime(item[13]);
|
||||||
|
lis.isDis = "1";
|
||||||
//lis.FProductLines1FName = item[14];
|
//lis.FProductLines1FName = item[14];
|
||||||
//lis.FProductCATs1FName = item[15];
|
//lis.FProductCATs1FName = item[15];
|
||||||
//lis.FMaterialGroupFName = item[16];
|
//lis.FMaterialGroupFName = item[16];
|
||||||
|
|||||||
Reference in New Issue
Block a user