修改了在序列号
This commit is contained in:
@@ -828,21 +828,6 @@
|
||||
物料编码
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:BarCode.Web.Domain.Entitys.SerialNumbers.MaterialName">
|
||||
<summary>
|
||||
名称
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:BarCode.Web.Domain.Entitys.SerialNumbers.Specifications">
|
||||
<summary>
|
||||
规格型号
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:BarCode.Web.Domain.Entitys.SerialNumbers.BarCode">
|
||||
<summary>
|
||||
69码
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:BarCode.Web.Domain.Entitys.SerialNumbers.Old_MaterialNumber">
|
||||
<summary>
|
||||
老物料编码(上一次物料编码)
|
||||
|
||||
@@ -81,23 +81,23 @@ namespace BarCode.Web.Domain.Entitys
|
||||
public string MaterialNumber { get; set; } = string.Empty;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 名称
|
||||
/// </summary>
|
||||
[Column("MaterialName")]
|
||||
public string MaterialName { get; set; } = "";
|
||||
///// <summary>
|
||||
///// 名称
|
||||
///// </summary>
|
||||
//[Column("MaterialName")]
|
||||
//public string MaterialName { get; set; } = "";
|
||||
|
||||
/// <summary>
|
||||
/// 规格型号
|
||||
/// </summary>
|
||||
[Column("Specifications")]
|
||||
public string Specifications { get; set; } = "";
|
||||
///// <summary>
|
||||
///// 规格型号
|
||||
///// </summary>
|
||||
//[Column("Specifications")]
|
||||
//public string Specifications { get; set; } = "";
|
||||
|
||||
/// <summary>
|
||||
///69码
|
||||
/// </summary>
|
||||
[Column("BarCode")]
|
||||
public string BarCode { get; set; } = "";
|
||||
///// <summary>
|
||||
/////69码
|
||||
///// </summary>
|
||||
//[Column("BarCode")]
|
||||
//public string BarCode { get; set; } = "";
|
||||
|
||||
/// <summary>
|
||||
/// 老物料编码(上一次物料编码)
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user