Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
===================================================================
diff -u -r15717 -r15754
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 15717)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 15754)
@@ -350,14 +350,13 @@
 	top.Ext.getCmp('materialName').setValue('');
 	top.Ext.getCmp('materialAmount').setValue('');
 
+	var containerName = top.Ext.getCmp("showBasketNameField").getText();
+	var containerBarcode = top.Ext.getCmp("containerBarcode").getValue();
 	var index = materialStore.findBy(function(record,id){
-		if(record.get('name') == materialName) {
+		if(record.get('name') == materialName && record.get('containerBarcode') == containerBarcode) {
 			return true;
 		}
 	});
-	
-	var containerName = top.Ext.getCmp("showBasketNameField").getText();
-	var containerBarcode = top.Ext.getCmp("containerBarcode").getValue();
 	if (index == -1) {
 		var material = new materialRecord({
 			id : 0,
Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r15751 -r15754
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 15751)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 15754)
@@ -190,11 +190,10 @@
 		}
 		
 		setClassifyBasketInfo(washRecord, classifyBasketInfoMap,rinser, isNewRecord,toDeleteBasketMap);
-		
-		//设置清洗记录工作量
-		setWashRecordWorkLoadInfo(washRecord);
 		//清洗器械
 		setWashMaterials(washRecord,materials,rinser, isNewRecord);
+		//设置清洗记录工作量
+		setWashRecordWorkLoadInfo(washRecord);
 		
 		objectDao.saveOrUpdate(washRecord);