diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipAppService.cs index 2041292f..a55441e4 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipAppService.cs @@ -54,15 +54,15 @@ public class MaterialRelationshipAppService : SettleAccountApplicationBase ImportAsync([FromForm] MaterialRelationshipImportRequestDto materialRelationshipImportRequestDto) { - var _exportImporter = new ExportImporter(); - var result = await _exportImporter.UploadExcelImport(materialRelationshipImportRequestDto.Files, _excelImportService).ConfigureAwait(false); - var _ls = ObjectMapper.Map, List>(result); - List _errorList = new List(); + var exportImporter = new ExportImporter(); + var inportDatas = await exportImporter.UploadExcelImport(materialRelationshipImportRequestDto.Files, _excelImportService).ConfigureAwait(false); + var entitys = ObjectMapper.Map, List>(inportDatas); + var errorList = new List(); var checkList = new List(); - if (_ls.Count > 0) + if (entitys.Count > 0) { - var query = from arc in _ls + var query = from arc in entitys group arc by new { arc.SettleMaterialCode } into g where g.Count() > 1 @@ -77,18 +77,18 @@ public class MaterialRelationshipAppService : SettleAccountApplicationBase p.ErpMaterialCode == itm.ErpMaterialCode && p.BusinessType == EnumBusinessType.BeiJian); - if (_first != null) + var entity = _repository.FirstOrDefault(p => p.ErpMaterialCode == item.ErpMaterialCode && p.BusinessType == EnumBusinessType.BeiJian); + if (entity != null) { - _first.Update(itm.MaterialDesc, itm.SettleMaterialCode); - await _repository.UpdateAsync(_first).ConfigureAwait(false); + entity.Update(item.MaterialDesc, item.SettleMaterialCode); + await _repository.UpdateAsync(entity).ConfigureAwait(false); } else { - itm.BusinessType = EnumBusinessType.BeiJian; - await _repository.InsertAsync(itm).ConfigureAwait(false); + item.BusinessType = EnumBusinessType.BeiJian; + await _repository.InsertAsync(item).ConfigureAwait(false); } } return new JsonResult(new { Code = 200, Message = "导入成功" });