Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
===================================================================
diff -u -r18074 -r18077
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 18074)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 18077)
@@ -1512,6 +1512,7 @@
 			washingMachineStore.load();
 		}else{
 			top.Ext.getCmp('disinfectIdentification').setValue(setComBoVal);
+			DWREngine.setAsync(false);
 			WashAndDisinfectRecordTableManager.getDefaultWashMethodMsg(setComBoVal,function(responseText){
 				var result = top.Ext.decode(responseText);
 		        if(result.success){
@@ -1523,6 +1524,7 @@
 		        	top.Ext.getCmp('cleanParameter').setValue(result.cleanParameter);
 		        }
 			});
+			DWREngine.setAsync(true);
 			if(setComBoVal == "人工清洗"){
 				setFieldsHide(true);
 			}else{
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.jsp
===================================================================
diff -u -r16226 -r18077
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.jsp	(.../washForTouchScreen.jsp)	(revision 16226)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.jsp	(.../washForTouchScreen.jsp)	(revision 18077)
@@ -14,6 +14,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="apple-mobile-web-app-capable" content="yes" />
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
+
 <title>消毒供应中心质量追溯管理系统</title>
 <script src="${ctx}/disinfectsystem/touchScreen/recycle/alertDiv/CJL.0.1.min.js"></script>
 <script src="${ctx}/disinfectsystem/touchScreen/recycle/alertDiv/AlertBox.js"></script>
@@ -25,6 +26,7 @@
 <script type="text/javascript" src="${ctx}/disinfectsystem/touchScreen/recyclejs/message-box.js"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/touchScreen/recycle/layer/layer.min.js"></script>
 <script type="text/javascript" src="${ctx}/jquery/jquery-ui-1.10.2/js/jquery-ui-1.10.2.custom.js"></script>
+<script type="text/javascript" src="${ctx }/dwr/interface/WashAndDisinfectRecordTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/TousseDefinitionTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/RecyclingApplicationTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/RecyclingRecordTableManager.js"></script>
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js
===================================================================
diff -u -r15537 -r18077
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js	(.../washForTouchScreen.js)	(revision 15537)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js	(.../washForTouchScreen.js)	(revision 18077)
@@ -259,6 +259,18 @@
                     		var name = result.data.name;
                     		$("#disinfectIdentification").val(name);
                     		barcodeGloble = '';//清空后清除条码记忆的全局变量
+                    		DWREngine.setAsync(false);
+                    		WashAndDisinfectRecordTableManager.getDefaultWashMethodMsg(name,function(responseText){
+                				var result =  eval('(' + responseText + ')');;
+                		        if(result.success){
+                		        	// 清洗程序名称
+                		        	$("#disinfectProgram").val(result.disinfectProgram);
+                		        	// 清洗时间
+                		        	alert(result.cleanMethodBarcode);
+                		        	getWashStartDateTimeAndEndDateTime(result.cleanMethodBarcode);
+                		        }
+                			});
+                    		DWREngine.setAsync(true);
                     		currentUseRinserIncludeDisinfectPrograms = result.data.cleanMethods;
                     		isIncludeDisinfectProgram();
                     	}else if(type == "cleanMethod"){
Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
===================================================================
diff -u -r18068 -r18077
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java	(.../WashAndDisinfectRecordTableManager.java)	(revision 18068)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java	(.../WashAndDisinfectRecordTableManager.java)	(revision 18077)
@@ -155,9 +155,11 @@
 			obj.put("disinfectProgram", cleanMethod);
 			obj.put("cleanParameter", "");
 			obj.put("cleanMinutes", "");
+			obj.put("cleanMethodBarcode", "");
 			if(StringUtils.isNotBlank(cleanMethod)){
 				CleanMethod cm = cleanMethodManager.getCleanMethodByName(cleanMethod);
 				if(cm != null){
+					obj.put("cleanMethodBarcode", cm.getBarcode());
 					obj.put("cleanParameter", cm.getCleanParameter());
 					obj.put("cleanMinutes", cm.getCleanMinutes());
 				}