From cc169f980f69df61dafa07b2526eaee7dd36173e Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Wed, 20 Nov 2024 10:45:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2      | Bin 277406 -> 277406 bytes
 .../Controllers/MaterialController.cs         |  57 ++++++++++--------
 2 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
index e0f50eded0be3c9cb2a141ab7974d42926e4da5c..c3ada48a6643ca53f3cacfe46734bb57599be38c 100644
GIT binary patch
delta 4708
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

delta 5435
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

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<Materials> update_list = new List<Materials>();
             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)