diff --git a/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs b/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs
index 5ddf95bc..e1d55652 100644
--- a/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs
+++ b/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs
@@ -40,6 +40,9 @@ namespace WMS.Web.Domain.Services.Public
         /// <returns></returns>
         public string GetMaterialName(List<ErpMaterialDto> erpMaterials,int materialId)
         {
+            if (erpMaterials == null && erpMaterials.Count == 0)
+                return "";
+
             var mat= erpMaterials.Where(x => x.MaterialId == materialId).FirstOrDefault();
             if (mat == null) 
             {
@@ -59,6 +62,8 @@ namespace WMS.Web.Domain.Services.Public
         /// <returns></returns>
         public string GetMaterialNumber(List<ErpMaterialDto> erpMaterials, int materialId)
         {
+            if (erpMaterials == null && erpMaterials.Count == 0)
+                return "";
             var mat = erpMaterials.Where(x => x.MaterialId == materialId).FirstOrDefault();
             if (mat == null)
             {
@@ -78,6 +83,8 @@ namespace WMS.Web.Domain.Services.Public
         /// <returns></returns>
         public string GetMaterialSpecifications(List<ErpMaterialDto> erpMaterials, int materialId)
         {
+            if (erpMaterials == null && erpMaterials.Count == 0)
+                return "";
             var mat = erpMaterials.Where(x => x.MaterialId == materialId).FirstOrDefault();
             if (mat == null)
             {
@@ -97,6 +104,8 @@ namespace WMS.Web.Domain.Services.Public
         /// <returns></returns>
         public string GetMaterialUnitName(List<ErpMaterialDto> erpMaterials, int materialId)
         {
+            if (erpMaterials == null && erpMaterials.Count == 0)
+                return "";
             var mat = erpMaterials.Where(x => x.MaterialId == materialId).FirstOrDefault();
             if (mat == null)
             {
@@ -115,6 +124,8 @@ namespace WMS.Web.Domain.Services.Public
         /// <returns></returns>
         public int GetMaterialUnitId(List<ErpMaterialDto> erpMaterials, int materialId)
         {
+            if (erpMaterials == null && erpMaterials.Count == 0)
+                return 0;
             var mat = erpMaterials.Where(x => x.MaterialId == materialId).FirstOrDefault();
             if (mat == null)
             {
@@ -133,6 +144,8 @@ namespace WMS.Web.Domain.Services.Public
         /// <returns></returns>
         public string GetMaterialUnitNumber(List<ErpMaterialDto> erpMaterials, int materialId)
         {
+            if (erpMaterials == null && erpMaterials.Count == 0)
+                return "";
             var mat = erpMaterials.Where(x => x.MaterialId == materialId).FirstOrDefault();
             if (mat == null)
             {
@@ -152,6 +165,8 @@ namespace WMS.Web.Domain.Services.Public
         /// <returns></returns>
         public string GetOrgName(List<ErpOrgDto> erpOrgs, int orgId)
         {
+            if (erpOrgs == null && erpOrgs.Count == 0)
+                return "";
             var org = erpOrgs.Where(x => x.Id == orgId).FirstOrDefault();
             return org == null ? "" : org.Name;
         }
@@ -164,6 +179,8 @@ namespace WMS.Web.Domain.Services.Public
         /// <returns></returns>
         public string GetOrgName(List<ErpOrgDto> erpOrgs, string orgCode)
         {
+            if (erpOrgs == null && erpOrgs.Count == 0)
+                return "";
             var org = erpOrgs.Where(x => x.Number == orgCode).FirstOrDefault();
             return org == null ? "" : org.Name;
         }
@@ -176,6 +193,8 @@ namespace WMS.Web.Domain.Services.Public
         /// <returns></returns>
         public int GetOrgId(List<ErpOrgDto> erpOrgs, string orgCode)
         {
+            if (erpOrgs == null && erpOrgs.Count == 0)
+                return 0;
             var org = erpOrgs.Where(x => x.Number == orgCode).FirstOrDefault();
             return org == null ? 0 : org.Id;
         }
@@ -188,6 +207,8 @@ namespace WMS.Web.Domain.Services.Public
         /// <returns></returns>
         public string GetSupplierName(List<ErpSupplierDto> erpSuppliers, int supplierId)
         {
+            if (erpSuppliers == null && erpSuppliers.Count == 0)
+                return "";
             var supplier = erpSuppliers.Where(x => x.Id == supplierId).FirstOrDefault();
             return supplier == null ? "" : supplier.Name;
         }
@@ -199,6 +220,8 @@ namespace WMS.Web.Domain.Services.Public
         /// <returns></returns>
         public string GetCustomerName(List<ErpCustomerDto> erpCustomers, int customerId)
         {
+            if (erpCustomers == null && erpCustomers.Count == 0)
+                return "";
             var supplier = erpCustomers.Where(x => x.Id == customerId).FirstOrDefault();
             return supplier == null ? "" : supplier.Name;
         }
@@ -211,6 +234,8 @@ namespace WMS.Web.Domain.Services.Public
         /// <returns></returns>
         public string GetStockName(List<ErpStockDto> erpStocks, int stockId)
         {
+            if (erpStocks == null && erpStocks.Count == 0)
+                return "";
             var stock = erpStocks.Where(x => x.Id == stockId).FirstOrDefault();
             return stock == null ? "" : stock.Name;
         }
@@ -223,6 +248,8 @@ namespace WMS.Web.Domain.Services.Public
         /// <returns></returns>
         public string GetStockName(List<ErpStockDto> erpStocks, string code)
         {
+            if (erpStocks == null && erpStocks.Count == 0)
+                return "";
             var stock = erpStocks.Where(x => x.Code == code).FirstOrDefault();
             return stock == null ? "" : stock.Name;
         }
@@ -235,6 +262,8 @@ namespace WMS.Web.Domain.Services.Public
         /// <returns></returns>
         public string GetStockCode(List<ErpStockDto> erpStocks, int stockId)
         {
+            if (erpStocks == null && erpStocks.Count == 0)
+                return "";
             var stock = erpStocks.Where(x => x.Id == stockId).FirstOrDefault();
             return stock == null ? "" : stock.Code;
         }