diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index b2c375e3..fa1f49aa 100644 Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ diff --git a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs index 1b279245..bb85812f 100644 --- a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs +++ b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs @@ -317,17 +317,25 @@ namespace WMS.Web.Repositories if (entity.boxInventory != null) response.IsBoxInventory = entity.boxInventory.Details.SelectMany(s => s.SerialNumbers).Where(w => serialNumber.Equals(w)).Count() >= 1 ? true : false; response.IsTwo = entity.serial.IsTwo; - if (entity.serial.TwoSerialNumber != null) + if (entity.serial.IsTwo > 1) { - response.TwoSerialNumber = entity.serial.TwoSerialNumber.Replace(entity.serial.SerialNumber, "").Replace(",", ""); - response.IsNotCount = entity.serial.IsNotCount; + if (entity.serial.TwoSerialNumber != null) + { + response.TwoSerialNumber = entity.serial.TwoSerialNumber.Replace(entity.serial.SerialNumber, "").Replace(",", ""); + response.IsNotCount = entity.serial.IsNotCount; + } + else + { + response.TwoSerialNumber = ""; + response.IsNotCount = "0"; + } } else { response.TwoSerialNumber = ""; response.IsNotCount = "0"; } - response.IsNotCount = entity.serial.IsNotCount; + response.IsNotCount = entity.serial.IsNotCount; return response; }