wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
alex
2023-08-07 16:30:19 +08:00
parent af9265ea20
commit 65fbaad9c0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
WarehouseMgr/Tnb.WarehouseMgr/WmsImportAndExportService.cs
View File

@@ -90,18 +90,18 @@ namespace Tnb.WarehouseMgr
return row > 0;
}
public async Task DataImport<T>(IFormFile file) where T : BaseEntity<string>, new()
public async Task DataImport<T>(IFormFile file,Func<List<T>> getColumns) where T : BaseEntity<string>, new()
{
var nonBeNullColumnList = new List<string>();
var entityInfo = _db.EntityMaintenance.GetEntityInfo<T>();
foreach (var column in entityInfo.Columns)
{
if (!column.IsEmpty())
if (!column.IsNullable)
{
nonBeNullColumnList.Add(column.DbColumnName);
}
}
var importData = WmsImport(file);
var importData = WmsImport(file); //ImportExcelToMemory<T> where T:BaseEntity<string>,new()
var fillColumns = nonBeNullColumnList.Except(importData.Keys).ToList();
if (fillColumns?.Count > 0)
{