Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
===================================================================
diff -u -r15754 -r15763
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 15754)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 15763)
@@ -727,20 +727,36 @@
 											if(barcode!=null && barcode != ""){
 												BarcodeTableManager.getBarcodeTypeByBarcode(barcode,function(jsonStr){
 													var result = Ext.util.JSON.decode(jsonStr);
+													var scanedGoods = "";
 													if(result !=null && result !=""){
 														if(result.returnType == 'container'){
+															scanedGoods = "篮筐";
 															addPendingWashAndDisinfectBasketToRecord(barcode);
 														}else if(result.returnType == 'rinser'){
+															scanedGoods = "清洗机";
 															loadWashMachineByBarcode(barcode);
 														}else if(result.returnType == 'cleanmethod'){
+															scanedGoods = "清洗程序";
 															loadWashProgramByBarcode(barcode);
 														}else if(result.returnType == 'user'){
+															scanedGoods = "用户";
 															loadUserByBarcode(barcode);
 														}else if(result.returnType == 'position'){
+															scanedGoods = "位置";
 															loadPositionByBarcode(barcode);
-														}else{	
+														}else{
+															scanedGoods = "错误条码";
 															showResult(result.message);
 														}
+														
+														//日志
+														Ext.Ajax.request({
+											    			url :  WWWROOT + '/log/saveLog.do',
+											    			params : {model : '清洗模块',type : 'A',description : "PC清洗消毒扫描条码：" + barcode + ",条码类型：" + scanedGoods},
+											    			success : function(response, options) {
+											    				
+											    			}
+											    		});
 													}else{
 														showResult('找不到该条码所对应的信息！');
 													}
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r15539 -r15763
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 15539)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 15763)
@@ -235,6 +235,21 @@
    			}
    		});
    	});
+   	var depart = $('#depart').val();
+   	var recyclingTime = $('#recyclingTime').val();
+   	var applicationAmount = $('#applicationAmount'+row).val();
+   	var description = "ID=" + params_appId + ",科室[" + depart + "]的申请单在" + recyclingTime + "回收时删除[" + tousseName + "]" + applicationAmount + "个";
+   	//日志记录
+   	$.ajax({
+        type:'get',
+        url : WWWROOT + '/log/saveLog.do',
+        data:'model=' + encodeURI("回收模块") + '&type=D&description=' + encodeURI(description),
+        dataType:'text',
+        success:function(msg){
+        },
+        error:function(msg){
+        }
+    });
 }