Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
===================================================================
diff -u -r12607 -r12875
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp	(.../expressRecycleForTouchScreen.jsp)	(revision 12607)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp	(.../expressRecycleForTouchScreen.jsp)	(revision 12875)
@@ -552,7 +552,7 @@
 	return JSON.stringify(json);
 }
 
-function getBasketItemJSON(ci_id,type,orgUnitName,tousseName,materialName,amount,tousseAmount,usebasketAmount,basketGroupNum,app_id){
+function getBasketItemJSON(ci_id,type,orgUnitName,tousseName,materialName,amount,tousseAmount,usebasketAmount,basketGroupNum,app_id,tousseDefinitionID){
 	var json = {};
 	json.classifiedItemId = ci_id;
 	json.type = type;
@@ -564,11 +564,12 @@
 	json.usebasketAmount = usebasketAmount;
 	json.basketGroupNum = basketGroupNum;
 	json.app_id = app_id;
+	json.tousseDefinitionID = tousseDefinitionID;
 	return JSON.stringify(json);
 }
 
 //创建物品入筐
-function addBasketItemElement(ci_id,type,orgUnitName,tousseName,materialName,showName,amount,tousseAmount,usebasketAmount,basketGroupNum,basketBarcode,app_id){
+function addBasketItemElement(ci_id,type,orgUnitName,tousseName,materialName,showName,amount,tousseAmount,usebasketAmount,basketGroupNum,basketBarcode,app_id,tousseDefinitionID){
 	var isExist = false;
 	var basketElement = $('dl[class="sed clearfix"]:eq(0)');
 	var basketHidenValue =  $("#basketsUl li:first").find('input').val();
@@ -596,7 +597,7 @@
 		element += '<dd class="num">' + amount + '</dd>';
 		element += '<dd class="del"><a href="javascript:void(0);" class="btn" onclick="deleteBasketItem(this,true);">删除</a></dd>';
 	
-	var json = getBasketItemJSON(ci_id,type,orgUnitName,tousseName,materialName,amount,tousseAmount,usebasketAmount,basketGroupNum,app_id);
+	var json = getBasketItemJSON(ci_id,type,orgUnitName,tousseName,materialName,amount,tousseAmount,usebasketAmount,basketGroupNum,app_id,tousseDefinitionID);
 	basketElement.prepend($(element));
 	basketElement.find("input:first").val(json);
 }
@@ -607,6 +608,7 @@
         var tousseName = $('#tousseName'+row).val();
         var showTousseName = $('#showTousseName'+row).val();
         var isCleanedEntirely = $('#isCleanedEntirely'+row).val();
+        var tousseDefinitionID = $('#tousseDefinitionID'+row).val();
         var amount = parseInt($('#recycleAmount'+row).val(),10) - parseInt($('#loadedAmount'+row).val(),10);
        	var app_id = $('#applicationId'+row).val();
        	
@@ -653,7 +655,7 @@
                         return false;
                     }
        			}
-               	addBasketItemElement("",'器械包',orgUnitName,tousseName,"",tousseName,amount,amount,"","","",app_id);
+               	addBasketItemElement("",'器械包',orgUnitName,tousseName,"",tousseName,amount,amount,"","","",app_id,tousseDefinitionID);
                	$('#loadedAmount'+row).val(parseInt(amount,10)+parseInt($('#loadedAmount'+row).val(),10));
                	if(parseInt($('#loadedAmount'+row).val(),10) == parseInt($('#recycleAmount'+row).val(),10)){
                     document.getElementById('showTousseName' + row).className = 'input-a-yellow';
@@ -683,7 +685,7 @@
 	        	    var orgUnitName = $('#depart').val();
 	        		for(var i = 0;i < jsonArray.length;i++){
 	        			var item = jsonArray[i];
-	        			addBasketItemElement("",'材料',orgUnitName,tousseName,item.materialName,item.materialName,(item.materialAmount*amount),amount,item.usebasketAmount,item.basketGroupNum,item.basketBarcode,app_id);
+	        			addBasketItemElement("",'材料',orgUnitName,tousseName,item.materialName,item.materialName,(item.materialAmount*amount),amount,item.usebasketAmount,item.basketGroupNum,item.basketBarcode,app_id,tousseDefinitionID);
 	        		}
 	        		$('#loadedAmount'+row).val(parseInt(amount,10)+parseInt($('#loadedAmount'+row).val(),10));
 	        		if(parseInt($('#loadedAmount'+row).val(),10) == parseInt($('#recycleAmount'+row).val(),10)){
@@ -703,7 +705,7 @@
     
 }
 
-function addToussItem(row,tousseItemId,tousseName,applicationAmount,recycleAmount,loadedAmount,isApplyEntireTousse,isCleanedEntirely,tousseType,isThereIdentificationCard,depart,applicationId){
+function addToussItem(row,tousseItemId,tousseName,applicationAmount,recycleAmount,loadedAmount,isApplyEntireTousse,isCleanedEntirely,tousseType,isThereIdentificationCard,depart,applicationId,tousseDefinitionID){
      var showTousseName = tousseName;
      var _index = tousseName.indexOf('_');
      if (_index >= 0){
@@ -725,6 +727,7 @@
      
      var trElement = $('<tr id="tousseItemsTr'+row+'"><td width="210px" style="font-size: 25px;"><input type="hidden" id="isCleanedEntirely'+row+'" name="isCleanedEntirely'+row+'" value="'+isCleanedEntirely+'"/>'+
                '<input type="hidden" id="tousseItemId'+row+'" name="tousseItemId'+row+'" value="'+tousseItemId+'"/>'+
+               '<input type="hidden" id="tousseDefinitionID'+row+'" name="tousseDefinitionID'+row+'" value="'+tousseDefinitionID+'"/>'+
                '<input type="hidden" id="tousseType'+row+'" name="tousseType'+row+'" value="'+tousseType+'"/>'+
                '<input type="hidden" id="isThereIdentificationCard'+row+'" name="isThereIdentificationCard'+row+'" value="'+isThereIdentificationCard+'"/>'+
                '<input type="hidden" id="barcodes'+row+'" name="barcodes'+row+'" value=""/>'+
@@ -841,6 +844,7 @@
 	 					 obj.itemType = json.type;
 	 					 obj.tousseNameForMaterial = json.tousseName;
 	 					 obj.tousseAmountForMaterial = json.tousseAmount;
+	 					 obj.tousseDefinitionID = json.tousseDefinitionID;
 	 					 addItem(array,json.app_id,obj);
            			}
                 });
@@ -1013,7 +1017,7 @@
 				addToussItem(i, '', msg[i].tousseName,
 						msg[i].amount, recycleAmount, '',msg[i].isApplyEntireTousse, msg[i].isCleanedEntirely,
 						msg[i].tousseType, '否', msg[i].depart,
-						msg[i].applicationId);
+						msg[i].applicationId,msg[i].tousseDefinitionID);
 			}
 		},
 		error : function() {