Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
===================================================================
diff -u -r15221 -r15225
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 15221)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 15225)
@@ -146,13 +146,6 @@
 		barcode = top.Ext.getCmp('inputText').getValue();
 		top.Ext.getCmp('inputText').setValue("");
 	}
-	if((sstsConfig.hasOwnProperty('haveRinserPosition')) && sstsConfig.haveRinserPosition){
-		var position = top.Ext.getCmp('position').getValue();
-		if(position == null || position == ''){
-			showResult("请先扫描位置");
-			return;
-		}
-	}
 	var root = top.Ext.getCmp('basketTreePanel').root;
 	var node = root.findChild('barcode', barcode);
 	if (node) {
@@ -738,7 +731,7 @@
 													var result = Ext.util.JSON.decode(jsonStr);
 													if(result !=null && result !=""){
 														if(result.returnType == 'container'){
-															loadMaterial(barcode,removePendingWashAndDisinfectGoods(barcode));
+															addPendingWashAndDisinfectBasketToRecord(barcode);
 														}else if(result.returnType == 'rinser'){
 															loadWashMachineByBarcode(barcode);
 														}else if(result.returnType == 'cleanmethod'){
@@ -1192,6 +1185,13 @@
 	}
 }
 function addPendingWashAndDisinfectBasketToRecord(barcode){
+	if((sstsConfig.hasOwnProperty('haveRinserPosition')) && sstsConfig.haveRinserPosition){
+		var position = top.Ext.getCmp('position').getValue();
+		if(position == null || position == ''){
+			showResult("请先扫描位置");
+			return;
+		}
+	}
 	loadMaterial(barcode,removePendingWashAndDisinfectGoods(barcode));
 }
 // callback