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-09 17:13:11 +08:00
parent 2400e85c06
commit ac3fe2e4f5
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,6 +15,7 @@ using BarCode.Web.Repositories.Configuration;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Storage; using Microsoft.EntityFrameworkCore.Storage;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.IdentityModel.Tokens;
using Npoi.Mapper; using Npoi.Mapper;
using NPOI.OpenXmlFormats.Wordprocessing; using NPOI.OpenXmlFormats.Wordprocessing;
using NPOI.POIFS.FileSystem; using NPOI.POIFS.FileSystem;
@@ -937,7 +938,7 @@ namespace BarCode.Web.Repositories
//MaterialName = entity.sg.MaterialName,//_erpBasicDataExtendService.GetMaterialName(materials, entity.MaterialNumber), //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), 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 = 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, SerialNumber = entity.serial.SerialNumber,
IsUseNumber = entity.serial.IsUseNumber, IsUseNumber = entity.serial.IsUseNumber,
NumberCode = entity.serial.NumberCode, NumberCode = entity.serial.NumberCode,