Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp
===================================================================
diff -u -r25741 -r27504
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp	(.../addTousse.jsp)	(revision 25741)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp	(.../addTousse.jsp)	(revision 27504)
@@ -12,10 +12,19 @@
 <script src="js/jquery-min.js" type="text/javascript"></script>
 <script type="text/javascript" src="commonRecycle.js"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
+<script src="${ctx}/disinfectsystem/touchScreen/recycle/alertDiv/CJL.0.1.min.js"></script>
+<script src="${ctx}/disinfectsystem/touchScreen/recycle/alertDiv/AlertBox.js"></script>
+<style>
+	.lightbox{width:400px;background:#FFFFFF;border:5px solid #ccc;line-height:35px;display:none; margin:0;}
+	.lightbox dt{background:#f4f4f4;padding:5px;}
+	.lightbox dd{ padding:20px; margin:0;}
+</style>
 <script>
 var countOfLI = 10;//定义出现多少个li标签
 var amount = 10;//定义出现多少个li标签
 var pages = 1;
+var ab;
+var lock = false;
 //动态加载JS和CSS
 document.write('<link href="${ctx}/disinfectsystem/touchScreen/recycle/${param.resolution}/images/style.css" rel="stylesheet" type="text/css" />');
 	function closeLayer(){
@@ -32,6 +41,46 @@
 			  parent.layer.close(index);
 		  }
 	}
+	
+	//锁定键盘
+	function lockup(e){ e.preventDefault(); }
+	//高亮层不锁定
+	function lockout(e){ e.stopPropagation(); }
+
+	function alertDiv(alertWord,hideCloseButton,showOtherButton){
+		lock = true;
+		document.getElementById ("showWord").innerHTML = alertWord;
+		if(typeof(hideCloseButton) != 'undefined' && hideCloseButton){
+			$('#idBoxClose').hide();
+		}else{
+			$('#idBoxClose').show();
+		}
+		if(showOtherButton){
+			$('#idBoxCenterUserType').show();
+		}else{
+			$('#idBoxCenterUserType').hide();
+		}
+		ab = new AlertBox("idBox");
+		ab.onShow = function(){
+			if ( lock ) {
+				$$E.addEvent( document, "keydown", lockup );
+				$$E.addEvent( this.box, "keydown", lockout );
+				OverLay.show();
+			}
+		};
+		ab.onClose = function(){
+			$$E.removeEvent( document, "keydown", lockup );
+			$$E.removeEvent( this.box, "keydown", lockout );
+			OverLay.close();
+		};
+		
+		ab.center = true;
+		ab.show();
+	}
+
+	function closeDiv(){
+		ab.close();
+	}
   
    function addToussItem(tousseDefinitionId,tousseName,isApplyEntireTousse,isCleanedEntirely,tousseType,isThereIdentificationCard,spelling){
 	   var row = window.parent.document.getElementById("tousseItemTable").rows.length;
@@ -55,11 +104,12 @@
        };
 	   if(window.parent.addToussItem(toussItem,sstsConfig.addTousseAtLastForRecycle)){
 		   window.parent.highlightExistTousseItem(row);
+	   }else {
+			alertDiv(tousseName + "，回收列表已存在！");
 	   }
 	   //已删除又添加该物品jsonArray处理
 	   window.parent.cleanDeleteTousseItem(tousseDefinitionId);
 	   window.parent.addBindGoods(toussItem,sstsConfig.addTousseAtLastForRecycle);
-	   closeLayer();
    }
  
    /**
@@ -269,7 +319,20 @@
         <li><a href="javascript:void(0);"></a></li> -->
 	  </ul>
   </div>
-  
+  <dl id="idBox" class="lightbox" style="top:10%;left:5%;">
+    <dt><b style="font-size:20px">提示信息</b> </dt>
+    <dd>
+        <span id="showWord" style="font-size:35px">条码长度不符合规范！</span>
+        <br/>
+        <center id="idBoxCenterClose">
+            <input type="button" onclick="closeDiv();" style="width:100px;text-align:center;height:50px;font-size:18px;" value=" X " id="idBoxClose" />
+        </center>
+        <center id="idBoxCenterUserType" style="display:none;">
+            <input type="button" onclick="selectRecyclingUser();closeDiv();" style="width:100px;text-align:center;height:50px;font-size:18px;" value="回收人员" />
+            <input type="button" onclick="selectOperator();closeDiv();" style="width:100px;text-align:center;height:50px;font-size:18px;" value="清点人员" />			 
+        </center>
+    </dd>
+</dl>
 </div>
 </body>
 </html>
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r27482 -r27504
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 27482)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 27504)
@@ -2614,7 +2614,6 @@
          if(($('#tousseDefinitionID'+i).val() == tousseDefinitionID)||(tousseType == '消毒物品' && $('#tousseName'+i).val() == tousseName)){
         	 //显示的列表中是否有该器械包
         	 if($('#deleted'+i).val() == '0'){
-        		 alertDiv(tousseName + "，回收列表已存在！");
                  b = false;
                  highlightExistTousseItem(i);
              //删除后再添加该消毒物品，删除的项还原，原因是添加的消毒物品包定义和申请项的包定义不一样