diff --git a/src/BarCode.Web.Api/Controllers/WmsBoxController.cs b/src/BarCode.Web.Api/Controllers/WmsBoxController.cs index fe64f4b..d3fe2f0 100644 --- a/src/BarCode.Web.Api/Controllers/WmsBoxController.cs +++ b/src/BarCode.Web.Api/Controllers/WmsBoxController.cs @@ -103,30 +103,65 @@ namespace BarCode.Web.Api.Controllers string[] s = entity.TwoSerialNumber.Split(','); - // string[] sy = entity.TwoNumberCode.Split(','); - for (int i = 0; i < s.Length; i++) + + string[] y = entity.TwoNumberCode.Split(','); + bool isNumberCode = false; + if (entity.TwoNumberCode.IndexOf(dto.SerialNumber, 0) >= 0) { - response = new SerialNumbersWmsResponse() + isNumberCode = true;//说明是此次查的为数字序列号 + } + + if (isNumberCode) + { + for (int i = 0; i < s.Length; i++) { - SerialNumber = s[i],//entity.SerialNumber.Equals(dto.SerialNumber) ? s[i] : sy[i], - MaterialNumber = entity.MaterialNumber, - CreateTime = entity.CreateTime, - Creator = _singleDataService.GetSingleData(SingleAction.Users, 1, entity.CreatorId), - IsTwo = entity.IsTwo, - TwoSerialNumber = entity.TwoSerialNumber, - TwoNumberCode = entity.TwoNumberCode, - IsNotCount = entity.IsNotCount - }; - var entity2 = await _serialNumbersRepositories.GetEntityWms(s[i]); - entity2.WmsGet(s[i]); - list.Add(entity2); + response = new SerialNumbersWmsResponse() + { + SerialNumber = y[i],//entity.SerialNumber.Equals(dto.SerialNumber) ? s[i] : sy[i], + // SerialNumber= entity.SerialNumber.Equals(dto.SerialNumber) ? entity.SerialNumber : entity.NumberCode, + MaterialNumber = entity.MaterialNumber, + CreateTime = entity.CreateTime, + Creator = _singleDataService.GetSingleData(SingleAction.Users, 1, entity.CreatorId), + IsTwo = entity.IsTwo, + TwoSerialNumber = entity.TwoSerialNumber, + TwoNumberCode = entity.TwoNumberCode, + IsNotCount = entity.IsNotCount + }; + var entity2 = await _serialNumbersRepositories.GetEntityWms(y[i]); + entity2.WmsGet(s[i]); + list.Add(entity2); + } + } + else + { + // string[] sy = entity.TwoNumberCode.Split(','); + for (int i = 0; i < s.Length; i++) + { + response = new SerialNumbersWmsResponse() + { + SerialNumber = s[i],//entity.SerialNumber.Equals(dto.SerialNumber) ? s[i] : sy[i], + // SerialNumber= entity.SerialNumber.Equals(dto.SerialNumber) ? entity.SerialNumber : entity.NumberCode, + MaterialNumber = entity.MaterialNumber, + CreateTime = entity.CreateTime, + Creator = _singleDataService.GetSingleData(SingleAction.Users, 1, entity.CreatorId), + IsTwo = entity.IsTwo, + TwoSerialNumber = entity.TwoSerialNumber, + TwoNumberCode = entity.TwoNumberCode, + IsNotCount = entity.IsNotCount + }; + var entity2 = await _serialNumbersRepositories.GetEntityWms(s[i]); + entity2.WmsGet(s[i]); + list.Add(entity2); + } } } else { response = new SerialNumbersWmsResponse() { - SerialNumber = entity.SerialNumber.Equals(dto.SerialNumber) ? entity.SerialNumber : entity.NumberCode, + SerialNumber = entity.SerialNumber.Equals(dto.SerialNumber) ? entity.SerialNumber : entity.NumberCode, + // SerialNumber = entity.SerialNumber.Equals(dto.SerialNumber) ? entity.SerialNumber : entity.NumberCode, + MaterialNumber = entity.MaterialNumber, CreateTime = entity.CreateTime, Creator = _singleDataService.GetSingleData(SingleAction.Users, 1, entity.CreatorId),