Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/slickWash.js
===================================================================
diff -u -r24867 -r24884
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/slickWash.js	(.../slickWash.js)	(revision 24867)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/slickWash.js	(.../slickWash.js)	(revision 24884)
@@ -7,7 +7,7 @@
 			sortable: true,
 			minWidth: 100,
 			formatter: function(value, row, index, columnDef, dataContext){
-				var alink = '<a  class="mainFont" data-toggle="modal" data-target="#updateModal" onclick="UpdateCleanList(';
+				var alink = '<a  class="mainFont"  data-toggle="modal" data-target="#updateModal" onclick="UpdateCleanList(';
 				alink += dataContext.id + ',\'' + dataContext.serialNumber + '\'';
 				alink += ",\'" + dataContext.disinfectIdentification + "\',";
 				alink += "\'" + dataContext.disinfectProgram + "\',";
@@ -117,6 +117,7 @@
 		enableColumnReorder: false,
 		forceFitColumns: true,
 		editable: true,
+		rowHeight:35,
 		enableAddRow: false,
 		asyncEditorLoading: true,
 		topPanelHeight: 25,
@@ -571,10 +572,38 @@
 		attachAutoResizeDataGrid(addCleanBasketgrid, "addCleanBasketGrid", "addCleanBasketContainer");
 		
 	}
+	//添加清洗扫描条码是否重复的判断
+	function addCleanCodeVerification(){
+		var VCode = $("#addCleanGetCode").val();
+		var adArr = $("#addCleanGetCodeArr").val();
+		var res = {
+			state:"true",
+			mess:""
+		};
+		if(adArr==""){
+			return res;
+		}
+		var hiCode = eval(adArr);
+		for(var i=0;i<hiCode.length;i++){
+			if(hiCode[i].barcode==VCode){
+				res.state = "false";
+				res.mess="不能扫描重复条码";
+			}
+			else{
+			}
+		}
+		return res;
+	}
 	//清洗篮筐扫描条码
 	$("#addCleanGetCode").keyup(function(e){
 			if(e.which == 13){
 				var BasketData=[];
+				var ifGetCode ={}; 
+				ifGetCode = addCleanCodeVerification();
+				if(ifGetCode.state=="false"){
+					window.alert(ifGetCode.mess);
+					return 0;
+				}
 				grid = {};
 				if($("#addCleanGetCodeArr").val()==""){
 					BasketData = [];
@@ -626,7 +655,7 @@
 		}
 		addCleanBaskets(newData);
 		$("#addCleanGetCodeArr").val(JSON.stringify(newData));
-		addCleanAfterAjax();
+		//addCleanAfterAjax();
 	}
 	//清洗篮筐的保存
 	$("#addCleanRefer").click(function(){
@@ -747,7 +776,7 @@
 		$('#addCleanStartDateStr').datetimepicker('setStartDate', today);
 		$('#addCleanOrgWashEndTime').datetimepicker('setStartDate', today);
 		$(".bottomContain").css("top",pagePositionHeight()-40);
-		 
+		$("#addCleanGetCode").focus(); 
 });
 
 	$('#addModal').on('hidden.bs.modal', function (){