Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r27361 -r27393
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 27361)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 27393)
@@ -19,7 +19,7 @@
 	var tousseNameForMaterial = item.tousseNameForMaterial;
 	var idCardBarcode = item.idCardBarcode;
 	var basketGroupBarcodes = item.basketGroupBarcodes;
-	var lastTousseInsatnceId = item.lastTousseInsatnceId;
+	var lastTousseInstanceId = item.lastTousseInstanceId;
 	var tousseInstanceBarcode = item.tousseInstanceBarcode;
     var length = tousseArray.length;
     var sigle = true;
@@ -33,9 +33,10 @@
     	var t_idCardBarcode = tousseArray[i].idCardBarcode;
     	var t_amountForMaterial = tousseArray[i].tousseAmountForMaterial;
     	var t_basketGroupBarcodes = tousseArray[i].basketGroupBarcodes;
-		var t_lastTousseInsatnceId = tousseArray[i].lastTousseInsatnceId;
+		var t_lastTousseInstanceId = tousseArray[i].lastTousseInstanceId;
+		var t_tousseInstanceBarcode = tousseArray[i].tousseInstanceBarcode;
     	var t_itemType = tousseArray[i].itemType;
-    	if(t_basketBarcode == basketBarcode && itemType == t_itemType && t_tousseName == tousseName && t_tousseDefinitionID == item.tousseDefinitionID && t_idCardBarcode == idCardBarcode){
+    	if(t_basketBarcode == basketBarcode && itemType == t_itemType && t_tousseName == tousseName && t_tousseDefinitionID == item.tousseDefinitionID && t_idCardBarcode == idCardBarcode && t_tousseInstanceBarcode == tousseInstanceBarcode){
     		if(itemType == '材料' && (tousseNameForMaterial != t_tousseNameForMaterial || basketGroupBarcodes != t_basketGroupBarcodes)){
     			continue;
     		}
@@ -69,7 +70,7 @@
            			idCardBarcode: idCardBarcode,
            			basketGroupBarcodes: basketGroupBarcodes,
            			basketSequence: item.basketSequence,
-					lastTousseInsatnceId:lastTousseInsatnceId
+					lastTousseInstanceId:lastTousseInstanceId
            	};
         	tousseArray.push(newTousse);
     	}
@@ -567,7 +568,9 @@
    			itemType: item.type,
    			tousseNameForMaterial: item.tousseName,
    			idCardBarcode: item.idCardBarcode,
-   			basketGroupBarcodes:item.basketGroupBarcodes
+   			basketGroupBarcodes:item.basketGroupBarcodes,
+			lastTousseInstanceId:item.lastTousseInstanceId,
+			tousseInstanceBarcode:item.tousseInstanceBarcode
    	}
 	addOrDelTousse(tousse);
 	
@@ -635,6 +638,7 @@
 	var tousseNameForMaterial = "";
 	var type = item.type;
 	var idCardBarcode = item.idCardBarcode;
+	var tousseInstanceBarcode = item.tousseInstanceBarcode;
 	var basketGroupBarcodes = item.basketGroupBarcodes;
 	//删除材料所在包 内的 全部删除
 	if(type == "材料"){
@@ -650,7 +654,7 @@
 			           	var obj = JSON.parse(hideValue);
 			           	if(obj.type == '材料' && obj.tousseDefinitionID == item.tousseDefinitionID && 
 			           			obj.basketGroupBarcodes == basketGroupBarcodes && 
-			           			obj.idCardBarcode == idCardBarcode){
+			           			obj.idCardBarcode == idCardBarcode && obj.tousseInstanceBarcode == tousseInstanceBarcode){
 			           		
 			           		var delButton = $(this).next().next().next().next().find('a');
 			           		deleteMaterialItem(delButton,basketJSON.barcode,basketJSON.classifyBasketId);
@@ -683,7 +687,9 @@
 	   			itemType: type,
 	   			tousseNameForMaterial: tousseNameForMaterial,
 	   			idCardBarcode: idCardBarcode,
-	   			basketGroupBarcodes: basketGroupBarcodes
+	   			basketGroupBarcodes: basketGroupBarcodes,
+				lastTousseInstanceId:item.lastTousseInstanceId,
+				tousseInstanceBarcode:item.tousseInstanceBarcode
 	   	}
 		addOrDelTousse(tousse);
 		
@@ -851,7 +857,7 @@
 	var basketGroupBarcodes = basketItem.basketGroupBarcodes;
 	var putBasketMaxAmount = basketItem.putBasketMaxAmount;
 	var isExist = false;
-	var lastTousseInsatnceId =  basketItem.lastTousseInsatnceId;
+	var lastTousseInstanceId =  basketItem.lastTousseInstanceId;
 	var tousseInstanceBarcode = basketItem.tousseInstanceBarcode;
 	var basketElement = $('dl[class="sed clearfix"]:eq(0)');
 	var basketHidenValue =  $("#basketsUl li:first").find('input').val();
@@ -867,7 +873,7 @@
         				var hideStr = $(this).val();
             			var json = JSON.parse(hideStr);
             			if(json.materialName == materialName && json.tousseDefinitionID == tousseDefinitionID && 
-            					json.idCardBarcode == idCardBarcode && json.basketGroupBarcodes == basketGroupBarcodes){
+            					json.idCardBarcode == idCardBarcode && json.basketGroupBarcodes == basketGroupBarcodes && json.tousseInstanceBarcode == tousseInstanceBarcode){
             				isExist = true;
             				json.amount = (json.amount + amount);
             				json.tousseAmount = (json.tousseAmount + tousseAmount);
@@ -891,7 +897,7 @@
         			if($(this).attr('type') == 'hidden'){
            				var hideStr = $(this).val();
                			var json = JSON.parse(hideStr);
-               			if(json.tousseDefinitionID == tousseDefinitionID && json.idCardBarcode == idCardBarcode){
+               			if(json.tousseDefinitionID == tousseDefinitionID && json.idCardBarcode == idCardBarcode && json.tousseInstanceBarcode == tousseInstanceBarcode){
                				json.amount = (json.amount + amount);
                				$(this).val(JSON.stringify(json));
                				$(this).next().next().next().text(json.amount);
@@ -906,20 +912,29 @@
 	}
 	if(!isExist){
 		var showBarcode = idCardBarcode;
-		if(sstsConfig.defaultRecycleAmountOfTousseFormIsZero || sstsConfig.defaultRecycleAmountOfComboFormIsZero){
-			showBarcode = tousseInstanceBarcode;
-		}
-		
 		if(type == '材料' && idCardBarcode == ""){
 			showBarcode = tousseName;
 		}
+		
+		if((sstsConfig.defaultRecycleAmountOfTousseFormIsZero || sstsConfig.defaultRecycleAmountOfComboFormIsZero) && idCardBarcode == ""){
+			if(tousseInstanceBarcode !=""){
+				showBarcode = tousseInstanceBarcode;
+			}else{
+				if(type == '材料'){
+					showBarcode = tousseName;
+				}else{
+					showBarcode = "";
+				}
+			}
+		}
+		
 		var element = '<input type="hidden" value="">';
 			element += '<dd class="name">' + showName + '</dd>';
 			element += '<dd class="barcode"><span>&nbsp' + showBarcode + '</span></dd>';
 			element += '<dd class="num">' + amount + '</dd>';
 			element += '<dd class="del"><a href="javascript:void(0);" class="btn" onclick="deleteConfirm(\'是否要从篮筐内移除【'+showName+'】？\',\'deleteBasketItem\',\'\',this,\'\',\'\');">删除</a></dd>';
 		
-		var json = getBasketItemJSON(ci_id,type,orgUnitName,tousseName,materialName,amount,tousseAmount,idCardBarcode,tousseDefinitionID,basketGroupBarcodes,putBasketMaxAmount,tousseType,lastTousseInsatnceId,tousseInstanceBarcode);
+		var json = getBasketItemJSON(ci_id,type,orgUnitName,tousseName,materialName,amount,tousseAmount,idCardBarcode,tousseDefinitionID,basketGroupBarcodes,putBasketMaxAmount,tousseType,lastTousseInstanceId,tousseInstanceBarcode);
 		basketElement.prepend($(element));
 		basketElement.find("input:first").val(json);
 	}
@@ -948,7 +963,7 @@
 			tousseInstanceBarcode:tousseInstanceBarcode,
    			basketGroupBarcodes: basketGroupBarcodes,
    			basketSequence:basketJson.sequence,
-			lastTousseInsatnceId:lastTousseInsatnceId
+			lastTousseInstanceId:lastTousseInstanceId
    	}
 	addOrDelTousse(tousse);
 }
@@ -1300,18 +1315,24 @@
 								newAlert("请扫描篮筐条码!");
 							    return false;
 							}
+							
+							if(!sstsConfig.disableIdCard && td.isDisableIDCard == "否"){//配置项开启和包定义中启用标识牌功能后，必须扫描标识牌回收
+								newAlert(td.name+"启用了标识牌功能,不能扫描包实例条码，请扫描标识牌条码!");
+								return false;
+							}
+							
 							var exist = tousseInstanceBarcodeIsExist(ti.barcode);
 							if(exist){
 								alertDiv(barcode+",已入筐!");
 							}else{
 								var orgUnitName = $('#depart').val();
-								var loadedAmount = tousseIntoBasketFunction(ti.id,td.id,td.name,1,td.isCleanedEntirely,orgUnitName,"",ti.barcode,td.tousseType);
+								var loadedAmount2 = tousseIntoBasketFunction(ti.id,td.id,td.name,1,td.isCleanedEntirely,orgUnitName,"",ti.barcode,td.tousseType);
 								
-								if(loadedAmount > 0){
-									var tousseIsExist = false;
+								if(loadedAmount2 > 0){
+									var tousseIsExist2 = false;
 									$('#tousseItemTable').children().first().children().each(function(i,element){
 								        if($('#tousseName'+i).val() == td.name && $('#deleted'+i).val() == '0'){
-											tousseIsExist = true;
+											tousseIsExist2 = true;
 											$('#loadedAmount'+i).val(1 + parseInt($('#loadedAmount'+i).val(),10));
 											$('#tousseOrIDCardInstanceBarcodes'+i).val(appendBarcodes($('#tousseOrIDCardInstanceBarcodes'+i).val(), ti.barcode));
 											if(parseInt($('#loadedAmount'+i).val()) > parseInt($('#recycleAmount'+i).val())){
@@ -1321,7 +1342,7 @@
 											loadUnSupplementMaterial(msg,i,ti.barcode);
 								        }
 									});
-									if(!tousseIsExist){
+									if(!tousseIsExist2){
 										 var tmpRow = $("#tousseItemTable > tbody > tr").length;
 										 var timeStr = new Date().getTime();
 										 var errorDamageQmKey = td.id + "_" + timeStr;
@@ -1335,7 +1356,7 @@
 											loadedAmount: 1,
 											isCleanedEntirely: td.isCleanedEntirely,
 											tousseType: td.type,
-											isThereIdentificationCard: '是',
+											isThereIdentificationCard: '否',
 											isApplyEntireTousse: td.isApplyEntireTousse,
 											urgentAmount : 0,
 											tousseRemark:'',
@@ -2117,7 +2138,7 @@
 }
 
 function getBasketItemJSON(ci_id,type,orgUnitName,tousseName,materialName,amount,tousseAmount,idCardBarcode,
-		tousseDefinitionID,basketGroupBarcodes,putBasketMaxAmount,tousseType,lastTousseInsatnceId,tousseInstanceBarcode){
+		tousseDefinitionID,basketGroupBarcodes,putBasketMaxAmount,tousseType,lastTousseInstanceId,tousseInstanceBarcode){
 	var json = {};
 	json.classifiedItemId = ci_id;
 	json.type = type;
@@ -2132,7 +2153,7 @@
 	json.putBasketMaxAmount = putBasketMaxAmount;
 	json.useBasketBarcodes = new Array();
 	json.basketGroupBarcodes = basketGroupBarcodes;
-	json.lastTousseInsatnceId = lastTousseInsatnceId;
+	json.lastTousseInstanceId = lastTousseInstanceId;
 	json.tousseInstanceBarcode = tousseInstanceBarcode;
 	return JSON.stringify(json);
 }
@@ -2252,7 +2273,7 @@
            					orgUnitName: orgUnitName,
            					tousseName: tousseName,
            					tousseDefinitionID: tousseDefinitionID,
-							lastTousseInsatnceId:tousseInstanceId, //包实例id
+							lastTousseInstanceId:tousseInstanceId, //包实例id
 							tousseInstanceBarcode:tousseInstanceBarcode,
            					tousseType:tousseType,
            					materialName: item.materialName,
@@ -2273,7 +2294,7 @@
        					orgUnitName: orgUnitName,
        					tousseName: tousseName,
        					tousseDefinitionID: tousseDefinitionID,
-						lastTousseInsatnceId:tousseInstanceId, //包实例id，
+						lastTousseInstanceId:tousseInstanceId, //包实例id，
 						tousseInstanceBarcode:tousseInstanceBarcode,//包实例条码，为了显示
        					tousseType:tousseType,
        					materialName: "",
@@ -4039,7 +4060,7 @@
 	   					orgUnitName: orgUnitName,
 	   					tousseName: tousseName,
 	   					tousseDefinitionID: tousseDefinitionID,
-						lastTousseInsatnceId:"", //包实例id
+						lastTousseInstanceId:"", //包实例id
 						tousseInstanceBarcode:"",
 	   					tousseType: tousseType,
 	   					materialName: item.materialName,
@@ -4728,7 +4749,8 @@
       					var timeStr = new Date().getTime();
           				errorDamageQmKey = tousseItem.tousseDefinitionId + "_" + timeStr;
       				}
-                   var toussItem = {
+					
+                    var toussItem = {
       						row: row,
       						tousseItemId: tousseItem.id,
       						tousseName: tousseItem.tousseName,
@@ -4847,7 +4869,9 @@
                				if (recyclingStatus == '已清点'){
                					recyclingAmount = applicationitems[i].tallyAmount;
                				}
-               				
+               				if(sstsConfig.defaultRecycleAmountOfComboFormIsZero || sstsConfig.defaultRecycleAmountOfTousseFormIsZero){
+               					recyclingAmount = 0;
+               				}
             				 var toussItem = {
                 						row: row,
                 						tousseItemId: '',
@@ -4910,14 +4934,19 @@
                     			showBarcode = tousseNameForMaterial;
                     		}
                             
+							if((sstsConfig.defaultRecycleAmountOfComboFormIsZero || sstsConfig.defaultRecycleAmountOfTousseFormIsZero) && ci.tousseInstanceBarcode != undefined){
+								showBarcode = ci.tousseInstanceBarcode;
+							}
+							
+							var aa = aa  + materialName;
                             var element =  '<input type="hidden">';
                             	element += '<dd class="name"><span>'+materialName+'</span></dd>';
                             	element += '<dd class="barcode">&nbsp'+showBarcode+'</dd>';
                             	element += '<dd class="num">'+ci.amount+'</dd>';
                             	element += '<dd class="del"><a href="javascript:void(0);" class="btn" onclick="deleteConfirm(\'是否要从篮筐内移除物品【' + materialName + '】？\',\'deleteBasketItem\',\'\',this,\'\',\'\',\'\');">删除</a></dd>';
                            
                             $('dl[class="sed clearfix"]:eq(0)').prepend(element);
-                            var json = getBasketItemJSON(ci.id,'材料',ci.orgUnitName,tousseNameForMaterial,materialName,ci.amount,ci.tousseAmountForMaterial,ci.idCardBarcode,ci.tousseDefinitionID,ci.basketGroupBarcodes,putBasketMaxAmount,tousseType,"","");
+                            var json = getBasketItemJSON(ci.id,'材料',ci.orgUnitName,tousseNameForMaterial,materialName,ci.amount,ci.tousseAmountForMaterial,ci.idCardBarcode,ci.tousseDefinitionID,ci.basketGroupBarcodes,putBasketMaxAmount,tousseType,ci.lastTousseInstanceId,ci.tousseInstanceBarcode);
                             $('dl[class="sed clearfix"]:eq(0)').find("input:first").val(json);
                             
                             $('td[axis="materialName"]').each(function(){
@@ -4943,7 +4972,7 @@
                             	element += '<dd class="del"><a href="javascript:void(0);" class="btn" onclick="deleteConfirm(\'是否要从篮筐内移除物品【'+ci.tousseDefinition.name+'】？\',\'deleteBasketItem\',\'\',this,\'\',\'\',\'\');">删除</a></dd>';
                             $('dl[class="sed clearfix"]:eq(0)').prepend(element);
                             
-                            var json = getBasketItemJSON(ci.id,"器械包",ci.orgUnitName,ci.tousseDefinition.name,"",ci.amount,ci.tousseAmountForMaterial,ci.idCardBarcode,ci.tousseDefinitionID,ci.basketGroupBarcodes,putBasketMaxAmount,tousseType,"","");
+                            var json = getBasketItemJSON(ci.id,"器械包",ci.orgUnitName,ci.tousseDefinition.name,"",ci.amount,ci.tousseAmountForMaterial,ci.idCardBarcode,ci.tousseDefinitionID,ci.basketGroupBarcodes,putBasketMaxAmount,tousseType,ci.lastTousseInstanceId,ci.tousseInstanceBarcode);
                             $('dl[class="sed clearfix"]:eq(0)').find("input:first").val(json);
                         }
                     }