diff --git a/src/BarCode.Web.Api/Controllers/SysConfigController.cs b/src/BarCode.Web.Api/Controllers/SysConfigController.cs index 9423ddb..fbb75b4 100644 --- a/src/BarCode.Web.Api/Controllers/SysConfigController.cs +++ b/src/BarCode.Web.Api/Controllers/SysConfigController.cs @@ -74,7 +74,8 @@ namespace BarCode.Web.Api.Controllers if (materials == null) return ResultList.ReFailure(ResultCodes.MateriaNoData); //没有物料Id 32进制的也过滤掉 var result = materials.Where(x => x.Specifications.Contains(speci) - && !string.IsNullOrEmpty(x.IdConvertBar.Trim())).Take(30).ToList(); + && x.isDis=="1" + && !string.IsNullOrEmpty(x.IdConvertBar.Trim() )).Take(30).ToList(); return ResultList.ReSuccess(result); } /// diff --git a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml index 682101a..278a8c7 100644 --- a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml +++ b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml @@ -1274,6 +1274,11 @@ 创建日期 + + + 是否显示 + + 产品线(1级) diff --git a/src/BarCode.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs b/src/BarCode.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs index f42f369..0d8123d 100644 --- a/src/BarCode.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs +++ b/src/BarCode.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs @@ -74,7 +74,10 @@ namespace BarCode.Web.Core.Dto.Erp /// 创建日期 /// public DateTime FCreateDate { get; set; } - + /// + /// 是否显示 + /// + public string isDis { get; set; } /// /// 产品线(1级) /// diff --git a/src/BarCode.Web.Domain/Services/Public/ErpService.cs b/src/BarCode.Web.Domain/Services/Public/ErpService.cs index f2b6fa6..ede7c6c 100644 --- a/src/BarCode.Web.Domain/Services/Public/ErpService.cs +++ b/src/BarCode.Web.Domain/Services/Public/ErpService.cs @@ -31,6 +31,7 @@ using BarCode.Web.Domain.Values.Single; using System.Text.Json.Nodes; using Quartz.Logging; using NPOI.SS.UserModel; +using NPOI.POIFS.Crypt.Dsig.Facets; namespace BarCode.Web.Domain.Services.Public { @@ -422,6 +423,7 @@ namespace BarCode.Web.Domain.Services.Public lis.IdConvertBar = item[11].Trim(); lis.FModifyDate = Convert.ToDateTime(item[12]); lis.FCreateDate = Convert.ToDateTime(item[13]); + lis.isDis = "1"; //lis.FProductLines1FName = item[14]; //lis.FProductCATs1FName = item[15]; //lis.FMaterialGroupFName = item[16];