diff --git a/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs b/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs index a2755dc..58e238a 100644 --- a/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs +++ b/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs @@ -447,7 +447,7 @@ namespace BarCode.Web.Repositories SerialNumber = s.SerialNumber, IsUseNumber = s.IsUseNumber, NumberCode = s.NumberCode, - TwoSerialNumber=s.TwoSerialNumber.Replace(s.SerialNumber,"").Replace(",","") + TwoSerialNumber= (s.IsUseNumber==true)? s.TwoNumberCode.Replace(s.NumberCode,"").Replace(",",""): s.TwoSerialNumber.Replace(s.SerialNumber,"").Replace(",","") }).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync(); return (list, total); }