Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java
===================================================================
diff -u -r24510 -r25581
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java	(.../MaterialDefinition.java)	(revision 24510)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java	(.../MaterialDefinition.java)	(revision 25581)
@@ -191,8 +191,16 @@
 	 */
 	private String washQualityCheckMethod;
 	
+	/**
+	 * 类型编码(如复大肿瘤分为耗材与介入一次性耗材、中山眼科物资系统推过来的分类类别:如卫生材料、医疗器械等)
+	 */
+	private String categoryCode;	
+
 	public static Map<String, String> ColumnNameAndPoPropertyNameMap = new LinkedHashMap<String, String>(13);
 
+	/**
+	 * 顺序应和导入导出模板的列顺序一致
+	 */
 	static {
 		ColumnNameAndPoPropertyNameMap.put("物品名称", "name");
 		ColumnNameAndPoPropertyNameMap.put("类别", "type");
@@ -212,6 +220,8 @@
 		ColumnNameAndPoPropertyNameMap.put("功能检查", "functionCheck");
 		ColumnNameAndPoPropertyNameMap.put("是否外来器械材料", "isForeignMaterial");
 		ColumnNameAndPoPropertyNameMap.put("是否停用", "disable");
+		ColumnNameAndPoPropertyNameMap.put("物资编码", "inventorySerialNumber");
+		ColumnNameAndPoPropertyNameMap.put("类型编码", "categoryCode");
 	}
 
 	@Override
@@ -640,4 +650,13 @@
 	public void setWashQualityCheckMethod(String washQualityCheckMethod) {
 		this.washQualityCheckMethod = washQualityCheckMethod;
 	}
+
+	public String getCategoryCode() {
+		return categoryCode;
+	}
+
+	public void setCategoryCode(String categoryCode) {
+		this.categoryCode = categoryCode;
+	}
+
 }
Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
===================================================================
diff -u -r25105 -r25581
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 25105)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 25581)
@@ -2593,29 +2593,31 @@
 			
 			//物资编码
 			String inventorySerialNumber = ParerUtils.getCellFormatValue(row, 19);
+			// 类型编码
+			String categoryCode = ParerUtils.getCellFormatValue(row, 20);
 			
 			// 最小申请数量
 			Integer minApplyAmount = null;
-			String minApplyAmountStr = ParerUtils.getCellFormatValue(row, 20);
+			String minApplyAmountStr = ParerUtils.getCellFormatValue(row, 21);
 			if (StringUtils.isNotBlank(minApplyAmountStr)) {
 				try {
 					minApplyAmount = Integer.parseInt(minApplyAmountStr);
 				} catch (Exception e) {
 					failureCount = appendFailureRowNumAndRecordFailureNum(
-							failureCount, sb, currentRowNum,20,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_IS_NOT_NUMBER);
+							failureCount, sb, currentRowNum,21,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_IS_NOT_NUMBER);
 					continue;
 				}
 			}
 			
 			//最大申请数量
 			Integer maxApplyAmount = null;
-			String maxApplyAmountStr = ParerUtils.getCellFormatValue(row, 21);
+			String maxApplyAmountStr = ParerUtils.getCellFormatValue(row, 22);
 			if (StringUtils.isNotBlank(maxApplyAmountStr)) {
 				try {
 					maxApplyAmount = Integer.parseInt(maxApplyAmountStr);
 				} catch (Exception e) {
 					failureCount = appendFailureRowNumAndRecordFailureNum(
-							failureCount, sb, currentRowNum,21,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_IS_NOT_NUMBER);
+							failureCount, sb, currentRowNum,22,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_IS_NOT_NUMBER);
 					continue;
 				}
 			}
@@ -2652,6 +2654,7 @@
 			diposableGoods.setApplicationSpecification(applicationSpecification);
 			diposableGoods.setPackageSpec(packageSpec);
 			diposableGoods.setInventorySerialNumber(inventorySerialNumber);
+			diposableGoods.setCategoryCode(categoryCode);
 			diposableGoods.setMaxApplyAmount(maxApplyAmount);
 			diposableGoods.setMinApplyAmount(minApplyAmount);
 			String barcode = barcodeManager.getNewBarcodeByClass(DisposableGoods.class);
@@ -2838,6 +2841,10 @@
 			String isForeignMaterial = ParerUtils.getCellFormatValue(row, 16);
 			// 是否停用
 			String isDisable = ParerUtils.getCellFormatValue(row, 17);
+			// 物资编码
+			String inventorySerialNumber = ParerUtils.getCellFormatValue(row, 18);
+			// 类型编码
+			String categoryCode = ParerUtils.getCellFormatValue(row, 19);
 			
 			MaterialDefinition materialDefinition = null;
 			if(Constants.STR_YES.equals(isForeignMaterial)){
@@ -2875,6 +2882,8 @@
 				materialDefinition.setFunctionCheck(functionCheck);
 				materialDefinition.setIsForeignMaterial(isForeignMaterial);
 				materialDefinition.setDisable(isDisable);
+				materialDefinition.setInventorySerialNumber(inventorySerialNumber);
+				materialDefinition.setCategoryCode(categoryCode);
 			}else {
 				// 更新数据 如果导入项为空，不做数据库里面的值.
 				if( maxStorage != null){
@@ -2925,6 +2934,12 @@
 				if(StringUtils.isNotBlank(isDisable)){
 					materialDefinition.setDisable(isDisable);
 				}
+				if(StringUtils.isNotBlank(inventorySerialNumber)){
+					materialDefinition.setInventorySerialNumber(inventorySerialNumber);
+				}
+				if(StringUtils.isNotBlank(categoryCode)){
+					materialDefinition.setCategoryCode(categoryCode);
+				}
 			}
 			totalCount = saveOrUpdateAndClearCache(totalCount,
 					materialDefinition);
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataDemo.xls
===================================================================
diff -u -r22926 -r25581
Binary files differ
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
===================================================================
diff -u -r25141 -r25581
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java	(.../DisposableGoods.java)	(revision 25141)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java	(.../DisposableGoods.java)	(revision 25581)
@@ -103,7 +103,7 @@
 	private String category;
 	
 	/**
-	 * 类型(如复大肿瘤分为耗材与介入一次性耗材、中山眼科物资系统推过来的分类类别:如卫生材料、医疗器械等)
+	 * 类型编码(如复大肿瘤分为耗材与介入一次性耗材、中山眼科物资系统推过来的分类类别:如卫生材料、医疗器械等)
 	 */
 	private String categoryCode;
 	
@@ -304,7 +304,10 @@
 	public static Map<String,String> ColumnNameAndPoPropertyNameMap= new LinkedHashMap<String,String>(8);
 	
 	public static final String[] filterProperties = {"gradeList", "ColumnNameAndPoPropertyNameMap"};
-	
+
+	/**
+	 * 顺序应和导入导出模板的列顺序一致
+	 */
 	static {
 		ColumnNameAndPoPropertyNameMap.put("物品名称", "name");
 		ColumnNameAndPoPropertyNameMap.put("规格", "specification");
@@ -328,6 +331,7 @@
 		ColumnNameAndPoPropertyNameMap.put("申领单位转换单位系数", "transferScale");
 		ColumnNameAndPoPropertyNameMap.put("顺序号", "sequence");
 		ColumnNameAndPoPropertyNameMap.put("物资编码", "inventorySerialNumber");
+		ColumnNameAndPoPropertyNameMap.put("类型编码", "categoryCode");
 		ColumnNameAndPoPropertyNameMap.put("最小申请数量", "minApplyAmount");
 		ColumnNameAndPoPropertyNameMap.put("最大申请数量", "maxApplyAmount");
 	}