修改了防伪码
This commit is contained in:
@@ -265,9 +265,9 @@ namespace BarCode.Web.Repositories
|
|||||||
var list = await query.Select(s => new SecurityGenerateRecordInfoResponse()
|
var list = await query.Select(s => new SecurityGenerateRecordInfoResponse()
|
||||||
{
|
{
|
||||||
Id = s.Id,
|
Id = s.Id,
|
||||||
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialNumber),
|
Specifications = s.Specifications,//_erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialNumber),
|
||||||
MaterialNumber = s.MaterialNumber,
|
MaterialNumber = s.MaterialNumber,
|
||||||
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.MaterialNumber),
|
MaterialName = s.MaterialName,//_erpBasicDataExtendService.GetMaterialName(materials, s.MaterialNumber),
|
||||||
BarCode = _erpBasicDataExtendService.GetMaterialBarCode(materials, s.MaterialNumber),
|
BarCode = _erpBasicDataExtendService.GetMaterialBarCode(materials, s.MaterialNumber),
|
||||||
LotNumber = s.LotNumber,
|
LotNumber = s.LotNumber,
|
||||||
GenerateComplete = s.IsGenerateComplete == true ? "已完成" : "生成中",
|
GenerateComplete = s.IsGenerateComplete == true ? "已完成" : "生成中",
|
||||||
|
|||||||
@@ -193,7 +193,7 @@ namespace BarCode.Web.Repositories
|
|||||||
Id = s.serial.Id,
|
Id = s.serial.Id,
|
||||||
GenerateRecordId = s.serial.GenerateRecordId,
|
GenerateRecordId = s.serial.GenerateRecordId,
|
||||||
SecurityNumber = s.serial.SecurityNumber,
|
SecurityNumber = s.serial.SecurityNumber,
|
||||||
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber),
|
Specifications = string.IsNullOrEmpty(s.serial.Specifications) ? s.sg.Specifications : s.serial.Specifications,//_erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber),
|
||||||
Number = s.sg == null ? 0 : s.sg.Number,
|
Number = s.sg == null ? 0 : s.sg.Number,
|
||||||
Creator = _singleDataService.GetSingleData(SingleAction.Users, companyId, s.serial.CreatorId),
|
Creator = _singleDataService.GetSingleData(SingleAction.Users, companyId, s.serial.CreatorId),
|
||||||
CreateTime = s.serial.CreateTime.DateToStringSeconds(),
|
CreateTime = s.serial.CreateTime.DateToStringSeconds(),
|
||||||
|
|||||||
Reference in New Issue
Block a user