diff --git a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml
index 7cfe05b..08341cb 100644
--- a/src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml
+++ b/src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml
@@ -828,21 +828,6 @@
物料编码
-
-
- 名称
-
-
-
-
- 规格型号
-
-
-
-
- 69码
-
-
老物料编码(上一次物料编码)
diff --git a/src/BarCode.Web.Domain/Entitys/SerialNumbers.cs b/src/BarCode.Web.Domain/Entitys/SerialNumbers.cs
index ff999ff..ec48581 100644
--- a/src/BarCode.Web.Domain/Entitys/SerialNumbers.cs
+++ b/src/BarCode.Web.Domain/Entitys/SerialNumbers.cs
@@ -81,23 +81,23 @@ namespace BarCode.Web.Domain.Entitys
public string MaterialNumber { get; set; } = string.Empty;
- ///
- /// 名称
- ///
- [Column("MaterialName")]
- public string MaterialName { get; set; } = "";
+ /////
+ ///// 名称
+ /////
+ //[Column("MaterialName")]
+ //public string MaterialName { get; set; } = "";
- ///
- /// 规格型号
- ///
- [Column("Specifications")]
- public string Specifications { get; set; } = "";
+ /////
+ ///// 规格型号
+ /////
+ //[Column("Specifications")]
+ //public string Specifications { get; set; } = "";
- ///
- ///69码
- ///
- [Column("BarCode")]
- public string BarCode { get; set; } = "";
+ /////
+ /////69码
+ /////
+ //[Column("BarCode")]
+ //public string BarCode { get; set; } = "";
///
/// 老物料编码(上一次物料编码)
diff --git a/src/BarCode.Web.Domain/Services/SerialNumberService.cs b/src/BarCode.Web.Domain/Services/SerialNumberService.cs
index a434ce9..2937ed9 100644
--- a/src/BarCode.Web.Domain/Services/SerialNumberService.cs
+++ b/src/BarCode.Web.Domain/Services/SerialNumberService.cs
@@ -261,9 +261,9 @@ namespace BarCode.Web.Domain.Services
SerialNumber = sg.IdConvertBar,
MaterialNumber = sg.MaterialNumber,
- MaterialName=sg.MaterialName,
- Specifications = sg.Specifications,
- BarCode = sg.BarCode,
+ //MaterialName=sg.MaterialName,
+ //Specifications = sg.Specifications,
+ //BarCode = sg.BarCode,
Number = sg.BeginNumber + i,
IsTwo = sg.IsTwo,
diff --git a/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs b/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs
index bfa6e85..91d9967 100644
--- a/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs
+++ b/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs
@@ -358,11 +358,11 @@ namespace BarCode.Web.Repositories
int total = await query.CountAsync();
var list = await query.Select(s => new SerialNumberInfoResponse()
{
- Specifications =s.serial.Specifications,// _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber),
+ Specifications = s.sg.Specifications,//s.serial.Specifications,// _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber),
Old_Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.Old_MaterialNumber == null ? "" : s.serial.Old_MaterialNumber),
MaterialNumber = s.serial.MaterialNumber,
- MaterialName =s.serial.MaterialName,// _erpBasicDataExtendService.GetMaterialName(materials, s.serial.MaterialNumber),
- BarCode =s.serial.BarCode,// _erpBasicDataExtendService.GetMaterialBarCode(materials, s.serial.MaterialNumber),
+ MaterialName = s.sg.MaterialName,// _erpBasicDataExtendService.GetMaterialName(materials, s.serial.MaterialNumber),
+ BarCode = s.sg.BarCode,// _erpBasicDataExtendService.GetMaterialBarCode(materials, s.serial.MaterialNumber),
SerialNumber = s.serial.SerialNumber,
NumberCode = s.serial.NumberCode,
Number = s.sg == null ? 0 : s.sg.Number,