diff --git a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml index 3d2206a..cc5f307 100644 --- a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml +++ b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml @@ -456,46 +456,6 @@ 物料Id 32进制字符串 - - - 产品线(1级) - - - - - 产品分类(2级) - - - - - 产品分组(3级) - - - - - SPU - - - - - 产品线(1级)名称 - - - - - 产品分类(2级)名称 - - - - - 产品分组(3级)名称 - - - - - 物料32进制Id - - 防伪码生成记录 diff --git a/src/BarCode.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs b/src/BarCode.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs index 10e13bf..60915a8 100644 --- a/src/BarCode.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs +++ b/src/BarCode.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs @@ -112,5 +112,7 @@ namespace BarCode.Web.Core.Dto.Erp /// 物料32进制 /// public string? FProductIDS { get; set; } + + } } diff --git a/src/BarCode.Web.Domain/Entitys/Materials.cs b/src/BarCode.Web.Domain/Entitys/Materials.cs index 9ed7d69..16b1091 100644 --- a/src/BarCode.Web.Domain/Entitys/Materials.cs +++ b/src/BarCode.Web.Domain/Entitys/Materials.cs @@ -74,42 +74,45 @@ namespace BarCode.Web.Domain.Entitys /// public string IdConvertBar { get; set; } - /// - /// 产品线(1级) - /// - public string FProductLines1 { get; set; } + ///// + ///// 产品线(1级) + ///// + //public string FProductLines1 { get; set; } - /// - /// 产品分类(2级) - /// - public string FProductCATs1 { get; set; } - /// - /// 产品分组(3级) - /// - public string FMaterialGroup { get; set; } + ///// + ///// 产品分类(2级) + ///// + //public string FProductCATs1 { get; set; } + ///// + ///// 产品分组(3级) + ///// + //public string FMaterialGroup { get; set; } + + ///// + ///// SPU + ///// + //public string F_Product { get; set; } + + ///// + ///// 产品线(1级)名称 + ///// + //public string FProductLines1FName { get; set; } + ///// + ///// 产品分类(2级)名称 + ///// + //public string FProductCATs1FName { get; set; } + ///// + ///// 产品分组(3级)名称 + ///// + //public string FMaterialGroupFName { get; set; } + + ///// + ///// 物料32进制Id + ///// + //public string FProductIDS { get; set; } - /// - /// SPU - /// - public string F_Product { get; set; } - /// - /// 产品线(1级)名称 - /// - public string FProductLines1FName { get; set; } - /// - /// 产品分类(2级)名称 - /// - public string FProductCATs1FName { get; set; } - /// - /// 产品分组(3级)名称 - /// - public string FMaterialGroupFName { get; set; } - /// - /// 物料32进制Id - /// - public string FProductIDS { get; set; } } diff --git a/src/BarCode.Web.Domain/Services/Public/MaterialService.cs b/src/BarCode.Web.Domain/Services/Public/MaterialService.cs index 3384864..c57b1ee 100644 --- a/src/BarCode.Web.Domain/Services/Public/MaterialService.cs +++ b/src/BarCode.Web.Domain/Services/Public/MaterialService.cs @@ -150,15 +150,15 @@ namespace BarCode.Web.Domain.Services entity.MaterialName = mat.MaterialName; entity.BarCode = mat.BarCode; //entity.OrgId = mat.OrgId; - entity.FProductLines1 = mat.FProductLines1; - entity.FProductCATs1 = mat.FProductCATs1; - entity.FMaterialGroup = mat.FMaterialGroup; - entity.F_Product = mat.F_Product; - entity.FProductLines1FName = mat.FProductLines1FName; - entity.FProductCATs1FName = mat.FProductCATs1FName; - entity.FMaterialGroupFName = mat.FMaterialGroupFName; + //entity.FProductLines1 = mat.FProductLines1; + //entity.FProductCATs1 = mat.FProductCATs1; + //entity.FMaterialGroup = mat.FMaterialGroup; + //entity.F_Product = mat.F_Product; + //entity.FProductLines1FName = mat.FProductLines1FName; + //entity.FProductCATs1FName = mat.FProductCATs1FName; + //entity.FMaterialGroupFName = mat.FMaterialGroupFName; entity.MaterialId = mat.MaterialId; - entity.FProductIDS = mat.FProductIDS; + //entity.FProductIDS = mat.FProductIDS; continue; } }