Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r28481 -r28483
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 28481)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 28483)
@@ -171,7 +171,7 @@
     		var newTousse = {
 				basketBarcode: basketBarcode,
 				basketId: basketId,
-				classifiedItemId: item.classifiedItemId || '',
+				classifiedItemId: '',
 				tousseDefinitionID: item.tousseDefinitionID,
 				tousseInstanceBarcode:tousseInstanceBarcode,
 				tousseName: tousseName,
@@ -188,6 +188,7 @@
         	tousseArray.push(newTousse);
     	}
 	}
+	console.log(tousseArray)
 }
 
 var ab;
@@ -909,7 +910,7 @@
 			var tousse = {
 				basketBarcode: containerBarcode,
 				basketId: basketId,
-				classifiedItemId: item.classifiedItemId || '',
+				classifiedItemId: '',
 				tousseName: name,
 				tousseDefinitionID: item.tousseDefinitionID,
 				amount: -Math.abs(parseInt(amount)),
@@ -933,7 +934,7 @@
 			var tousse = {
 				basketBarcode: containerBarcode,
 				basketId: basketId,
-				classifiedItemId: item.classifiedItemId || '',
+				classifiedItemId: '',
 				tousseName: name,
 				tousseDefinitionID: item.tousseDefinitionID,
 				amount: parseInt(amount-sumCount),
@@ -1091,6 +1092,7 @@
  * @param basketItem
  */
 function addBasketItemElement(basketItem){
+	console.log(basketItem)
 	var ci_id = basketItem.ci_id;
 	var type = basketItem.type;
 	var orgUnitName = basketItem.orgUnitName;
@@ -1107,7 +1109,7 @@
 	var basketGroupBarcodes = basketItem.basketGroupBarcodes;
 	var putBasketMaxAmount = basketItem.putBasketMaxAmount;
 	var isExist = false;
-	var lastTousseInstanceId =  basketItem.lastTousseInstanceId;
+	var lastTousseInstanceId =  "";
 	var tousseInstanceBarcode = basketItem.tousseInstanceBarcode;
 	var washClassifyType = basketItem.washClassifyType;
 	var basketElement = $('dl[class="sed clearfix"]:eq(0)');
@@ -1576,7 +1578,6 @@
                 	if(!msg.isIDCardInstance){//扫描器械包实例的条码						
 						var ti = msg.tousseInstance;
 						var td = ti.tousseDefinition;
-						
 						if(sstsConfig.defaultRecycleAmountOfComboFormIsZero || sstsConfig.defaultRecycleAmountOfTousseFormIsZero){
 							var basketHideStr = $("#basketsUl li:first").find('input').val();
 							if(basketHideStr == null || basketHideStr == ""){
@@ -1594,52 +1595,7 @@
 								alertDiv(barcode+",已入筐!");
 							}else{
 								var orgUnitName = $('#depart').val();
-								var loadedAmount2 = tousseIntoBasketFunction(ti.id,td.id,td.name,1,td.isCleanedEntirely,orgUnitName,"",ti.barcode,td.tousseType);
-								if(loadedAmount2 > 0){
-									var tousseIsExist2 = false;
-									$('#tousseItemTable').children().first().children().each(function(i,element){
-								        if($('#tousseName'+i).val() == td.name && $('#deleted'+i).val() == '0'){
-											tousseIsExist2 = true;
-											$('#loadedAmount'+i).val(loadedAmount2 + parseInt($('#loadedAmount'+i).val(),10));
-											$('#tousseOrIDCardInstanceBarcodes'+i).val(appendBarcodes($('#tousseOrIDCardInstanceBarcodes'+i).val(), ti.barcode));
-											if(parseInt($('#loadedAmount'+i).val()) > parseInt($('#recycleAmount'+i).val())){
-												$('#recycleAmount'+i).val(parseInt($('#loadedAmount'+i).val()));
-											}
-											addErrorDamageRemark(ti,i);
-											loadUnSupplementMaterial(msg,i,ti.barcode);
-								        }
-									});
-									if(!tousseIsExist2){
-										 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: 1,
-											isCleanedEntirely: td.isCleanedEntirely,
-											tousseType: td.type,
-											isThereIdentificationCard: '否',
-											isApplyEntireTousse: td.isApplyEntireTousse,
-											urgentAmount : 0,
-											tousseRemark:'',
-											errorDamageQmKey : errorDamageQmKey,
-											barcode : ti.barcode
-										 };
-										 addToussItem(toussItem,sstsConfig.addTousseAtLastForRecycle);
-										 addBindGoods(toussItem,sstsConfig.addTousseAtLastForRecycle);
-										 //清除已删除的包
-										 cleanDeleteTousseItem(td.id);
-										 addErrorDamageRemark(ti,tmpRow);
-										 //未补充的丢失报损
-										loadUnSupplementMaterial(msg,tmpRow,ti.barcode);
-									}									
-									refreshAllBasketTotalNum();
-								}
+								var loadedAmount2 = tousseIntoBasketFunction(ti.id,td.id,td.name,1,td.isCleanedEntirely,orgUnitName,"",ti.barcode,td.tousseType,-1,'否',2,msg);
 							}							
 						}else{
 							var isExist = false;
@@ -1652,7 +1608,6 @@
 									 isExist = true;
 								 }
 							});
-							
 							if(!isExist){
 								var isThereIdentificationCard = '否';
 								if(td.isDisableIDCard == "否"){
@@ -1685,6 +1640,8 @@
 								addErrorDamageRemark(ti,tmpRow);
 								//未补充的丢失报损
 								loadUnSupplementMaterial(msg,tmpRow,ti.barcode);
+								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{  //扫描标识牌实例条码
@@ -1732,57 +1689,8 @@
                         			 return false;
                         		 }
                             	 
-                            	 var loadedAmount = tousseIntoBasketFunction("",td.id,td.name,1,td.isCleanedEntirely,orgUnitName,barcode,"",td.tousseType);
-								 if(loadedAmount >= 0){
-                            		 var tousseIsExist = false;
-                                	 $('#tousseItemTable').children().first().children().each(function(i,element){
-                            	         if($('#tousseName'+i).val() == td.name && $('#deleted'+i).val() == '0'){
-											 tousseIsExist = true;
-                            	        	 $('#loadedAmount'+i).val(loadedAmount + parseInt($('#loadedAmount'+i).val(),10));
-                            	        	 $('#tousseOrIDCardInstanceBarcodes'+i).val(appendBarcodes($('#tousseOrIDCardInstanceBarcodes'+i).val(), ti.barcode));
-                            	        	 if(parseInt($('#loadedAmount'+i).val()) > parseInt($('#recycleAmount'+i).val())){
-                            	        		 $('#recycleAmount'+i).val(parseInt($('#loadedAmount'+i).val()));
-                            	        	 }
-                            	        	 addErrorDamageRemark(ti,i);
-                            	        	 loadUnSupplementMaterial(msg,i,ti.barcode);
-                            	         }
-                            	     });
-                                	 if(!tousseIsExist){
-                                		 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: 1,
-                            						isCleanedEntirely: td.isCleanedEntirely,
-                            						tousseType: td.type,
-                            						isThereIdentificationCard: '是',
-                            						isApplyEntireTousse: td.isApplyEntireTousse,
-                            						urgentAmount : 0,
-                            						tousseRemark:'',
-                            						errorDamageQmKey : errorDamageQmKey,
-                            						barcode : ti.barcode
-                            			 };
-                                		 addToussItem(toussItem,sstsConfig.addTousseAtLastForRecycle);
-                                		 addBindGoods(toussItem,sstsConfig.addTousseAtLastForRecycle);
-                                		 //清除已删除的包
-                                		 cleanDeleteTousseItem(td.id);
-                                		 addErrorDamageRemark(ti,tmpRow);
-                                		 //未补充的丢失报损
-                 	   	                 loadUnSupplementMaterial(msg,tmpRow,ti.barcode);
-                                	 }
-                                	 noticeIdCardUseAmount(msg.idCardUseAmount);
-                                	 if(msg.isTousseNeedMaintain != null && msg.isTousseNeedMaintain == true){
-                                		 alertDiv('\'' + msg.tousseInstance.tousseDefinition.name + '\'' + '需要保养了.');
-                                	 }
-                                	 refreshAllBasketTotalNum();
-                            	 }
-                            	 
+                            	 var loadedAmount = tousseIntoBasketFunction("",td.id,td.name,1,td.isCleanedEntirely,orgUnitName,barcode,"",td.tousseType,-1,'否',3,msg);
+								  
                             	//记住扫描的标志牌
                             	 $('#tousseItemTable').children().first().children().each(function(i,element){
                         	         if($('#tousseName'+i).val() == td.name && $('#deleted'+i).val() == '0'){
@@ -2573,7 +2481,7 @@
  * @param idCardBarcode
  * @returns {Number}
  */
-function tousseIntoBasketFunction(tousseInstanceId,tousseDefinitionID,tousseName,recycleAmount,isCleanedEntirely,orgUnitName,idCardBarcode,tousseInstanceBarcode,tousseType,row,isIDCard){
+function tousseIntoBasketFunction(tousseInstanceId,tousseDefinitionID,tousseName,recycleAmount,isCleanedEntirely,orgUnitName,idCardBarcode,tousseInstanceBarcode,tousseType,row,isIDCard,callbackType,msgObj){
 	var params = getScanedGoods(isCleanedEntirely);
 	newAmount = 0;
 	if(params.length <=0){
@@ -2611,7 +2519,7 @@
 					if(!isDelete){
 						dialogConfirm(tousseName+"已装配"+packAmount+"个，已发货"+invoiceAmount+"个，修改后回收的数量为"+recycleAmountNew+"，要修改会导致待装配任务被删除，您确认要修改吗？",function(){
 							isDelete = true;
-							tousseIntoBasketFunction(tousseInstanceId,tousseDefinitionID,tousseName,recycleAmount,isCleanedEntirely,orgUnitName,idCardBarcode,tousseInstanceBarcode,tousseType,row);
+							tousseIntoBasketFunction(tousseInstanceId,tousseDefinitionID,tousseName,recycleAmount,isCleanedEntirely,orgUnitName,idCardBarcode,tousseInstanceBarcode,tousseType,row,isIDCard,callbackType,msgObj);
 							refreshAllBasketTotalNum()
 						},function(){
 							isDelete = false;
@@ -2715,19 +2623,19 @@
 											json.amount = recycleCount;
 											$(this).val(JSON.stringify(json));
 											deleteBasketItem(delButton,count);
-											return;
+											return false;
 										}else {
 											json.amount = 0-count;
 											$(this).val(JSON.stringify(json));
 											deleteBasketItem(delButton,0);
 											recycleCount1 = recycleCount;
+											return false;
 										}
 									}
 								}
 							}
 						}
 					});
-
 					if(recycleCount1 < 0){
 						$("#basketsUl li").eq(0).find('dl').children().each(function(i,element){
 							if($(this).attr('type') == 'hidden'){
@@ -2857,6 +2765,109 @@
 			}
 			refreshAllBasketTotalNum()
 		}
+		if(callbackType == 1){
+			refreshAllBasketTotalNum();
+		}else if(callbackType == 2){
+			var ti = msgObj.tousseInstance;
+			var td = ti.tousseDefinition;
+			if(loadedAmount > 0){
+				var tousseIsExist2 = false;
+				$('#tousseItemTable').children().first().children().each(function(i,element){
+					if($('#tousseName'+i).val() == td.name && $('#deleted'+i).val() == '0'){
+						tousseIsExist2 = true;
+						$('#loadedAmount'+i).val(loadedAmount + parseInt($('#loadedAmount'+i).val(),10));
+						$('#tousseOrIDCardInstanceBarcodes'+i).val(appendBarcodes($('#tousseOrIDCardInstanceBarcodes'+i).val(), ti.barcode));
+						if(parseInt($('#loadedAmount'+i).val()) > parseInt($('#recycleAmount'+i).val())){
+							$('#recycleAmount'+i).val(parseInt($('#loadedAmount'+i).val()));
+						}
+						addErrorDamageRemark(ti,i);
+						loadUnSupplementMaterial(msgObj,i,ti.barcode);
+					}
+				});
+				if(!tousseIsExist2){
+					 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: 1,
+						isCleanedEntirely: td.isCleanedEntirely,
+						tousseType: td.type,
+						isThereIdentificationCard: '否',
+						isApplyEntireTousse: td.isApplyEntireTousse,
+						urgentAmount : 0,
+						tousseRemark:'',
+						errorDamageQmKey : errorDamageQmKey,
+						barcode : ti.barcode
+					 };
+					 addToussItem(toussItem,sstsConfig.addTousseAtLastForRecycle);
+					 addBindGoods(toussItem,sstsConfig.addTousseAtLastForRecycle);
+					 //清除已删除的包
+					 cleanDeleteTousseItem(td.id);
+					 addErrorDamageRemark(ti,tmpRow);
+					 //未补充的丢失报损
+					loadUnSupplementMaterial(msgObj,tmpRow,ti.barcode);
+				}									
+				refreshAllBasketTotalNum();
+			}
+		}else if(callbackType == 3){
+			var ti = msgObj.tousseInstance;
+			var td = ti.tousseDefinition;
+			if(loadedAmount >= 0){
+				var tousseIsExist = false;
+				$('#tousseItemTable').children().first().children().each(function(i,element){
+					if($('#tousseName'+i).val() == td.name && $('#deleted'+i).val() == '0'){
+						tousseIsExist = true;
+						$('#loadedAmount'+i).val(loadedAmount + parseInt($('#loadedAmount'+i).val(),10));
+						$('#tousseOrIDCardInstanceBarcodes'+i).val(appendBarcodes($('#tousseOrIDCardInstanceBarcodes'+i).val(), ti.barcode));
+						if(parseInt($('#loadedAmount'+i).val()) > parseInt($('#recycleAmount'+i).val())){
+							$('#recycleAmount'+i).val(parseInt($('#loadedAmount'+i).val()));
+						}
+						addErrorDamageRemark(ti,i);
+						loadUnSupplementMaterial(msgObj,i,ti.barcode);
+					}
+				});
+				if(!tousseIsExist){
+					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: 1,
+							   isCleanedEntirely: td.isCleanedEntirely,
+							   tousseType: td.type,
+							   isThereIdentificationCard: '是',
+							   isApplyEntireTousse: td.isApplyEntireTousse,
+							   urgentAmount : 0,
+							   tousseRemark:'',
+							   errorDamageQmKey : errorDamageQmKey,
+							   barcode : ti.barcode
+					};
+					addToussItem(toussItem,sstsConfig.addTousseAtLastForRecycle);
+					addBindGoods(toussItem,sstsConfig.addTousseAtLastForRecycle);
+					//清除已删除的包
+					cleanDeleteTousseItem(td.id);
+					addErrorDamageRemark(ti,tmpRow);
+					//未补充的丢失报损
+						loadUnSupplementMaterial(msgObj,tmpRow,ti.barcode);
+				}
+				noticeIdCardUseAmount(msgObj.idCardUseAmount);
+				if(msgObj.isTousseNeedMaintain != null && msgObj.isTousseNeedMaintain == true){
+					alertDiv('\'' + msgObj.tousseInstance.tousseDefinition.name + '\'' + '需要保养了.');
+				}
+				refreshAllBasketTotalNum();
+			}
+		}
 	});
 	DWREngine.setAsync(true);
     return loadedAmount;
@@ -2954,10 +2965,8 @@
         if(amount == 0){
             alertDiv('没有可以放入篮筐的器械包。');
         }else{
-			var loadedAmount = tousseIntoBasketFunction("",tousseDefinitionID,tousseName,amount,isCleanedEntirely,orgUnitName,"","",tousseType,row,isIDCard);
+			var loadedAmount = tousseIntoBasketFunction("",tousseDefinitionID,tousseName,amount,isCleanedEntirely,orgUnitName,"","",tousseType,row,isIDCard,1,{});
 			newAmount = 0;
-			
-			refreshAllBasketTotalNum();
 		}
 		setTousseItemLoadedAmountCss(row);
 		addAllBasketTotalNum();
@@ -3610,8 +3619,8 @@
 	var newTousseArray = [];
 	var length = splitTousseArray2.length;
 	if(length > 0){
-		var k=0;
 		for(var j=0;j<length;j++){
+			var k=0;
 			var tousseName = splitTousseArray2[j].tousseName;
 			var amount = splitTousseArray2[j].amount;
 			var depart = splitTousseArray2[j].depart;