diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index e0f50ede..c3ada48a 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.Api/Controllers/MaterialController.cs b/src/WMS.Web.Api/Controllers/MaterialController.cs index 871bee14..463a69c6 100644 --- a/src/WMS.Web.Api/Controllers/MaterialController.cs +++ b/src/WMS.Web.Api/Controllers/MaterialController.cs @@ -77,39 +77,44 @@ namespace WMS.Web.Api.Controllers List update_list = new List(); foreach (var m in mDtos.Data) { - var entity = list.FirstOrDefault(f => f.MaterialNumber.Equals(m.MaterialNumber)); - if (entity == null) continue; - if (type.Equals("69")) + foreach (var entity in list.Where(f => f.MaterialNumber.Equals(m.MaterialNumber))) { - entity.BarCode = m.BarCode.Trim(); - update_list.Add(entity); - } - //if (type.Equals("id")) - //{ - // entity.IdConvertBar = m.IdConvertBar.Trim(); - // update_list.Add(entity); - //} - if (type.Equals("other")) - { - entity.MaterialName = m.MaterialName; - entity.Specifications = m.Specifications; - update_list.Add(entity); + //var entity = list.FirstOrDefault(f => f.MaterialNumber.Equals(m.MaterialNumber)); + //if (entity == null) continue; + if (type.Equals("69")) + { + entity.BarCode = m.BarCode.Trim(); + update_list.Add(entity); + } + //if (type.Equals("id")) + //{ + // entity.IdConvertBar = m.IdConvertBar.Trim(); + // update_list.Add(entity); + //} + if (type.Equals("other")) + { + entity.MaterialName = m.MaterialName; + entity.Specifications = m.Specifications; + update_list.Add(entity); + } } //修改缓存 if (materials == null) continue; - var entity_cache = materials.FirstOrDefault(f => f.MaterialNumber.Equals(m.MaterialNumber)); - if (entity_cache == null) continue; - if (type.Equals("69")) - entity_cache.BarCode = m.BarCode.Trim(); - //if (type.Equals("id")) - // entity_cache.IdConvertBar = m.IdConvertBar.Trim(); - if (type.Equals("other")) + foreach (var entity_cache in materials.Where(f => f.MaterialNumber.Equals(m.MaterialNumber))) { - entity_cache.MaterialName = m.MaterialName; - entity_cache.Specifications = m.Specifications; + //var entity_cache = materials.FirstOrDefault(f => f.MaterialNumber.Equals(m.MaterialNumber)); + //if (entity_cache == null) continue; + if (type.Equals("69")) + entity_cache.BarCode = m.BarCode.Trim(); + //if (type.Equals("id")) + // entity_cache.IdConvertBar = m.IdConvertBar.Trim(); + if (type.Equals("other")) + { + entity_cache.MaterialName = m.MaterialName; + entity_cache.Specifications = m.Specifications; + } } - } //修改缓存 if (materials != null && materials.Count() > 0)