Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
===================================================================
diff -u -r19774 -r19821
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 19774)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 19821)
@@ -3165,10 +3165,12 @@
 		String specification = ParerUtils.getCellFormatValue(row, 2);
 		// 外部编码
 		String externalCode = ParerUtils.getCellFormatValue(row, 3);
+		// 物资编码
+		String inventorySerialNumber = ParerUtils.getCellFormatValue(row, 4);
 		// 单位
-		String unit = ParerUtils.getCellFormatValue(row, 4);
+		String unit = ParerUtils.getCellFormatValue(row, 5);
 		// 最小库存
-		String minStorageStr = ParerUtils.getCellFormatValue(row, 5);
+		String minStorageStr = ParerUtils.getCellFormatValue(row, 6);
 		Integer minStorage = null;
 		if (StringUtils.isNotBlank(minStorageStr)) {
 			try {
@@ -3181,7 +3183,7 @@
 			}
 		}
 		// 最大库存
-		String maxStorageStr = ParerUtils.getCellFormatValue(row, 6);
+		String maxStorageStr = ParerUtils.getCellFormatValue(row, 7);
 		Integer maxStorage = null;
 		if (StringUtils.isNotBlank(maxStorageStr)) {
 			try {
@@ -3194,7 +3196,7 @@
 			}
 		}
 		// 能否作为器械包材料
-		String isPartOfTousseMaterial = ParerUtils.getCellFormatValue(row, 7);
+		String isPartOfTousseMaterial = ParerUtils.getCellFormatValue(row, 8);
 		if (StringUtils.isNotBlank(isPartOfTousseMaterial)) {
 			if ("是".equals(isPartOfTousseMaterial)) {
 				isPartOfTousseMaterial = DisposableGoodsStock.CONSTANT_YES;
@@ -3206,7 +3208,7 @@
 			}
 		}
 		// 能否被科室申请
-		String isApplicationMaterial = ParerUtils.getCellFormatValue(row, 8);
+		String isApplicationMaterial = ParerUtils.getCellFormatValue(row, 9);
 		if (StringUtils.isNotBlank(isApplicationMaterial)) {
 			if ("是".equals(isApplicationMaterial)) {
 				isApplicationMaterial = DisposableGoodsStock.CONSTANT_YES;
@@ -3218,7 +3220,7 @@
 			}
 		}
 		// 最小申请数量
-		String minApplyAmountStr = ParerUtils.getCellFormatValue(row, 9);
+		String minApplyAmountStr = ParerUtils.getCellFormatValue(row, 10);
 		Integer minApplyAmount = null;
 		if (StringUtils.isNotBlank(minApplyAmountStr)) {
 			try {
@@ -3231,15 +3233,15 @@
 			}
 		}
 		// 批次号
-		String batchNumber = ParerUtils.getCellFormatValue(row, 10);
+		String batchNumber = ParerUtils.getCellFormatValue(row, 11);
 		if (StringUtils.isBlank(batchNumber)) {
 			throw new ImportDataException("第" + currentRowNum + "行物品批次不能为空！");
 		}
 		// 灭菌批号
-		String sterileBatchNumber = ParerUtils.getCellFormatValue(row, 11);
+		String sterileBatchNumber = ParerUtils.getCellFormatValue(row, 12);
 		// 失效日期
 		Date expDate = null;
-		String expDateStr = ParerUtils.getCellFormatValue(row, 12);
+		String expDateStr = ParerUtils.getCellFormatValue(row, 13);
 		if (StringUtils.isNotBlank(expDateStr)) {
 			expDateStr = expDateStr.trim();
 			if(expDateStr.length() != Constants.SIMPLEDATEFORMAT_YYYYMMDD.toPattern().length()){
@@ -3257,19 +3259,19 @@
 					+ "行产品有效期日期格式必须为yyyy-MM-dd！");
 		}
 		// 注册证号
-		String certification = ParerUtils.getCellFormatValue(row, 13);
+		String certification = ParerUtils.getCellFormatValue(row, 14);
 		// 供应商
-		String supplierName = ParerUtils.getCellFormatValue(row, 14);
+		String supplierName = ParerUtils.getCellFormatValue(row, 15);
 		// 生产厂商
-		String manufacturer = ParerUtils.getCellFormatValue(row, 15);
+		String manufacturer = ParerUtils.getCellFormatValue(row, 16);
 		// 标识号
-		String identification = ParerUtils.getCellFormatValue(row, 16);
+		String identification = ParerUtils.getCellFormatValue(row, 17);
 		if (StringUtils.isBlank(identification)) {
 			throw new ImportDataException("第" + currentRowNum + "行物品标识号不能为空！");
 		}
 		// 入库日期
 //		Date entryDate = null;
-//		String entryDateStr = ParerUtils.getCellFormatValue(row, 17);
+//		String entryDateStr = ParerUtils.getCellFormatValue(row, 18);
 //		if (StringUtils.isNotBlank(entryDateStr)) {
 //			try {
 //				entryDate = Constants.SIMPLEDATEFORMAT_YYYYMMDD.parse(entryDateStr);
@@ -3281,7 +3283,7 @@
 //					+ "行物品入库时间日期格式必须为yyyy-MM-dd！");
 //		}
 		// 价格
-		String costStr = ParerUtils.getCellFormatValue(row, 18);
+		String costStr = ParerUtils.getCellFormatValue(row, 19);
 		Double price = null;
 		// 如果为空，则直接拿一次性物品定义里定义的价格，如果再为空，则抛出异常
 		if (StringUtils.isNotBlank(costStr)) {
@@ -3295,7 +3297,7 @@
 					+ "行的物品单价必须为有效数字！");
 		}
 		// 数量
-		String amountStr = ParerUtils.getCellFormatValue(row, 19);
+		String amountStr = ParerUtils.getCellFormatValue(row, 20);
 		Long amount = null;
 		if (StringUtils.isNotBlank(amountStr)) {
 			try {
@@ -3307,7 +3309,7 @@
 			throw new ImportDataException("第" + currentRowNum + "行物品的数量必须是正整数！");
 		}
 		// 验收结论
-		String conclusion = ParerUtils.getCellFormatValue(row, 20);
+		String conclusion = ParerUtils.getCellFormatValue(row, 21);
 		if (!DisposableGoodsIdentification.CONCLUSION_RESULT_PASS
 				.equals(conclusion)
 				&& !DisposableGoodsIdentification.CONCLUSION_RESULT_NOPASS
@@ -3316,15 +3318,15 @@
 					+ "行物品的验收结论输入有误，请输入合格或不合格！");
 		}
 		// 产地
-		String producingArea = ParerUtils.getCellFormatValue(row, 21);
+		String producingArea = ParerUtils.getCellFormatValue(row, 22);
 		//有无生物检测报告
-		String hasBiologicalTestReport = ParerUtils.getCellFormatValue(row, 22);
+		String hasBiologicalTestReport = ParerUtils.getCellFormatValue(row, 23);
 		hasBiologicalTestReport = GodownEntryItem.hasTypeOrDefault(hasBiologicalTestReport);
 		//有无发票
-		String hasInvoice = ParerUtils.getCellFormatValue(row, 23);
+		String hasInvoice = ParerUtils.getCellFormatValue(row, 24);
 		hasInvoice = GodownEntryItem.hasTypeOrDefault(hasInvoice);
 		//分类级别
-		String grade = ParerUtils.getCellFormatValue(row, 24);
+		String grade = ParerUtils.getCellFormatValue(row, 25);
 		grade = GodownEntryItem.gradeOrDefault(grade);
 		
 		// 一次性物品
@@ -3355,6 +3357,9 @@
 		if (StringUtils.isNotBlank(externalCode)) {
 			disposableGoods.setExternalCode(externalCode);
 		}
+		if (StringUtils.isNotBlank(inventorySerialNumber)) {
+			disposableGoods.setInventorySerialNumber(inventorySerialNumber);
+		}
 		if (StringUtils.isNotBlank(unit)) {
 			disposableGoods.setUnit(unit);
 		}
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/diposable.xls
===================================================================
diff -u -r13380 -r19821
Binary files differ