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-05 16:43:13 +08:00
parent adf51657e9
commit 2f55923051
5 changed files with 57 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/BarCode.Web.Api/wwwroot/BarCode.Web.Core.xml
View File

@@ -3820,16 +3820,31 @@
物料编码 物料编码
</summary> </summary>
</member> </member>
<member name="P:BarCode.Web.Core.Dto.SerialNumbers.UpdateMaterialRequest.specifications">
<summary>
物料规格
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.SerialNumbers.UpdateMaterialRequest.SerialNumbers"> <member name="P:BarCode.Web.Core.Dto.SerialNumbers.UpdateMaterialRequest.SerialNumbers">
<summary> <summary>
操作(序列号) 操作(序列号)
</summary> </summary>
</member> </member>
<member name="T:BarCode.Web.Core.Dto.SerialNumbers.specifications"> <member name="T:BarCode.Web.Core.Dto.SerialNumbers.Specifications">
<summary> <summary>
specifications specifications
</summary> </summary>
</member> </member>
<member name="P:BarCode.Web.Core.Dto.SerialNumbers.Specifications.serialNumber">
<summary>
serialNumber
</summary>
</member>
<member name="P:BarCode.Web.Core.Dto.SerialNumbers.Specifications.old_Specification">
<summary>
old_Specification
</summary>
</member>
<member name="T:BarCode.Web.Core.Dto.SingleData.IdRequest"> <member name="T:BarCode.Web.Core.Dto.SingleData.IdRequest">
<summary> <summary>
ID请求对象 ID请求对象

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

@@ -828,6 +828,21 @@
物料编码 物料编码
</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>
老物料编码(上一次物料编码) 老物料编码(上一次物料编码)
@@ -970,7 +985,7 @@
wms系统获取序列码后 序列码调整为已使用 wms系统获取序列码后 序列码调整为已使用
</summary> </summary>
</member> </member>
<member name="M:BarCode.Web.Domain.Entitys.SerialNumbers.UpdateMaterial(System.String,System.String)"> <member name="M:BarCode.Web.Domain.Entitys.SerialNumbers.UpdateMaterial(System.String,System.String,System.String,System.String,System.String)">
<summary> <summary>
修改物料编码 修改物料编码
</summary> </summary>

38
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; } = string.Empty;
///// <summary> /// <summary>
///// 规格型号 /// 规格型号
///// </summary> /// </summary>
//[Column("Specifications")] [Column("Specifications")]
//public string Specifications { get; set; } = ""; public string? Specifications { get; set; } = string.Empty;
///// <summary> /// <summary>
/////69码 ///69码
///// </summary> /// </summary>
//[Column("BarCode")] [Column("BarCode")]
//public string BarCode { get; set; } = ""; public string? BarCode { get; set; } = string.Empty;
/// <summary> /// <summary>
/// 老物料编码(上一次物料编码) /// 老物料编码(上一次物料编码)
@@ -336,15 +336,19 @@ namespace BarCode.Web.Domain.Entitys
/// 修改物料编码 /// 修改物料编码
/// </summary> /// </summary>
/// <param name="number"></param> /// <param name="number"></param>
public Result UpdateMaterial(string number,string Specifications) public Result UpdateMaterial(string number,string MaterialName,string MaterialSpecifications,string MaterialBarCode, string old_Specifications)
{ {
if (this.IsUse) if (this.IsUse)
return Result.ReFailure($"序列码 {this.SerialNumber} 已被使用,不允许规格转换", 600007); return Result.ReFailure($"序列码 {this.SerialNumber} 已被使用,不允许规格转换", 600007);
if (!this.MaterialNumber.Equals(number)) if (!this.MaterialNumber.Equals(number))
{ {
this.Old_MaterialNumber = this.MaterialNumber; this.Old_MaterialNumber = this.MaterialNumber;
this.old_Specifications = Specifications; this.old_Specifications = old_Specifications;
this.MaterialName= MaterialName;
this.Specifications= MaterialSpecifications;
this.BarCode= MaterialBarCode;
this.MaterialNumber = number; this.MaterialNumber = number;
} }
return Result.ReSuccess(); return Result.ReSuccess();

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

@@ -854,7 +854,7 @@ namespace BarCode.Web.Domain.Services
//修改物料 //修改物料
foreach (var s in serialNumbers) foreach (var s in serialNumbers)
{ {
var res = s.UpdateMaterial(dto.MaterialNumber, _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialNumber));// _erpBasicDataExtendService.GetMaterialSpecifications(materials, dto.MaterialNumber)); var res = s.UpdateMaterial(dto.MaterialNumber, _erpBasicDataExtendService.GetMaterialName(materials, dto.MaterialNumber), _erpBasicDataExtendService.GetMaterialSpecifications(materials, dto.MaterialNumber), _erpBasicDataExtendService.GetMaterialBarCode(materials, dto.MaterialNumber), _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialNumber));// _erpBasicDataExtendService.GetMaterialSpecifications(materials, dto.MaterialNumber));
if (!res.IsSuccess) return res; if (!res.IsSuccess) return res;
} }
generateRecord.UpdateMaterial(); generateRecord.UpdateMaterial();

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.sg.Specifications,// _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber), Specifications =s.serial.Specifications==null?s.sg.Specifications: s.serial.Specifications,// _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber),
Old_Specifications = s.serial.old_Specifications==null?(_erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.Old_MaterialNumber == null ? "" : s.serial.Old_MaterialNumber)) : s.serial.old_Specifications,//_erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.Old_MaterialNumber == null ? "" : s.serial.Old_MaterialNumber), Old_Specifications = s.serial.old_Specifications==null?(_erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.Old_MaterialNumber == null ? "" : s.serial.Old_MaterialNumber)) : s.serial.old_Specifications,//_erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.Old_MaterialNumber == null ? "" : s.serial.Old_MaterialNumber),
MaterialNumber = s.serial.MaterialNumber, MaterialNumber = s.serial.MaterialNumber,
MaterialName = s.sg.MaterialName,// _erpBasicDataExtendService.GetMaterialName(materials, s.serial.MaterialNumber), MaterialName = s.serial.MaterialName == null ? s.sg.MaterialName: s.serial.MaterialName,// _erpBasicDataExtendService.GetMaterialName(materials, s.serial.MaterialNumber),
BarCode = s.sg.BarCode,// _erpBasicDataExtendService.GetMaterialBarCode(materials, s.serial.MaterialNumber), BarCode = s.serial.BarCode == null ? s.sg.BarCode: s.serial.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,