条码显示
This commit is contained in:
@@ -931,10 +931,13 @@ namespace BarCode.Web.Repositories
|
|||||||
BoxId = entity.serial.BoxId,
|
BoxId = entity.serial.BoxId,
|
||||||
IsCarton = (entity.serial.BoxId > 0 || entity.serial.IsUse == true) ? true : false,
|
IsCarton = (entity.serial.BoxId > 0 || entity.serial.IsUse == true) ? true : false,
|
||||||
IsOldData = false,//根据序列号获取 默认是false
|
IsOldData = false,//根据序列号获取 默认是false
|
||||||
Specifications = entity.sg.Specifications,// _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.MaterialNumber),
|
//Specifications = entity.sg.Specifications,// _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.MaterialNumber),
|
||||||
|
Specifications = string.IsNullOrEmpty(entity.serial.Specifications) ? entity.sg.Specifications : entity.serial.Specifications,// _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.serial.MaterialNumber),
|
||||||
MaterialNumber = entity.serial.MaterialNumber,
|
MaterialNumber = entity.serial.MaterialNumber,
|
||||||
MaterialName = entity.sg.MaterialName,//_erpBasicDataExtendService.GetMaterialName(materials, entity.MaterialNumber),
|
//MaterialName = entity.sg.MaterialName,//_erpBasicDataExtendService.GetMaterialName(materials, entity.MaterialNumber),
|
||||||
BarCode = entity.sg.BarCode,//_erpBasicDataExtendService.GetMaterialBarCode(materials, entity.MaterialNumber),
|
MaterialName = string.IsNullOrEmpty(entity.serial.MaterialName) ? entity.sg.MaterialName : entity.serial.MaterialName,// _erpBasicDataExtendService.GetMaterialName(materials, s.serial.MaterialNumber),
|
||||||
|
//BarCode = entity.sg.BarCode,//_erpBasicDataExtendService.GetMaterialBarCode(materials, entity.MaterialNumber),
|
||||||
|
BarCode = string.IsNullOrEmpty(entity.serial.BarCode) ? entity.sg.BarCode : entity.serial.BarCode,// _erpBasicDataExtendService.GetMaterialBarCode(materials, s.serial.MaterialNumber),
|
||||||
SerialNumber = entity.serial.SerialNumber,
|
SerialNumber = entity.serial.SerialNumber,
|
||||||
IsUseNumber = entity.serial.IsUseNumber,
|
IsUseNumber = entity.serial.IsUseNumber,
|
||||||
NumberCode = entity.serial.NumberCode,
|
NumberCode = entity.serial.NumberCode,
|
||||||
|
|||||||
Reference in New Issue
Block a user