diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index 795dafa2..b60ee1e1 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -5115,6 +5115,11 @@
物料规格型号
+
+
+ 条码
+
+
是否是老Ops条码
diff --git a/src/WMS.Web.Core/Dto/MaterialResponse.cs b/src/WMS.Web.Core/Dto/MaterialResponse.cs
index 186c2bcb..4d862eb6 100644
--- a/src/WMS.Web.Core/Dto/MaterialResponse.cs
+++ b/src/WMS.Web.Core/Dto/MaterialResponse.cs
@@ -49,6 +49,12 @@ namespace WMS.Web.Core.Dto
/// 物料规格型号
///
public string Specifications { get; set; }
+
+ ///
+ /// 条码
+ ///
+ public string BarCode { get; set; }
+
///
/// 是否是老Ops条码
///
diff --git a/src/WMS.Web.Domain/Entitys/SerialNumbers_Ops.cs b/src/WMS.Web.Domain/Entitys/SerialNumbers_Ops.cs
index f472cb9f..6176945c 100644
--- a/src/WMS.Web.Domain/Entitys/SerialNumbers_Ops.cs
+++ b/src/WMS.Web.Domain/Entitys/SerialNumbers_Ops.cs
@@ -91,5 +91,9 @@ namespace WMS.Web.Domain.Entitys
///
[Column("IsActivate")]
public bool? IsActivate { get; set; } = false;
+
+
+
+
}
}
diff --git a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs
index 59ac4898..80cc01e1 100644
--- a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs
+++ b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs
@@ -311,9 +311,11 @@ namespace WMS.Web.Repositories
response.SerialNumber = entity.serial.SerialNumber;
response.IsDelete = entity.serial.IsDelete ?? false;
response.IsActivate = entity.serial.IsActivate ?? false;
- response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber);
+ response.MaterialName = string.IsNullOrEmpty(entity.serial.MaterialName)? _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber): entity.serial.MaterialName;
response.MaterialNumber = entity.serial.MaterialNumber;
- response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber);
+ response.Specifications = string.IsNullOrEmpty(entity.serial.Specifications)?_erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber): entity.serial.Specifications;
+ response.BarCode= string.IsNullOrEmpty(entity.serial.BarCode) ? _erpBasicDataExtendService.GetMaterialBarCode(materials, entity.serial.MaterialNumber) : entity.serial.BarCode;
+
if (entity.boxInventory != null)
response.IsBoxInventory = entity.boxInventory.Details.SelectMany(s => s.SerialNumbers).Where(w => serialNumber.Equals(w)).Count() >= 1 ? true : false;
response.IsTwo = entity.serial.IsTwo;
@@ -389,6 +391,13 @@ namespace WMS.Web.Repositories
response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber);
response.MaterialNumber = entity.serial.MaterialNumber;
response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber);
+
+ //response.MaterialName = string.IsNullOrEmpty(entity.serial.MaterialName) ? _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialNumber) : entity.serial.MaterialName;
+ //response.MaterialNumber = entity.serial.MaterialNumber;
+ //response.Specifications = string.IsNullOrEmpty(entity.serial.Specifications) ? _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialNumber) : entity.serial.Specifications;
+ //response.BarCode = string.IsNullOrEmpty(entity.serial.BarCode) ? _erpBasicDataExtendService.GetMaterialBarCode(materials, entity.serial.MaterialNumber) : entity.serial.BarCode;
+
+
//if (entity.boxInventory != null)
// response.IsBoxInventory = entity.boxInventory.Details.SelectMany(s => s.SerialNumbers).Where(w => serialNumber.Equals(w)).Count() >= 1 ? true : false;