Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
===================================================================
diff -u -r16366 -r16483
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 16366)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 16483)
@@ -254,7 +254,7 @@
 						wb.getSheet("一次性物品管理"), msg, totalCount.intValue()));
 				// 导入"外来器械包"数据
 				totalCount.set(importForeignTousseData(wb.getSheet("外来器械包管理"), msg,
-						totalCount.intValue()));
+						packageTypes,totalCount.intValue()));
 				// 导入"器械包管理"基础数据
 				totalCount.set(importTousseBasedata(wb.getSheet("器械包管理"), msg,
 						totalCount.intValue(), packageTypes, sterilingMethods));
@@ -1465,7 +1465,7 @@
 	 * @return
 	 */
 	private int importForeignTousseData(HSSFSheet foreignTousseSheet,
-			Map<String, String> msg, int totalCount){
+			Map<String, String> msg,List<String> packageTypes, int totalCount){
 		if (foreignTousseSheet == null) {
 			return totalCount;
 		}
@@ -1479,6 +1479,7 @@
 			int companyIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "公司名称");
 			int materialDefinitionNameIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "器械包明细(含可拆卸的工具)");
 			int materialSpecificationIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "规格");
+			int packageTypeIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "包装类型");
 			int materialDefinitionAmountIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "数量");
 			int includeImplantIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "工具/植入物");
 			int dismantleAmountIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "可拆卸数量");
@@ -1537,7 +1538,17 @@
 
 					// 材料规格
 					String specification = ParerUtils.getCellFormatValue(row, materialSpecificationIndex);
-
+					String packageType = ParerUtils.getCellFormatValue(row, packageTypeIndex);
+					// 录入的默认包装类型的值必须要先存在该集合中
+					if( StringUtils.isNotBlank(packageType)){
+						if (!packageTypes.contains(packageType)) {
+							failureCount = appendFailureRowNumAndRecordFailureNum(
+									failureCount, sb, currentRowNum,packageTypeIndex,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_NOT_DEFINED);
+							tousseDefinition = null;
+							continue;
+						}
+					}
+					tousseDefinition.setPackageType(packageType);
 					// 材料数量
 					String materialDefinitionNumStr = ParerUtils.getCellFormatValue(row, materialDefinitionAmountIndex);
 					// 是否植入物 
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataDemo.xls
===================================================================
diff -u -r15919 -r16483
Binary files differ
Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java
===================================================================
diff -u -r16436 -r16483
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java	(.../ExportBasedataManagerImpl.java)	(revision 16436)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java	(.../ExportBasedataManagerImpl.java)	(revision 16483)
@@ -438,7 +438,11 @@
 					inertStringValueToCell(row, cellNumer,
 							contentCellStyleArray[cellNumer++],
 							tousseDefinition.getName());
-
+					// 包装类型
+					inertStringValueToCell(row, cellNumer,
+							contentCellStyleArray[cellNumer++],
+							tousseDefinition.getPackageType());
+					
 					boolean isInsertMaterial = false;
 					// 器械
 					List<MaterialInstance> materialInstances = tousseDefinition
@@ -503,32 +507,32 @@
 			MaterialInstance materialInstance) {
 		if( materialInstance.getMaterialDefinition() != null)
 		{
-			inertStringValueToCell(row, 2, contentCellStyleArray[2],
+			inertStringValueToCell(row, 3, contentCellStyleArray[2],
 					materialInstance.getMaterialDefinition().getName());
 		}else
 		{
-			inertStringValueToCell(row, 2, contentCellStyleArray[2],
+			inertStringValueToCell(row, 3, contentCellStyleArray[2],
 					materialInstance.getMaterialName());
 		}
 		String spec = "";
 		if (materialInstance.getMaterialDefinition() != null) {
 			spec = materialInstance.getMaterialDefinition().getSpecification();
 		}
-		inertStringValueToCell(row, 3, contentCellStyleArray[3], spec);
+		inertStringValueToCell(row, 4, contentCellStyleArray[3], spec);
 		// 4 是否植入物
 		if("是".equals(materialInstance.materialIsImplant())){
-			inertStringValueToCell(row, 4, contentCellStyleArray[4], "植入物");
+			inertStringValueToCell(row, 5, contentCellStyleArray[4], "植入物");
 		}else{
-			inertStringValueToCell(row, 4, contentCellStyleArray[4], "工具");
+			inertStringValueToCell(row, 5, contentCellStyleArray[4], "工具");
 		}
 		// 5 材料数量
-		inertDoubleValueToCell(row, 5, contentCellStyleArray[5],
+		inertDoubleValueToCell(row, 6, contentCellStyleArray[5],
 				(double) materialInstance.getCount());
 		// 6 可拆卸数量
-		inertStringValueToCell(row, 6, contentCellStyleArray[6],
+		inertStringValueToCell(row, 7, contentCellStyleArray[6],
 				materialInstance.getMinDismantleAmount());
 		// 7清洗分类类型
-		inertStringValueToCell(row, 7, contentCellStyleArray[7],
+		inertStringValueToCell(row, 8, contentCellStyleArray[7],
 				materialInstance.getWashClassifyType());
 	}