Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
===================================================================
diff -u -r27454 -r27458
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp	(.../expressRecycleForTouchScreen.jsp)	(revision 27454)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp	(.../expressRecycleForTouchScreen.jsp)	(revision 27458)
@@ -789,30 +789,76 @@
 }
 //一键入筐
 function allInputBasket(){
-	var index = layer.load(0, {
+	var index = layer.load(1, {
 		content: '入筐中,请稍后...',
 		shade: [0.6,'#fff'], //0.1透明度的白色背景
 		success: function (layero) {
 			layero.find('.layui-layer-content').css({
-				'padding-top': '39px',
-				'width': '350px',
+				'width': '300px',
 				"font-weight":"bold",
-				"font-size":"30px"
+				"font-size":"26px",
+				"text-align": "center",
+				"line-height": "37px"
 			});
 		}
 	});
 
 	setTimeout(function(){
-		$('#tousseItemTable .btn-a').each(function(row,element){
-			var amount = parseInt($('#recycleAmount'+row).val(),10) - parseInt($('#loadedAmount'+row).val(),10);
-			if(amount > 0 && $(this).is(":visible")){	
-				$(this).click();
+		var length = $('#tousseItemTable').find('tbody tr').length;
+		var amountArray = [];
+
+		for(var i=0,k=0;i<length;i++){
+			var that = $('#tousseItemsTr'+i).find('td').find('a');
+			var amount = parseInt($('#recycleAmount'+i).val(),10) - parseInt($('#loadedAmount'+i).val(),10);
+			var tousseName = $('#tousseName'+i).val();
+			var showTousseName = $('#showTousseName'+i).val();
+			var isCleanedEntirely = $('#isCleanedEntirely'+i).val();
+			var tousseDefinitionID = $('#tousseDefinitionID'+i).val();
+			var app_id = $('#applicationId'+i).val();
+			var invoicePlanVersion = $('#invoicePlanVersion'+i).val();
+			var orgUnitName =  $('#depart').val();
+
+			if(amount > 0 && that.is(":visible")){	
+				if(amount <= 9999){
+					amountArray[k] = {
+						amount:amount,
+						tousseName:tousseName,
+						showTousseName:showTousseName,
+						isCleanedEntirely:isCleanedEntirely,
+						tousseDefinitionID:tousseDefinitionID,
+						app_id:app_id,
+						invoicePlanVersion:invoicePlanVersion,
+						orgUnitName:orgUnitName || '',
+						index:i
+					};
+					k++
+				}
 			}
-		});		
+		}
+
+		if($('#basketsUl').children().length > 0){
+			if(amountArray.length == 0){
+				alertDiv('没有可以放入篮筐的器械包。');
+			}else{
+				putTousseInTheBasketAll(amountArray);
+			}
+		}else {
+			alertDiv('请先扫描篮筐条码。');
+		}
+
 		layer.close(index);
 	},100);
 }
 
+//批量将器械包放入篮筐中
+function putTousseInTheBasketAll(amountArray){
+	if($('#basketsUl').children().length > 0){
+		tousseIntoBasketFunctionAll(amountArray);
+	}else {
+		lertDiv('请先扫描篮筐条码。');
+	}
+}
+
 //将器械包放入篮筐中
 function putTousseInTheBasket(row){
     if($('#basketsUl').children().length > 0){
@@ -849,7 +895,7 @@
         	return false;
         }
         
-        var orgUnitName =  $('#depart').val();
+		var orgUnitName =  $('#depart').val();
         if(amount == 0){
             alertDiv('没有可以放入篮筐的器械包。');
         }else{
@@ -941,12 +987,6 @@
                '</tr>');
     $("#tousseItemTable").append(trElement);
     
-    /* var groupId = $("#inputselect").val();
-    var isShow = isShowTousseItem(groupId,departGroupId,tousseGroupId);
-    if(!isShow){
-    	$('#tousseItemsTr' + row).hide();
-    } */
-    
     return true;
 }
 
@@ -1114,12 +1154,64 @@
 	return basketJsonArray;
 }
 
+function tousseIntoBasketFunctionAll(amountArray){
+	var loadedAmount = 0;
+	DWREngine.setAsync(false);
+	var newArr = [];
+	for(var i=0;i<amountArray.length;i++){
+		newArr[i] = {
+			tousseDefinitionId:amountArray[i].tousseDefinitionID,
+			amount:amountArray[i].amount,
+			params:getScanedGoods(amountArray[i].isCleanedEntirely),
+			recyclingApplicationId:amountArray[i].app_id
+		}
+	}
+
+    RecyclingRecordTableManager.getTousseIntoBasketAmounts(JSON.stringify(newArr),function(result){
+		var jsonObj = JSON.parse(result);
+		
+		if(jsonObj.success){
+			var total = parseInt($('#basketsUl').find('li').find('font.totalnum').html());
+
+			for(var i=0;i<jsonObj.data.length;i++){
+				var data = jsonObj.data[i].data;
+				if(jsonObj.data[i].success){
+					if(data.isCleanedEntirely == '否'){
+						var materials = data.materials;
+						for(var i = 0;i < materials.length;i++){
+							var item = materials[i];
+							var invoicePlanVersion = amountArray[i].invoicePlanVersion;
+							addBasketItemElement("",'材料',orgUnitName,data.tousseName,item.materialName,item.materialName,item.materialAmount,data.amount,item.basketBarcode,amountArray[0].app_id,data.tousseDefinitionID,item.basketGroupBarcodes,item.putBasketMaxAmount,invoicePlanVersion);
+						}
+					}else {
+						addBasketItemElement("",'器械包','',data.tousseName,"",data.tousseName,data.amount,data.amount,"",amountArray[i].app_id,data.tousseDefinitionID,"",data.putBasketMaxAmount,'');
+					}
+
+					if(data.amount > 0){
+						$('#loadedAmount'+ amountArray[i].index).val(parseInt(data.amount,10)+parseInt($('#loadedAmount'+amountArray[i].index).val(),10));
+						if(parseInt($('#loadedAmount'+amountArray[i].index).val(),10) == parseInt($('#recycleAmount'+amountArray[i].index).val(),10)){
+							document.getElementById('showTousseName' + amountArray[i].index).className = 'input-a-yellow';
+						}else{
+							document.getElementById('showTousseName' + amountArray[i].indexi).className = 'input-a-yellow3';
+						}
+
+						total += parseInt(data.amount);
+					}
+				}
+			}
+
+			$('#basketsUl').find('li').find('font.totalnum').html(total);
+		}
+    });
+    DWREngine.setAsync(true);
+}
+
 function tousseIntoBasketFunction(tousseDefinitionID,tousseName,recycleAmount,isCleanedEntirely,orgUnitName,app_id,invoicePlanVersion){
 	var params = getScanedGoods(isCleanedEntirely);
 	var loadedAmount = 0;
     DWREngine.setAsync(false);
     RecyclingRecordTableManager.getTousseIntoBasketAmount("",tousseDefinitionID,recycleAmount,"",JSON.stringify(params),"",app_id,function(result){
-    	var jsonObj = JSON.parse(result);
+		var jsonObj = JSON.parse(result);
     	loadedAmount = jsonObj.success;
     	
     	if(!jsonObj.success){
@@ -1234,15 +1326,16 @@
 	$("#tousseItemTable").empty();
     $("#basketsUl").empty();
 	document.onkeydown = showKeyDown;
-	var index = layer.load(0, {
+	var index = layer.load(1, {
 		content: '加载中,请稍后...',
-		shade: [0.5,'#fff'], //0.1透明度的白色背景
+		shade: [0.6,'#fff'], //0.1透明度的白色背景
 		success: function (layero) {
 			layero.find('.layui-layer-content').css({
-				'padding-top': '39px',
-				'width': '350px',
+				'width': '300px',
 				"font-weight":"bold",
-				"font-size":"26px"
+				"font-size":"26px",
+				"text-align": "center",
+				"line-height": "37px"
 			});
 		}
 	});