Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
===================================================================
diff -u -r13497 -r13631
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 13497)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 13631)
@@ -2439,9 +2439,15 @@
 		Date expDate = null;
 		String expDateStr = ParerUtils.getCellFormatValue(row, 12);
 		if (StringUtils.isNotBlank(expDateStr)) {
+			expDateStr = expDateStr.trim();
+			if(expDateStr.length() != Constants.SIMPLEDATEFORMAT_YYYYMMDD.toPattern().length()){
+				throw new ImportDataException("第" + currentRowNum
+						+ "行产品有效期日期格式必须为yyyy-MM-dd！");
+			}
 			try {
 				expDate = Constants.SIMPLEDATEFORMAT_YYYYMMDD.parse(expDateStr);
 			} catch (ParseException e) {
+				System.out.println(e);
 			}
 		}
 		if (expDate == null) {
@@ -2460,18 +2466,18 @@
 			throw new ImportDataException("第" + currentRowNum + "行物品标识号不能为空！");
 		}
 		// 入库日期
-		Date entryDate = null;
-		String entryDateStr = ParerUtils.getCellFormatValue(row, 17);
-		if (StringUtils.isNotBlank(entryDateStr)) {
-			try {
-				entryDate = Constants.SIMPLEDATEFORMAT_YYYYMMDD.parse(entryDateStr);
-			} catch (ParseException e) {
-			}
-		}
-		if (entryDate == null) {
-			throw new ImportDataException("第" + currentRowNum
-					+ "行物品入库时间日期格式必须为yyyy-MM-dd！");
-		}
+//		Date entryDate = null;
+//		String entryDateStr = ParerUtils.getCellFormatValue(row, 17);
+//		if (StringUtils.isNotBlank(entryDateStr)) {
+//			try {
+//				entryDate = Constants.SIMPLEDATEFORMAT_YYYYMMDD.parse(entryDateStr);
+//			} catch (ParseException e) {
+//			}
+//		}
+//		if (entryDate == null) {
+//			throw new ImportDataException("第" + currentRowNum
+//					+ "行物品入库时间日期格式必须为yyyy-MM-dd！");
+//		}
 		// 价格
 		String costStr = ParerUtils.getCellFormatValue(row, 18);
 		Double price = null;