From e5484f637cd572c2ce1cf904c8c1431784afbd58 Mon Sep 17 00:00:00 2001 From: 18923810322 <1666941798@qq.com> Date: Tue, 10 Feb 2026 17:39:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dto/Erp/Material/ErpMaterialDto.cs | 16 ++++++++-------- .../Services/Public/ErpService.cs | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/BarCode.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs b/src/BarCode.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs index 9b842c1..10e13bf 100644 --- a/src/BarCode.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs +++ b/src/BarCode.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs @@ -78,39 +78,39 @@ namespace BarCode.Web.Core.Dto.Erp /// /// 产品线(1级) /// - public string FProductLines1 { get; set; } + public string? FProductLines1 { get; set; } /// /// 产品分类(2级) /// - public string FProductCATs1 { get; set; } + public string? FProductCATs1 { get; set; } /// /// 产品分组(3级) /// - public string FMaterialGroup { get; set; } + public string? FMaterialGroup { get; set; } /// /// SPU /// - public string F_Product { get; set; } + public string? F_Product { get; set; } /// /// 产品线(1级)名称 /// - public string FProductLines1FName { get; set; } + public string? FProductLines1FName { get; set; } /// /// 产品分类(2级)名称 /// - public string FProductCATs1FName { get; set; } + public string? FProductCATs1FName { get; set; } /// /// 产品分组(3级)名称 /// - public string FMaterialGroupFName { get; set; } + public string? FMaterialGroupFName { get; set; } /// /// 物料32进制 /// - public string FProductIDS { get; set; } + public string? FProductIDS { get; set; } } } diff --git a/src/BarCode.Web.Domain/Services/Public/ErpService.cs b/src/BarCode.Web.Domain/Services/Public/ErpService.cs index 408975c..780a976 100644 --- a/src/BarCode.Web.Domain/Services/Public/ErpService.cs +++ b/src/BarCode.Web.Domain/Services/Public/ErpService.cs @@ -280,9 +280,9 @@ namespace BarCode.Web.Domain.Services.Public lis.IdConvertBar = item[11].Trim(); lis.FModifyDate = Convert.ToDateTime(item[12]); lis.FCreateDate = Convert.ToDateTime(item[13]); - lis.FProductLines1FName =item[14]; - lis.FProductCATs1FName = item[15]; - lis.FMaterialGroupFName = item[16]; + //lis.FProductLines1FName =item[14]; + //lis.FProductCATs1FName = item[15]; + //lis.FMaterialGroupFName = item[16]; erp_materials_list.Add(lis); } } @@ -422,9 +422,9 @@ namespace BarCode.Web.Domain.Services.Public lis.IdConvertBar = item[11].Trim(); lis.FModifyDate = Convert.ToDateTime(item[12]); lis.FCreateDate = Convert.ToDateTime(item[13]); - lis.FProductLines1FName = item[14]; - lis.FProductCATs1FName = item[15]; - lis.FMaterialGroupFName = item[16]; + //lis.FProductLines1FName = item[14]; + //lis.FProductCATs1FName = item[15]; + //lis.FMaterialGroupFName = item[16]; erp_materials_list.Add(lis); } //4.6页面的叠加