18923810322/BarCode-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改了在序列号

Browse Source
This commit is contained in:
18923810322
2026-03-02 11:24:49 +08:00
parent 4bf57306aa
commit 7273e17ac1
4 changed files with 21 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/BarCode.Web.Api/wwwroot/BarCode.Web.Domain.xml
View File

@@ -828,21 +828,6 @@
物料编码 物料编码
</summary> </summary>
</member> </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"> <member name="P:BarCode.Web.Domain.Entitys.SerialNumbers.Old_MaterialNumber">
<summary> <summary>
老物料编码(上一次物料编码) 老物料编码(上一次物料编码)

30
src/BarCode.Web.Domain/Entitys/SerialNumbers.cs
View File

@@ -81,23 +81,23 @@ namespace BarCode.Web.Domain.Entitys
public string MaterialNumber { get; set; } = string.Empty; public string MaterialNumber { get; set; } = string.Empty;
/// <summary> ///// <summary>
/// 名称 ///// 名称
/// </summary> ///// </summary>
[Column("MaterialName")] //[Column("MaterialName")]
public string MaterialName { get; set; } = ""; //public string MaterialName { get; set; } = "";
/// <summary> ///// <summary>
/// 规格型号 ///// 规格型号
/// </summary> ///// </summary>
[Column("Specifications")] //[Column("Specifications")]
public string Specifications { get; set; } = ""; //public string Specifications { get; set; } = "";
/// <summary> ///// <summary>
///69码 /////69码
/// </summary> ///// </summary>
[Column("BarCode")] //[Column("BarCode")]
public string BarCode { get; set; } = ""; //public string BarCode { get; set; } = "";
/// <summary> /// <summary>
/// 老物料编码(上一次物料编码) /// 老物料编码(上一次物料编码)

6
src/BarCode.Web.Domain/Services/SerialNumberService.cs
View File

@@ -261,9 +261,9 @@ namespace BarCode.Web.Domain.Services
SerialNumber = sg.IdConvertBar, SerialNumber = sg.IdConvertBar,
MaterialNumber = sg.MaterialNumber, MaterialNumber = sg.MaterialNumber,
MaterialName=sg.MaterialName, //MaterialName=sg.MaterialName,
Specifications = sg.Specifications, //Specifications = sg.Specifications,
BarCode = sg.BarCode, //BarCode = sg.BarCode,
Number = sg.BeginNumber + i, Number = sg.BeginNumber + i,
IsTwo = sg.IsTwo, IsTwo = sg.IsTwo,

6
src/BarCode.Web.Repositories/SerialNumbersRepositories.cs
View File

@@ -358,11 +358,11 @@ namespace BarCode.Web.Repositories
int total = await query.CountAsync(); int total = await query.CountAsync();
var list = await query.Select(s => new SerialNumberInfoResponse() 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), Old_Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.Old_MaterialNumber == null ? "" : s.serial.Old_MaterialNumber),
MaterialNumber = s.serial.MaterialNumber, MaterialNumber = s.serial.MaterialNumber,
MaterialName =s.serial.MaterialName,// _erpBasicDataExtendService.GetMaterialName(materials, s.serial.MaterialNumber), MaterialName = s.sg.MaterialName,// _erpBasicDataExtendService.GetMaterialName(materials, s.serial.MaterialNumber),
BarCode =s.serial.BarCode,// _erpBasicDataExtendService.GetMaterialBarCode(materials, s.serial.MaterialNumber), BarCode = s.sg.BarCode,// _erpBasicDataExtendService.GetMaterialBarCode(materials, s.serial.MaterialNumber),
SerialNumber = s.serial.SerialNumber, SerialNumber = s.serial.SerialNumber,
NumberCode = s.serial.NumberCode, NumberCode = s.serial.NumberCode,
Number = s.sg == null ? 0 : s.sg.Number, Number = s.sg == null ? 0 : s.sg.Number,