Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
===================================================================
diff -u -r15743 -r15764
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 15743)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 15764)
@@ -1049,7 +1049,7 @@
 					maxStorage = Integer.parseInt(maxStorageStr);
 				} catch (Exception e) {
 					failureCount = appendFailureRowNumAndRecordFailureNum(
-							failureCount, sb, currentRowNum,7,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_IS_NOT_NUMBER);
+							failureCount, sb, currentRowNum,9,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_IS_NOT_NUMBER);
 					continue;
 				}
 			}
@@ -1100,8 +1100,22 @@
 			} else {
 				printInLabel = "是";
 			}
-						
+			// 申领单位
+			String middlePackageUnit = ParerUtils.getCellFormatValue(row, 14);
 
+			// 申领单位转换单位系数
+			Integer transferScale = null;
+			String transferScaleStr = ParerUtils.getCellFormatValue(row, 15);
+			if (StringUtils.isNotBlank(transferScaleStr)) {
+				try {
+					transferScale = Integer.parseInt(transferScaleStr);
+				} catch (Exception e) {
+					failureCount = appendFailureRowNumAndRecordFailureNum(
+							failureCount, sb, currentRowNum,15,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_IS_NOT_MONEY);
+					continue;
+				}
+			}
+
 			DisposableGoods diposableGoods = diposableGoodsManager
 					.getDisposableGoodsByName(name, specification);
 			if (diposableGoods == null) {
@@ -1128,6 +1142,8 @@
 			diposableGoods.setExternalCode(externalCode);
 			diposableGoods.setIsSupplyRoomGoods(isSupplyRoomGoods);
 			diposableGoods.setPrintInLabel(printInLabel);
+			diposableGoods.setMiddlePackageUnit(middlePackageUnit);
+			diposableGoods.setTransferScale(transferScale);
 			totalCount = saveOrUpdateAndClearCache(totalCount, diposableGoods);
 			successCount++;
 
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
===================================================================
diff -u -r15734 -r15764
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java	(.../DisposableGoods.java)	(revision 15734)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java	(.../DisposableGoods.java)	(revision 15764)
@@ -147,6 +147,8 @@
 		ColumnNameAndPoPropertyNameMap.put("能否被科室申请", "isApplicationMaterial");
 		ColumnNameAndPoPropertyNameMap.put("是否消毒中心物品", "isSupplyRoomGoods");
 		ColumnNameAndPoPropertyNameMap.put("是否打印标签", "printInLabel");
+		ColumnNameAndPoPropertyNameMap.put("申领单位", "middlePackageUnit");
+		ColumnNameAndPoPropertyNameMap.put("申领单位转换单位系数", "transferScale");
 	}
 
 	@Id
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataDemo.xls
===================================================================
diff -u -r15665 -r15764
Binary files differ