diff --git a/src/BarCode.Web.Domain/Services/BoxService.cs b/src/BarCode.Web.Domain/Services/BoxService.cs index f1beecd..58d0215 100644 --- a/src/BarCode.Web.Domain/Services/BoxService.cs +++ b/src/BarCode.Web.Domain/Services/BoxService.cs @@ -313,14 +313,19 @@ namespace BarCode.Web.Domain.Services if (dto.TwoSerialNumber != null) { + _logger.LogInformation($"获取到:TwoSerialNumber:{dto.TwoSerialNumber}"); + var TwosList = await _serialNumbersRepositories.GetEntityList(new List() { dto.TwoSerialNumber }); - var Twos = sList.FirstOrDefault(f => f.SerialNumber.Equals(dto.TwoSerialNumber)); + var Twos = TwosList.FirstOrDefault(f => f.SerialNumber.Equals(dto.TwoSerialNumber)); + _logger.LogInformation($"获取到:Twos:{JsonConvert.SerializeObject(Twos)}"); if (Twos == null) return Result.ReFailure(ResultCodes.SerialNumberNoDateError); - //判断使用的是数字序列码还是序列码 - var TwosStr = s.IsUseNumber == true ? s.TwoNumberCode : s.TwoSerialNumber; + ////判断使用的是数字序列码还是序列码 + //var TwosStr = s.IsUseNumber == true ? s.NumberCode : s.SerialNumber; + //_logger.LogInformation($"获取到:TwosStr:{TwosStr}"); + //_logger.LogInformation($"获取到:TwosStr:{TwosStr}"); - var TworesUn = box.UnSerialNumber(TwosStr, dto.MaterialNumber); + var TworesUn = box.UnSerialNumber(dto.TwoSerialNumber, dto.MaterialNumber); if (!TworesUn.IsSuccess) return TworesUn; //var sList = await _serialNumbersRepositories.GetEntityListContainNumber(new List() { dto.SerialNumber });