Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
===================================================================
diff -u -r13369 -r13378
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 13369)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 13378)
@@ -2226,6 +2226,7 @@
 			throw new RuntimeException(diposableSheet.getSheetName()+"导入失败!");
 		}
 		godownEntry.setType(GodownEntry.TYPE_IN);// 类型为入库单
+		godownEntry.setSubType(GodownEntry.SUBTYPE_IMPORT_IN);
 		godownEntrys.add(godownEntry);
 		
 		return godownEntrys;
@@ -2502,13 +2503,22 @@
 		}
 		// 产地
 		String producingArea = ParerUtils.getCellFormatValue(row, 21);
+		//有无生物检测报告
+		String hasBiologicalTestReport = ParerUtils.getCellFormatValue(row, 22);
+		hasBiologicalTestReport = GodownEntryItem.hasTypeOrDefault(hasBiologicalTestReport);
+		//有无发票
+		String hasInvoice = ParerUtils.getCellFormatValue(row, 23);
+		hasInvoice = GodownEntryItem.hasTypeOrDefault(hasInvoice);
+		//分类级别
+		String grade = ParerUtils.getCellFormatValue(row, 24);
+		grade = GodownEntryItem.gradeOrDefault(grade);
 		
 		// 一次性物品
 		DisposableGoods disposableGoods = null;
-		String diposableGoodsKey = name + "_" + specification;
-		if (goodsMap.containsKey(diposableGoodsKey)) {
-			log.info("从一次性物品Map里获取到一次性物品对象：" + diposableGoodsKey);
-			disposableGoods = goodsMap.get(diposableGoodsKey);
+		String disposableGoodsKey = name + "_" + specification;
+		if (goodsMap.containsKey(disposableGoodsKey)) {
+			log.info("从一次性物品Map里获取到一次性物品对象：" + disposableGoodsKey);
+			disposableGoods = goodsMap.get(disposableGoodsKey);
 		} else {
 			log.info("查找一次性物品对象：" + name + " " + specification);
 			disposableGoods = diposableGoodsManager.getDisposableGoodsByName(name, specification);
@@ -2522,7 +2532,7 @@
 			disposableGoods.setSpelling(GB2Alpha.string2Alpha(name));
 			disposableGoods.setWbCode(GB2WB.getWBCode(name));
 			objectDao.save(disposableGoods);// 必须先保存
-			goodsMap.put(diposableGoodsKey, disposableGoods);
+			goodsMap.put(disposableGoodsKey, disposableGoods);
 		}
 		
 		if (StringUtils.isNotBlank(type)) {
@@ -2572,6 +2582,9 @@
 		godownEntryItem.setProducingArea(producingArea);
 		godownEntryItem.setManufacturer(manufacturer);
 		godownEntryItem.setDisposableGoodsID(disposableGoods.getId());
+		godownEntryItem.setHasBiologicalTestReport(hasBiologicalTestReport);
+		godownEntryItem.setHasInvoice(hasInvoice);
+		godownEntryItem.setGrade(grade);
 		godownEntryItem.setGodownEntry(godownEntry);// 和入库/退库单关联
 		return godownEntryItem;
 	}