From 65fbaad9c034e6a3d1c18723371ade6d4667393f Mon Sep 17 00:00:00 2001
From: alex <whitebig@126.com>
Date: Mon, 7 Aug 2023 16:30:19 +0800
Subject: [PATCH] 1

---
 WarehouseMgr/Tnb.WarehouseMgr/WmsImportAndExportService.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsImportAndExportService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsImportAndExportService.cs
index 52a0ad69..fe179a33 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsImportAndExportService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsImportAndExportService.cs
@@ -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)
             {