Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
===================================================================
diff -u -r15226 -r15227
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 15226)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 15227)
@@ -1186,11 +1186,13 @@
 	}
 }
 function addPendingWashAndDisinfectBasketToRecord(barcode){
-	if((sstsConfig.hasOwnProperty('haveRinserPosition')) && sstsConfig.haveRinserPosition){
-		var position = top.Ext.getCmp('position').getValue();
-		if(position == null || position == ''){
-			showResult("请先扫描位置");
-			return;
+	if(sstsConfig.hasOwnProperty('wrRecordScanPosition') && sstsConfig.wrRecordScanPosition){
+		if((sstsConfig.hasOwnProperty('haveRinserPosition')) && sstsConfig.haveRinserPosition){
+			var position = top.Ext.getCmp('position').getValue();
+			if(position == null || position == ''){
+				showResult("请先扫描位置");
+				return;
+			}
 		}
 	}
 	loadMaterial(barcode,removePendingWashAndDisinfectGoods(barcode));
Index: ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js
===================================================================
diff -u -r15219 -r15227
--- ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js	(.../config.js)	(revision 15219)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js	(.../config.js)	(revision 15227)
@@ -57,5 +57,7 @@
   //回收界面，标识牌通知方式:1弹出提示框,2语音播报,3提示框和语音,其他值无操作
   idCardUseAmountNoticeType:1,
   //清洗机是否有位置
-  haveRinserPosition : true
+  haveRinserPosition : true,
+  //清洗记录是否强制扫描位置
+  wrRecordScanPosition : false
 }
\ No newline at end of file