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

Compare commits

base: 18923810322:8dcf01e5645f8e68a4ed21db5ddb277ba8afa563
Branches Tags
18923810322:master
..
compare: 18923810322:e318ca272ac2cd86a90b4df122ea30c57d2aa154
Branches Tags
18923810322:master

2 Commits
8dcf01e564 ... e318ca272a

Author SHA1 Message Date
18923810322
e318ca272a 修改更新物料规格 2026-03-05 11:13:22 +08:00
18923810322
eb37d9631b 修改了旧物料显示方式 2026-03-05 09:13:27 +08:00
3 changed files with 6 additions and 3 deletions
Expand all files Collapse all files

2
src/BarCode.Web.Core/Dto/SerialNumbers/UpdateMaterialRequest.cs
View File

@@ -22,6 +22,8 @@ namespace BarCode.Web.Core.Dto.SerialNumbers
/// </summary> /// </summary>
[Required(ErrorMessage = "物料编码不能为空")] [Required(ErrorMessage = "物料编码不能为空")]
public string MaterialNumber { get; set; } = string.Empty; public string MaterialNumber { get; set; } = string.Empty;
public string specifications { get; set; } = string.Empty;
/// <summary> /// <summary>
/// 操作(序列号) /// 操作(序列号)
/// </summary> /// </summary>

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, dto.MaterialNumber)); var res = s.UpdateMaterial(dto.MaterialNumber,dto.specifications);// _erpBasicDataExtendService.GetMaterialSpecifications(materials, dto.MaterialNumber));
if (!res.IsSuccess) return res; if (!res.IsSuccess) return res;
} }
generateRecord.UpdateMaterial(); generateRecord.UpdateMaterial();

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

@@ -359,7 +359,7 @@ namespace BarCode.Web.Repositories
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.sg.Specifications,// _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber),
Old_Specifications = s.serial.old_Specifications==null?"": 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.sg.MaterialName,// _erpBasicDataExtendService.GetMaterialName(materials, s.serial.MaterialNumber),
BarCode = s.sg.BarCode,// _erpBasicDataExtendService.GetMaterialBarCode(materials, s.serial.MaterialNumber), BarCode = s.sg.BarCode,// _erpBasicDataExtendService.GetMaterialBarCode(materials, s.serial.MaterialNumber),
@@ -497,7 +497,8 @@ namespace BarCode.Web.Repositories
var list = await query.Select(s => new SerialNumberInfoResponse2() var list = await query.Select(s => new SerialNumberInfoResponse2()
{ {
Specifications = s.sg.Specifications,//_erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber), Specifications = s.sg.Specifications,//_erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber),
Old_Specifications = s.serial.old_Specifications == null ? "" : s.serial.old_Specifications,//_erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.Old_MaterialNumber == null ? "" : s.serial.Old_MaterialNumber), //Old_Specifications = s.serial.old_Specifications == null ? "" : 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.sg.MaterialName,// _erpBasicDataExtendService.GetMaterialName(materials, s.serial.MaterialNumber),
BarCode = s.sg.BarCode,//_erpBasicDataExtendService.GetMaterialBarCode(materials, s.serial.MaterialNumber), BarCode = s.sg.BarCode,//_erpBasicDataExtendService.GetMaterialBarCode(materials, s.serial.MaterialNumber),