diff --git a/src/BarCode.Web.Api/Controllers/WmsBoxController.cs b/src/BarCode.Web.Api/Controllers/WmsBoxController.cs index 9d8e369..de0ab2c 100644 --- a/src/BarCode.Web.Api/Controllers/WmsBoxController.cs +++ b/src/BarCode.Web.Api/Controllers/WmsBoxController.cs @@ -89,44 +89,53 @@ namespace BarCode.Web.Api.Controllers { _logger.LogInformation($"wms获取序列码:{JsonConvert.SerializeObject(dto)}"); - var entity = await _serialNumbersRepositories.GetEntityWms(dto.SerialNumber); - if (entity == null) return Result.ReFailure(ResultCodes.SerialNumberNoData); - if (entity.BoxId > 0) - return Result.ReFailure(ResultCodes.SerialNumberBindBox); - if (entity.IsUse == true) - return Result.ReFailure(ResultCodes.SerialNumberIsUse); - var response = new SerialNumbersWmsResponse() - { - 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 - }; - //把查询到的序列码修改成使用 - if(entity.IsTwo>1)//说明是两件装 - { - string[] s = entity.TwoSerialNumber.Split(','); - for (int i = 0; i < s.Length; i++) - { - entity.WmsGet(s[i]); - } - } - else - { - entity.WmsGet(dto.SerialNumber); - } - + //var entity = await _serialNumbersRepositories.GetEntityWms(dto.SerialNumber); + var entityList = await _serialNumbersRepositories.GetEntityWmsBySuitNumber(dto.SerialNumber); var list = new List(); - list.Add(entity); + var response = new SerialNumbersWmsResponse(); + for (int i = 0; i < entityList.Count; i++) + { + var entity = entityList[i]; + if (entity == null) return Result.ReFailure(ResultCodes.SerialNumberNoData); + if (entity.BoxId > 0) + return Result.ReFailure(ResultCodes.SerialNumberBindBox); + if (entity.IsUse == true) + return Result.ReFailure(ResultCodes.SerialNumberIsUse); + response = new SerialNumbersWmsResponse() + { + 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 + }; + //把查询到的序列码修改成使用 + //if(entity.IsTwo>1)//说明是两件装 + //{ + // string[] s = entity.TwoSerialNumber.Split(','); + // for (int i = 0; i < s.Length; i++) + // { + // entity.WmsGet(s[i]); + // } + //} + //else + //{ + entity.WmsGet(entityList[i].SerialNumber); + //} + + + list.Add(entity); + } + var res = await _serialNumbersRepositories.EditEntityList(list); - if (!res) return Result.ReFailure(ResultCodes.DateWriteError); - _logger.LogInformation($"wms获取序列码返回序列码信息:{JsonConvert.SerializeObject(response)}"); + if (!res) return Result.ReFailure(ResultCodes.DateWriteError); + _logger.LogInformation($"wms获取序列码返回序列码信息:{JsonConvert.SerializeObject(response)}"); + return Result.ReSuccess(response); }