Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r29568 -r29574
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 29568)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 29574)
@@ -12,7 +12,6 @@
 var shareDepartsMap = new newMap();
 var shareDepartsArr = [];
 var basketArray = [];
-var sessionTousseInstance = {};
 /**
  * 不回收的器械包的集合。这个是由绑定带出来的器械包,并且不回收,在回收这里本来是不做处理的。现在要能修改原来的申请数量，相关的还有装配任务
  */
@@ -1243,7 +1242,8 @@
 		if(type == '材料' && idCardBarcode == ""){
 			showBarcode = tousseName;
 		}
-		if(idCardBarcode == ""){
+		
+		if((sstsConfig.defaultRecycleAmountOfTousseFormIsZero || sstsConfig.defaultRecycleAmountOfComboFormIsZero) && idCardBarcode == ""){
 			if(tousseInstanceBarcode !=""){
 				showBarcode = tousseInstanceBarcode;
 			}else{
@@ -1669,7 +1669,7 @@
 								alertDiv(msg.errorMessage);
 							}
 						}else{
-							if(msg.errorMessage == "器械包已回收！"){
+							if((sstsConfig.defaultRecycleAmountOfComboFormIsZero || sstsConfig.defaultRecycleAmountOfTousseFormIsZero) && msg.errorMessage == "器械包已回收！"){
 								newAlert(msg.errorMessage);
 							}else{
 								alertDiv(msg.errorMessage);
@@ -1707,43 +1707,66 @@
                 	if(!msg.isIDCardInstance){//扫描器械包实例的条码						
 						var ti = msg.tousseInstance;
 						var td = ti.tousseDefinition;
-						var isThereIdentificationCard = '否';
-						if(td.isDisableIDCard == "否"){
-							isThereIdentificationCard = '是';
-						}
-						var tmpRow = $("#tousseItemTable > tbody > tr").length;    //获取子元素,不包含孙子及以下的元素
-						var timeStr = new Date().getTime();
-						var errorDamageQmKey = td.id + "_" + timeStr;
-						var toussItem = {
-							row: tmpRow,
-							tousseItemId: '',
-							tousseName: td.name,
-							tousseDefinitionID: td.id,
-							applicationAmount: 0,
-							recycleAmount: 1,
-							loadedAmount: 0,
-							isCleanedEntirely: td.isCleanedEntirely,
-							tousseType: td.tousseType,
-							isThereIdentificationCard: isThereIdentificationCard,
-							isApplyEntireTousse: td.isApplyEntireTousse,
-							urgentAmount : 0,
-							tousseRemark:'',
-							errorDamageQmKey : errorDamageQmKey,
-							barcode : ti.barcode
-						};
-						addBindGoods(toussItem,sstsConfig.addTousseAtLastForRecycle);
-						//清除已删除的包
-						cleanDeleteTousseItem(td.id);
-						addErrorDamageRemark(ti,tmpRow);
-						var orgUnitName = $('#depart').val();
-						if(sstsConfig.enableAutoIntoWashBasketWhenScanTousseBarcode){
-							var loadedAmount2 = tousseIntoBasketFunction(ti.id,td.id,td.name,1,td.isCleanedEntirely,orgUnitName,"",ti.barcode,td.tousseType,-1,'否',2,msg);
-						}else {
-							addToussItem(toussItem,sstsConfig.addTousseAtLastForRecycle,true);
-						}
+						if(sstsConfig.defaultRecycleAmountOfComboFormIsZero || sstsConfig.defaultRecycleAmountOfTousseFormIsZero){
+							var basketHideStr = $("#basketsUl li:first").find('input').val();
+							if(sstsConfig.enableAutoIntoWashBasketWhenScanTousseBarcode){
+								if(basketHideStr == null || basketHideStr == ""){
+									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 loadedAmount2 = tousseIntoBasketFunction(ti.id,td.id,td.name,1,td.isCleanedEntirely,orgUnitName,"",ti.barcode,td.tousseType,-1,'否',2,msg);
+							}							
+						}else{
+							var isThereIdentificationCard = '否';
+							if(td.isDisableIDCard == "否"){
+								isThereIdentificationCard = '是';
+							}
+							var tmpRow = $("#tousseItemTable > tbody > tr").length;    //获取子元素,不包含孙子及以下的元素
+							var timeStr = new Date().getTime();
+							var errorDamageQmKey = td.id + "_" + timeStr;
+							var toussItem = {
+								row: tmpRow,
+								tousseItemId: '',
+								tousseName: td.name,
+								tousseDefinitionID: td.id,
+								applicationAmount: 0,
+								recycleAmount: 1,
+								loadedAmount: 0,
+								isCleanedEntirely: td.isCleanedEntirely,
+								tousseType: td.tousseType,
+								isThereIdentificationCard: isThereIdentificationCard,
+								isApplyEntireTousse: td.isApplyEntireTousse,
+								urgentAmount : 0,
+								tousseRemark:'',
+								errorDamageQmKey : errorDamageQmKey,
+								barcode : ti.barcode
+							};
+							addBindGoods(toussItem,sstsConfig.addTousseAtLastForRecycle);
+							//清除已删除的包
+							cleanDeleteTousseItem(td.id);
+							addErrorDamageRemark(ti,tmpRow);
+							var orgUnitName = $('#depart').val();
+							if(sstsConfig.enableAutoIntoWashBasketWhenScanTousseBarcode){
+								var loadedAmount2 = tousseIntoBasketFunction(ti.id,td.id,td.name,1,td.isCleanedEntirely,orgUnitName,"",ti.barcode,td.tousseType,-1,'否',2,msg);
+							}else {
+								addToussItem(toussItem,sstsConfig.addTousseAtLastForRecycle);
+							}
 
-						//未补充的丢失报损
-						loadUnSupplementMaterial(msg,tmpRow,ti.barcode);
+							//未补充的丢失报损
+							loadUnSupplementMaterial(msg,tmpRow,ti.barcode);
+						}
 					}else{  //扫描标识牌实例条码
 						barcode = msg.idCardInstance.barcode;
 						var departValue = $('#depart').attr('value');
@@ -1916,6 +1939,7 @@
     	alertDiv('条码长度不符合规范。');
     }
 }
+
 //选择回收人员
 function selectRecyclingUser(){
 	$('#recyclingUser').val(userNameByBarcode);
@@ -3256,10 +3280,9 @@
  * 添加回收记录明细，tousseName为器械包名称，applicationAmount为申请数量，recycleAmount为回收数量，loadedAmount为装载数量
  * @param toussItem		物品明细
  * @param appendLast	是否追加到最后一行
- * @param isScanAddTouss	是否扫描添加的物品
  * @returns {Boolean}
  */
-function addToussItem(toussItem,appendLast,isScanAddTouss){
+function addToussItem(toussItem,appendLast){
 	var row = toussItem.row;
 	var tousseItemId = toussItem.tousseItemId;
 	var tousseName = toussItem.tousseName;
@@ -3284,32 +3307,9 @@
          if(($('#tousseDefinitionID'+i).val() == tousseDefinitionID)||(tousseType == '消毒物品' && $('#tousseName'+i).val() == tousseName)){
 			 //显示的列表中是否有该器械包
         	 if($('#deleted'+i).val() == '0'){
-				 //BJ307YY-35缓存扫描的包实例的数量
 				if(barcode !== ''){
 					var recycleAmount = parseInt($('#recycleAmount'+i).val());
-					if(isScanAddTouss){
-						if(!sessionTousseInstance[tousseDefinitionID]){
-							sessionTousseInstance[tousseDefinitionID] = {
-								name:tousseName,
-								amount:1,
-								barcode:barcode
-							}
-							showResult(sessionTousseInstance[tousseDefinitionID].name+'的实例条码数量为'+sessionTousseInstance[tousseDefinitionID].amount);
-						}else {
-							if(sessionTousseInstance[tousseDefinitionID].barcode.indexOf(barcode) == -1){
-								sessionTousseInstance[tousseDefinitionID].amount += 1;
-								sessionTousseInstance[tousseDefinitionID].barcode += ';'+barcode;
-								if(recycleAmount < sessionTousseInstance[tousseDefinitionID].amount){
-									$('#recycleAmount'+i).val(recycleAmount+1);
-								}
-								showResult(sessionTousseInstance[tousseDefinitionID].name+'的实例条码数量为'+sessionTousseInstance[tousseDefinitionID].amount);
-							}else {
-								showResult('该实例条码已经在回收列表中！');
-							}
-						}
-					}else {
-						$('#recycleAmount'+i).val(recycleAmount+1);
-					}
+					$('#recycleAmount'+i).val(recycleAmount+1);
 					b = false;
 					highlightExistTousseItem(i);
 				}else {
@@ -3420,15 +3420,7 @@
 			 }
 		 }
          refreshErrorRemarkView(row);
-		 refreshDamageRemarkView(row);
-		 if(isScanAddTouss){
-			sessionTousseInstance[tousseDefinitionID] = {
-				name:tousseName,
-				amount:1,
-				barcode:barcode
-			}
-			showResult(tousseName+'的实例条码数量为1')
-		 }
+         refreshDamageRemarkView(row);
     }
     return b;
 }
@@ -6143,7 +6135,7 @@
                     			showBarcode = tousseNameForMaterial;
                     		}
                             
-							if(ci.tousseInstanceBarcode != undefined){
+							if((sstsConfig.defaultRecycleAmountOfComboFormIsZero || sstsConfig.defaultRecycleAmountOfTousseFormIsZero) && ci.tousseInstanceBarcode != undefined){
 								showBarcode = ci.tousseInstanceBarcode;
 							}
 							
@@ -6170,7 +6162,7 @@
                         	}
 							
 							var barcode = ci.idCardBarcode;
-							if(ci.tousseInstanceBarcode != undefined){
+							if((sstsConfig.defaultRecycleAmountOfComboFormIsZero || sstsConfig.defaultRecycleAmountOfTousseFormIsZero) && ci.tousseInstanceBarcode != undefined){
 								barcode = ci.tousseInstanceBarcode;
 							}
                             var element =  '<input type="hidden" value="">';