diff --git a/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs b/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs index fd40ef8..81ec02b 100644 --- a/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs +++ b/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs @@ -598,7 +598,11 @@ namespace BarCode.Web.Repositories var entity = await query.FirstOrDefaultAsync(); if (entity == null) return null; - + bool isNumber = false; + if(entity.TwoNumberCode.IndexOf(serialNumber)>=0) + { + isNumber = true; + } ////如果为单套产品,那就直接取就行了。 //if (entity.IsTwo < 2) //{ @@ -616,7 +620,7 @@ namespace BarCode.Web.Repositories NumberCode = entity.NumberCode, IsTwo = entity.IsTwo, SuitNumber = entity.SuitNumber, - TwoSerialNumber= entity.TwoSerialNumber.Replace(entity.SerialNumber,"").Replace(",",""), + TwoSerialNumber= (isNumber==true)? entity.TwoNumberCode.Replace(entity.NumberCode, "").Replace(",", ""): entity.TwoSerialNumber.Replace(entity.SerialNumber,"").Replace(",",""), TwoNumberCode = entity.TwoNumberCode.Replace(entity.NumberCode, "").Replace(",", "") }; //}