diff --git a/src/BarCode.Web.Domain/Services/SerialNumberService.cs b/src/BarCode.Web.Domain/Services/SerialNumberService.cs index b4d0c8e..c4dffd8 100644 --- a/src/BarCode.Web.Domain/Services/SerialNumberService.cs +++ b/src/BarCode.Web.Domain/Services/SerialNumberService.cs @@ -386,7 +386,7 @@ namespace BarCode.Web.Domain.Services if (!isSuccess) res_Rollback = true; generateRecords[i].IsTwo = 2; - + isSuccess = _transactionRepositories.CommitTransaction(res_Rollback, _transaction); if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError); diff --git a/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs b/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs index 464a10a..7f015e8 100644 --- a/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs +++ b/src/BarCode.Web.Repositories/SerialNumbersRepositories.cs @@ -529,13 +529,13 @@ namespace BarCode.Web.Repositories list2.MaterialNumber = list[i].MaterialNumber; list2.MaterialName = list[i].MaterialName; list2.BarCode = list[i].BarCode; - list2.SerialNumber = list[i].SerialNumber; - list2.SerialNumber2 = serialNumbers[0].SerialNumber; - list2.NumberCode = list[i].NumberCode; - list2.NumberCode2 = serialNumbers[0].NumberCode; + list2.SerialNumber = serialNumbers[0].SerialNumber; + list2.SerialNumber2 = list[i].SerialNumber; + list2.NumberCode = serialNumbers[0].NumberCode; + list2.NumberCode2 = list[i].NumberCode; list2.Number = list[i].Number; - list2.Id = list[i].Id; - list2.Id2 = serialNumbers[0].Id; + list2.Id = serialNumbers[0].Id; + list2.Id2 = list[i].Id; list2.IsUse = list[i].IsUse; list2.IsUseStr = list[i].IsUseStr; list2.IsEnablePrint = list[i].IsEnablePrint; @@ -570,13 +570,13 @@ namespace BarCode.Web.Repositories list2.MaterialNumber = list[i].MaterialNumber; list2.MaterialName = list[i].MaterialName; list2.BarCode = list[i].BarCode; - list2.SerialNumber = list[i].SerialNumber; - list2.SerialNumber2 = serialNumbers[0].SerialNumber; - list2.NumberCode = list[i].NumberCode; - list2.NumberCode2 = serialNumbers[0].NumberCode; + list2.SerialNumber = serialNumbers[0].SerialNumber; + list2.SerialNumber2 = list[i].SerialNumber; + list2.NumberCode = serialNumbers[0].NumberCode; + list2.NumberCode2 = list[i].NumberCode; list2.Number = list[i].Number; - list2.Id = list[i].Id; - list2.Id2 = serialNumbers[0].Id; + list2.Id = serialNumbers[0].Id; + list2.Id2 = list[i].Id; list2.IsUse = list[i].IsUse; list2.IsUseStr = list[i].IsUseStr; list2.IsEnablePrint = list[i].IsEnablePrint;