修改装箱条码显示
This commit is contained in:
@@ -15,6 +15,7 @@ using BarCode.Web.Repositories.Configuration;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.EntityFrameworkCore.Storage;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Microsoft.IdentityModel.Tokens;
|
||||
using Npoi.Mapper;
|
||||
using NPOI.OpenXmlFormats.Wordprocessing;
|
||||
using NPOI.POIFS.FileSystem;
|
||||
@@ -937,7 +938,7 @@ namespace BarCode.Web.Repositories
|
||||
//MaterialName = entity.sg.MaterialName,//_erpBasicDataExtendService.GetMaterialName(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),
|
||||
BarCode = string.IsNullOrEmpty(entity.serial.BarCode) ? (string.IsNullOrEmpty(entity.serial.Old_MaterialNumber)?entity.sg.BarCode: entity.serial.BarCode) : entity.serial.BarCode,// _erpBasicDataExtendService.GetMaterialBarCode(materials, s.serial.MaterialNumber),
|
||||
SerialNumber = entity.serial.SerialNumber,
|
||||
IsUseNumber = entity.serial.IsUseNumber,
|
||||
NumberCode = entity.serial.NumberCode,
|
||||
|
||||
Reference in New Issue
Block a user