Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r29621 -r29652
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 29621)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 29652)
@@ -1040,6 +1040,40 @@
 				lastTousseInstanceId:item.lastTousseInstanceId,
 				tousseInstanceBarcode:item.tousseInstanceBarcode
 			}
+			for(var items in sessionTousseInstance){
+				if(parseInt(items) == parseInt(tousse.tousseDefinitionID)){
+					if(sessionTousseInstance[items].barcodeArray1.indexOf(tousse.tousseInstanceBarcode) >= 0){
+						var barcodeArray1 = sessionTousseInstance[items].barcodeArray1;
+						var idsArray1 = sessionTousseInstance[items].idsArray1;
+						for(var i=0;i<barcodeArray1.length;i++){
+							if(barcodeArray1[i] == tousse.tousseInstanceBarcode){
+								idsArray1.splice(i,1,null);
+								barcodeArray1.splice(i,1,null);
+							}
+						}
+						var newIdsArray = [];
+						var newBarcodeArray = [];
+						var k = 0;
+						var z = 0;
+						for(var i=0;i<idsArray1.length;i++){
+							if(idsArray1[i] !== null){
+								newIdsArray[k] = idsArray1[i];
+								k++
+							}
+						}
+						for(var i=0;i<barcodeArray1.length;i++){
+							if(barcodeArray1[i] !== null){
+								newBarcodeArray[z] = barcodeArray1[i];
+								z++
+							}
+						}
+						sessionTousseInstance[items].barcodeArray1 = newBarcodeArray;
+						sessionTousseInstance[items].idsArray1 = newIdsArray;
+						sessionTousseInstance[items].barcodeArray.push(tousse.tousseInstanceBarcode);
+						sessionTousseInstance[items].idsArray.push(tousse.lastTousseInstanceId);
+					}
+				}
+			}
 			addOrDelTousse(tousse);
 			hideElement.remove();
 			nameElement.remove();
@@ -1067,6 +1101,7 @@
 			addOrDelTousse(tousse);
 		}
 	}
+
 	checkLoadedAmount();
 	refreshSequence(delElement.parent().parent(),0);
 	tousseItemTableSort(name);
@@ -3156,21 +3191,62 @@
 			var idsLen = 0;
 			for(var item in sessionTousseInstance){
 				if(item == tousseDefinitionID){
-					var ids = ''+sessionTousseInstance[item].ids+'';
-					var barcodes = sessionTousseInstance[item].barcode;
-					if(ids){
-						idsLen = ids.split(';').length;
-						for(var i=0;i<ids.split(';').length;i++){
-							var id = ids.split(';')[i];
-							var barcode = barcodes.split(';')[i];
-							tousseIntoBasketFunction(id,tousseDefinitionID,tousseName,1,isCleanedEntirely,orgUnitName,"",barcode,tousseType,row,isIDCard,1,{});
+					var idsArray = sessionTousseInstance[item].idsArray;
+					var barcodeArray = sessionTousseInstance[item].barcodeArray;
+					if(idsArray.length > 0){
+						idsLen = idsArray.length;
+						if(amount >= idsArray.length){
+							for(var i=0;i<idsArray.length;i++){
+								var id = idsArray[i];
+								var barcode = barcodeArray[i];
+								tousseIntoBasketFunction(id,tousseDefinitionID,tousseName,1,isCleanedEntirely,orgUnitName,"",barcode,tousseType,row,isIDCard,1,{});
+								idsArray.splice(i,1,null);
+								barcodeArray.splice(i,1,null);
+								sessionTousseInstance[item].idsArray1.push(id);
+								sessionTousseInstance[item].barcodeArray1.push(barcode);
+							}
+						}else {
+							for(var i=0;i<amount.length;i++){
+								var id = idsArray[i];
+								var barcode = barcodeArray[i];
+								tousseIntoBasketFunction(id,tousseDefinitionID,tousseName,1,isCleanedEntirely,orgUnitName,"",barcode,tousseType,row,isIDCard,1,{});
+								idsArray.splice(i,1,null);
+								barcodeArray.splice(i,1,null);
+								sessionTousseInstance[item].idsArray1.push(id);
+								sessionTousseInstance[item].barcodeArray1.push(barcode);
+							}
 						}
+						var k = 0;
+						var z = 0;
+						var newIdsArray = [];
+						var newBarcodeArray = [];
+						for(var i=0;i<idsArray.length;i++){
+							if(idsArray[i] !== null){
+								newIdsArray[k] = idsArray[i];
+								k++
+							}
+						}
+						for(var i=0;i<barcodeArray.length;i++){
+							if(barcodeArray[i] !== null){
+								newBarcodeArray[z] = barcodeArray[i];
+								z++
+							}
+						}
+						sessionTousseInstance[item].idsArray = newIdsArray;
+						sessionTousseInstance[item].barcodeArray = newBarcodeArray;
 					}
 				}
 			}
-			if(amount - idsLen > 0){
+			if(amount > 0 && amount - idsLen > 0){
 				var resultAmount = parseInt(amount)-idsLen;
 				tousseIntoBasketFunction("",tousseDefinitionID,tousseName,resultAmount,isCleanedEntirely,orgUnitName,"","",tousseType,row,isIDCard,1,{});
+			}else if(amount < 0){
+				if((0-amount)>(loadedAmount-sessionTousseInstance[item].idsArray1.length)){
+					alertDiv('有'+sessionTousseInstance[item].idsArray1.length+'个包实例条码已入筐,最多只能减少'+(loadedAmount-sessionTousseInstance[item].idsArray1.length)+'个');
+					return
+				}else {
+					tousseIntoBasketFunction("",tousseDefinitionID,tousseName,amount,isCleanedEntirely,orgUnitName,"","",tousseType,row,isIDCard,1,{});
+				}
 			}
 			newAmount = 0;
 		}
@@ -3368,26 +3444,43 @@
 				 //BJ307YY-35缓存扫描的包实例的数量
 				 if(barcode !== ''){
 					var recycleAmount = parseInt($('#recycleAmount'+i).val());
+					var loadedAmount = parseInt($('#loadedAmount'+i).val());
 					if(isScanAddTouss){
 						if(!sessionTousseInstance[tousseDefinitionID]){
+							var barcodeArray = [];
+							var idsArray = [];
+							barcodeArray.push(barcode);
+							idsArray.push(tid);
 							sessionTousseInstance[tousseDefinitionID] = {
 								name:tousseName,
-								amount:1,
-								barcode:barcode,
-								ids:tid
+								amount:1,//总数量
+								barcodeArray:barcodeArray,//未入筐的条码
+								idsArray:idsArray,//未入筐的id
+								barcodeArray1:[],//已入筐的条码
+								idsArray1:[]//已入筐的id
 							}
 							showResult(sessionTousseInstance[tousseDefinitionID].name+'的实例条码数量为'+sessionTousseInstance[tousseDefinitionID].amount);
-							if(Object.keys(sessionTousseInstance).length > recycleAmount){
+							if(loadedAmount == recycleAmount && loadedAmount !== 0){
 								$('#recycleAmount'+i).val(recycleAmount+1);
 							}
 						}else {
-							if(sessionTousseInstance[tousseDefinitionID].barcode.indexOf(barcode) == -1){
-								sessionTousseInstance[tousseDefinitionID].amount += 1;
-								sessionTousseInstance[tousseDefinitionID].ids += ';'+tid;
-								sessionTousseInstance[tousseDefinitionID].barcode += ';'+barcode;
-								if(recycleAmount < sessionTousseInstance[tousseDefinitionID].amount){
-									$('#recycleAmount'+i).val(recycleAmount+1);
+							if(sessionTousseInstance[tousseDefinitionID].barcodeArray.indexOf(barcode) == -1 && sessionTousseInstance[tousseDefinitionID].barcodeArray1.indexOf(barcode) == -1){
+								if(loadedAmount == 0){
+									if(recycleAmount <= sessionTousseInstance[tousseDefinitionID].barcodeArray.length){
+										$('#recycleAmount'+i).val(recycleAmount+1);
+									}
+								}else {
+									if(recycleAmount > loadedAmount){
+										if((recycleAmount-loadedAmount) <= sessionTousseInstance[tousseDefinitionID].barcodeArray.length){
+											$('#recycleAmount'+i).val(recycleAmount+1);
+										}
+									}else if(recycleAmount == loadedAmount){
+										$('#recycleAmount'+i).val(recycleAmount+1);
+									}
 								}
+								sessionTousseInstance[tousseDefinitionID].amount += 1;
+								sessionTousseInstance[tousseDefinitionID].idsArray.push(tid)
+								sessionTousseInstance[tousseDefinitionID].barcodeArray.push(barcode)
 								showResult(sessionTousseInstance[tousseDefinitionID].name+'的实例条码数量为'+sessionTousseInstance[tousseDefinitionID].amount);
 							}else {
 								showResult('该实例条码已经在回收列表中！');
@@ -3508,11 +3601,17 @@
          refreshErrorRemarkView(row);
 		 refreshDamageRemarkView(row);
 		 if(isScanAddTouss){
+			var barcodeArray = [];
+			var idsArray = [];
+			barcodeArray.push(barcode);
+			idsArray.push(tid);
 			sessionTousseInstance[tousseDefinitionID] = {
 				name:tousseName,
-				amount:1,
-				barcode:barcode,
-				ids:tid
+				amount:1,//总数量
+				barcodeArray:barcodeArray,//未入筐的条码
+				idsArray:idsArray,//未入筐的id
+				barcodeArray1:[],//已入筐的条码
+				idsArray1:[]//已入筐的id
 			}
 			showResult(tousseName+'的实例条码数量为1')
 		 }