Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r12648 -r12872
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 12648)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 12872)
@@ -171,6 +171,7 @@
     $('#deleted'+row).val('1');
    	var tousseName = $('#tousseName'+row).val();
    	var amountLeft = parseInt($('#loadedAmount'+row).val(),10);
+   	var tousseDefinitionID = parseInt($('#tousseDefinitionID'+row).val(),10);
    	var idCardBarcode = '';
    	var tousse = {
    			basketBarcode: '',
@@ -181,7 +182,8 @@
    			tousseAmountForMaterial: -amountLeft,
    			itemType: "器械包",
    			tousseNameForMaterial: '',
-   			idCardBarcode: ''	
+   			idCardBarcode: '',
+   			tousseDefinitionID: tousseDefinitionID
    	}
    	addOrDelTousse(tousse);
    	//移除篮筐内物品
@@ -325,6 +327,7 @@
 	   			basketId: basketId,
 	   			classifiedItemId: '',
 	   			tousseName: name,
+	   			tousseDefinitionID: item.tousseDefinitionID,
 	   			amount: -parseInt(amount),
 	   			tousseAmountForMaterial: -parseInt(tousseAmountForMaterial),
 	   			itemType: type,
@@ -518,7 +521,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,idCardBarcode);
+		var json = getBasketItemJSON(ci_id,type,orgUnitName,tousseName,materialName,amount,tousseAmount,usebasketAmount,basketGroupNum,idCardBarcode,tousseDefinitionID);
 		basketElement.prepend($(element));
 		basketElement.find("input:first").val(json);
 	}
@@ -1056,7 +1059,7 @@
 	return JSON.stringify(json);
 }
 
-function getBasketItemJSON(ci_id,type,orgUnitName,tousseName,materialName,amount,tousseAmount,usebasketAmount,basketGroupNum,idCardBarcode){
+function getBasketItemJSON(ci_id,type,orgUnitName,tousseName,materialName,amount,tousseAmount,usebasketAmount,basketGroupNum,idCardBarcode,tousseDefinitionID){
 	var json = {};
 	json.classifiedItemId = ci_id;
 	json.type = type;
@@ -1068,6 +1071,7 @@
 	json.usebasketAmount = usebasketAmount;
 	json.basketGroupNum = basketGroupNum;
 	json.idCardBarcode = idCardBarcode;
+	json.tousseDefinitionID = tousseDefinitionID;
 	return JSON.stringify(json);
 }
 
@@ -1972,7 +1976,7 @@
       						row: row,
       						tousseItemId: tousseItem.id,
       						tousseName: tousseItem.tousseName,
-      						tousseDefinitionID: item.tousseDefinitionId,
+      						tousseDefinitionID: tousseItem.tousseDefinitionId,
       						applicationAmount: applyAmount,
       						recycleAmount: tousseItem.amount,
       						loadedAmount: tousseItem.amount,
@@ -2097,7 +2101,7 @@
                             	element += '<dd class="del"><a href="javascript:void(0);" class="btn" onclick="deleteBasketItem(this,true);">删除</a></dd>';
                            
                             $('dl[class="sed clearfix"]:eq(0)').prepend(element);
-                            var json = getBasketItemJSON(ci.id,'材料',ci.orgUnitName,tousseNameForMaterial,materialName,ci.amount,ci.tousseAmountForMaterial,basket.groupBasketAmount,basket.basketGroupNum,ci.idCardBarcode);
+                            var json = getBasketItemJSON(ci.id,'材料',ci.orgUnitName,tousseNameForMaterial,materialName,ci.amount,ci.tousseAmountForMaterial,basket.groupBasketAmount,basket.basketGroupNum,ci.idCardBarcode,ci.tousseDefinitionID);
                             $('dl[class="sed clearfix"]:eq(0)').find("input:first").val(json);
                             
                             $('td[axis="materialName"]').each(function(){
@@ -2119,7 +2123,7 @@
                             	element += '<dd class="del"><a href="javascript:void(0);" class="btn" onclick="deleteBasketItem(this,true);">删除</a></dd>';
                             $('dl[class="sed clearfix"]:eq(0)').prepend(element);
                             
-                            var json = getBasketItemJSON(ci.id,ci.itemType,ci.orgUnitName,ci.tousseDefinition.name,"",ci.amount,ci.tousseAmountForMaterial,basket.groupBasketAmount,basket.basketGroupNum,ci.idCardBarcode);
+                            var json = getBasketItemJSON(ci.id,ci.itemType,ci.orgUnitName,ci.tousseDefinition.name,"",ci.amount,ci.tousseAmountForMaterial,basket.groupBasketAmount,basket.basketGroupNum,ci.idCardBarcode,ci.tousseDefinitionID);
                             $('dl[class="sed clearfix"]:eq(0)').find("input:first").val(json);
                         }
                     }