Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java
===================================================================
diff -u -r13399 -r13420
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java	(.../ExportBasedataManagerImpl.java)	(revision 13399)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java	(.../ExportBasedataManagerImpl.java)	(revision 13420)
@@ -428,8 +428,15 @@
 	private void insertMaterialValueToCell(
 			HSSFCellStyle[] contentCellStyleArray, HSSFRow row,
 			MaterialInstance materialInstance) {
-		inertStringValueToCell(row, 1, contentCellStyleArray[1],
-				materialInstance.getMaterialName());
+		if( materialInstance.getMaterialDefinition() != null)
+		{
+			inertStringValueToCell(row, 1, contentCellStyleArray[1],
+					materialInstance.getMaterialDefinition().getName());
+		}else
+		{
+			inertStringValueToCell(row, 1, contentCellStyleArray[1],
+					materialInstance.getMaterialName());
+		}
 		String spec = "";
 		if (materialInstance.getMaterialDefinition() != null) {
 			spec = materialInstance.getMaterialDefinition().getSpecification();