Index: ssts-web/src/main/webapp/disinfectsystem/equipmentInspection/forminstanceForm.js
===================================================================
diff -u -r41069 -r41070
--- ssts-web/src/main/webapp/disinfectsystem/equipmentInspection/forminstanceForm.js	(.../forminstanceForm.js)	(revision 41069)
+++ ssts-web/src/main/webapp/disinfectsystem/equipmentInspection/forminstanceForm.js	(.../forminstanceForm.js)	(revision 41070)
@@ -261,7 +261,7 @@
 /**
  * 根据value选中设备并触发选中事件
  */
-function setComboSelectedByValue(id, type) {
+function setComboSelectedByValue(id, type){
 	Ext.Ajax.request({
 		url: WWWROOT + '/disinfectSystem/equipmentInspectionDefAction!loadEquipmentInspectionDefByEquipment.do',
 		params: { equipmentId: id, type: type },
@@ -281,23 +281,30 @@
 }
 
 /**
- * 根据条码选中某个设备(通常来自嵌入端,比如android)
- * @param barcode 设备条码
+ * 选中某个设备(通常来自嵌入端,比如android)
+ * @param deviceType 设备类型
+ * @param deviceId 设备id
+ * @param deviceName 设备名称
  */
-function setDeviceSelected(barcode) {
-	Ext.Ajax.request({
-		url: WWWROOT + '/disinfectSystem/equipmentInspectionDefAction!loadEquipmentInspectionDefDeviceInfo.do',
-		params: { barcode: barcode },
-		success: function (response, options) {
-			var result = Ext.decode(response.responseText);
-			if(result.data && result.data.length >= 1){
-				var record = result.data[0];
-				Ext.getCmp("equipmentName").setValue(record.name);
-				Ext.getCmp("equipmentID").setValue(record.id);
-				Ext.getCmp("equipmentType").setValue(record.type);
-				setComboSelectedByValue(record.id, record.type);
-			}else {
-				showResult('设备不存在，请重新扫描！');
+function setDeviceSelected(deviceType, deviceId, deviceName){
+	/*deviceInfoStore.load(function(records, operation, success){
+		
+	});*/
+	deviceInfoStore.load({
+		params: {
+			
+		},
+		callback: function (records, operation, success) {
+			if (records.length && records.length >= 1) {
+				for(var i = 0;i < records.length;i++){
+					var record = records[i];
+					if(deviceType == record.data.type && deviceId == record.data.id){
+						Ext.getCmp("equipmentName").setValue(deviceName);
+						Ext.getCmp("equipmentID").setValue(deviceId);
+						Ext.getCmp("equipmentType").setValue(deviceType);
+						setComboSelectedByValue(deviceId, deviceType);
+					}
+				}
 			}
 		}
 	});
Index: ssts-web/src/main/webapp/disinfectsystem/equipmentInspection/forminstanceForm.jsp
===================================================================
diff -u -r41067 -r41070
--- ssts-web/src/main/webapp/disinfectsystem/equipmentInspection/forminstanceForm.jsp	(.../forminstanceForm.jsp)	(revision 41067)
+++ ssts-web/src/main/webapp/disinfectsystem/equipmentInspection/forminstanceForm.jsp	(.../forminstanceForm.jsp)	(revision 41070)
@@ -47,6 +47,7 @@
 	function loadPage(){
 		//selectDevice('清洗机', 16271, '手工清洗');
 		try{
+			//speakContentThrouhtAndroid("关闭窗口");
 			if(Android){
 				Android.loadPage();
 			}
@@ -59,7 +60,7 @@
 	 * 接收到设备条码(通常来自嵌入端,比如android)
 	 */
 	function receiveScannedDeviceBarcode(barcode){
-		setDeviceSelected(barcode);
+		
 	}
 	
 	//Android.callAndroid("hello android安卓您好吗,我是js");