18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复bug

Browse Source
This commit is contained in:
18942506660
2024-11-20 10:45:46 +08:00
parent 1f80850ec1
commit cc169f980f
2 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
View File

Binary file not shown.

57
src/WMS.Web.Api/Controllers/MaterialController.cs
View File

@@ -77,39 +77,44 @@ namespace WMS.Web.Api.Controllers
List<Materials> update_list = new List<Materials>(); List<Materials> update_list = new List<Materials>();
foreach (var m in mDtos.Data) foreach (var m in mDtos.Data)
{ {
var entity = list.FirstOrDefault(f => f.MaterialNumber.Equals(m.MaterialNumber)); foreach (var entity in list.Where(f => f.MaterialNumber.Equals(m.MaterialNumber)))
if (entity == null) continue;
if (type.Equals("69"))
{ {
entity.BarCode = m.BarCode.Trim(); //var entity = list.FirstOrDefault(f => f.MaterialNumber.Equals(m.MaterialNumber));
update_list.Add(entity); //if (entity == null) continue;
} if (type.Equals("69"))
//if (type.Equals("id")) {
//{ entity.BarCode = m.BarCode.Trim();
// entity.IdConvertBar = m.IdConvertBar.Trim(); update_list.Add(entity);
// update_list.Add(entity); }
//} //if (type.Equals("id"))
if (type.Equals("other")) //{
{ // entity.IdConvertBar = m.IdConvertBar.Trim();
entity.MaterialName = m.MaterialName; // update_list.Add(entity);
entity.Specifications = m.Specifications; //}
update_list.Add(entity); if (type.Equals("other"))
{
entity.MaterialName = m.MaterialName;
entity.Specifications = m.Specifications;
update_list.Add(entity);
}
} }
//修改缓存 //修改缓存
if (materials == null) continue; if (materials == null) continue;
var entity_cache = materials.FirstOrDefault(f => f.MaterialNumber.Equals(m.MaterialNumber)); foreach (var entity_cache in materials.Where(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; //var entity_cache = materials.FirstOrDefault(f => f.MaterialNumber.Equals(m.MaterialNumber));
entity_cache.Specifications = m.Specifications; //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) if (materials != null && materials.Count() > 0)