Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/ChangLongDataManagerImpl.java
===================================================================
diff -u -r40601 -r40605
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/ChangLongDataManagerImpl.java	(.../ChangLongDataManagerImpl.java)	(revision 40601)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/ChangLongDataManagerImpl.java	(.../ChangLongDataManagerImpl.java)	(revision 40605)
@@ -23,6 +23,7 @@
 import org.apache.commons.net.ftp.FTPFile;
 import org.apache.commons.net.ftp.FTPFileFilter;
 import org.apache.log4j.Logger;
+import org.hibernate.NonUniqueResultException;
 import org.hibernate.Query;
 import org.hibernate.Session;
 import org.springframework.integration.smb.session.SmbSession;
@@ -304,13 +305,13 @@
 	/**
 	 * 长龙清洗机数据处理
 	 */
-	public String washDataReadAndSave(SmbFile remoteFile,DeviceInterface deviceInterface, boolean enableDetailedDeviceInformation, LoginUserData loginUserData) throws IOException{
+	public String washDataReadAndSave(SmbFile remoteFile,DeviceInterface deviceInterface, boolean enableDetailedDeviceInformation, LoginUserData loginUserData){
 		BufferedReader br = null;
+		String cycleCounter = "";
 		try{
 			br = new BufferedReader(new InputStreamReader(
 					new SmbFileInputStream(remoteFile)));
 			String machineNumber = getMachineNo(remoteFile.getName());
-			String cycleCounter = null;
 			String line = null;
 			boolean isFirstLine = false;
 			boolean fileError = false;
@@ -370,19 +371,23 @@
 				}
 				objectDao.saveOrUpdate(washData);
 			}
-			return cycleCounter;
-		} catch (ParseException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+			
+		} catch (NonUniqueResultException | ParseException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
 			if(enableDetailedDeviceInformation){
 				appLogManager.saveLog(loginUserData, Log.MODEL_DEVICE_INTERFACE, Log.TYPE_ADD, "设备接口文件处理中,解析参数错误," + e.getMessage());	
 			}
-			return null;
+		}catch (Exception e){
+			if(enableDetailedDeviceInformation){
+				appLogManager.saveLog(loginUserData, Log.MODEL_DEVICE_INTERFACE, Log.TYPE_ADD, "设备接口文件处理中,解析参数错误," + e.getMessage());	
+			}
 		}finally{
 			try {
 				br.close();
 			} catch (IOException e) {
 				e.printStackTrace();
 			}
 		}
+		return cycleCounter;
 	}
 	
 	private boolean readWashDataItemInfo(WashDataOfChangLong washData,