Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r29652 -r29654
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 29652)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 29654)
@@ -3241,9 +3241,13 @@
 				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
+				if(sessionTousseInstance[item]){
+					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,{});
+					}
 				}else {
 					tousseIntoBasketFunction("",tousseDefinitionID,tousseName,amount,isCleanedEntirely,orgUnitName,"","",tousseType,row,isIDCard,1,{});
 				}
@@ -6631,4 +6635,39 @@
 			}
 		}
 	})
-}
\ No newline at end of file
+}
+/**
+BJ307YY-35：扫描包实例条码思路注释
+扫描包实例条码：
+if('器械包是否存在' == '是'){
+	if('包实例是否存在' == '是'){
+		return '提示：该实例条码已经在回收列表中';
+	}else {
+		if('器械包是否已入筐' == '是'){
+			if('回收数量' > '装载数量'){
+				if('包实例是否全部入筐' == '是'){
+					return '回收数量不变';
+				}else {
+					if('未回收的数量' > '未入筐的包实例条码的数量'){
+						return '回收数量不变';
+					}else {
+						return '回收数量+1';
+					}
+				}
+			}else if('回收数量' == '装载数量'){
+				return '回收数量+1';
+			}else {
+				return '回收数量不变';
+			}
+		}else {
+			if('回收数量' > '包实例条码的数量'){
+				return '回收数量不变';
+			}else {
+				return '回收数量+1';
+			}
+		}
+	}
+}else {
+	return '添加器械包，回收数量+1';
+}
+*/
\ No newline at end of file