Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/Marge120CSVDataManagerImpl.java
===================================================================
diff -u -r36848 -r36864
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/Marge120CSVDataManagerImpl.java	(.../Marge120CSVDataManagerImpl.java)	(revision 36848)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/Marge120CSVDataManagerImpl.java	(.../Marge120CSVDataManagerImpl.java)	(revision 36864)
@@ -117,7 +117,7 @@
 			}else{
 				rootURL = "//"+ip+"/" + directory + "/";
 				backUp = rootURL + "backUp/";
-				SmbShare share = new SmbShare("smb://" + ip +"/"+ directory +"/");
+				SmbShare share = new SmbShare("smb://" + userName +":"+ pwd +"@"+ ip +"/"+ directory +"/");
 				session=new SmbSession(share);
 				if(!session.exists(backUp)){
 					session.mkdir(backUp);
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/service/RinserManagerImpl.java
===================================================================
diff -u -r36848 -r36864
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/service/RinserManagerImpl.java	(.../RinserManagerImpl.java)	(revision 36848)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/service/RinserManagerImpl.java	(.../RinserManagerImpl.java)	(revision 36864)
@@ -167,6 +167,9 @@
 						&& StringUtils.equals(di.getDeviceModel(), DeviceInterface.MARGE_MODEL_120_CSV)){
 					//雅洁清洗机MAG-120的接口文件不包含机器号，不同清洗机的清洗文件必须放在不同文件夹中，并通过不同的设备接口关联SZLGEY-13
 					String countRinserSql = "select count(1) from Rinser where deviceInterface_id = "+deviceInterfaceId;
+					if(StringUtils.isNotBlank(rinser.getMachineNumber())){
+						countRinserSql += String.format(" and machineNumber = '%s' ", rinser.getMachineNumber());
+					}
 					if(DatabaseUtil.isPoIdValid(rinser.getId())){
 						countRinserSql += " and id <> " + rinser.getId();
 					}