Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
===================================================================
diff -u -r28608 -r29495
--- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js	(.../reviewView.js)	(revision 28608)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js	(.../reviewView.js)	(revision 29495)
@@ -1820,7 +1820,7 @@
 										}
 									}else if(returnType == "noResult"){//无结果输出
 										showResult("无符合条件的器械包。" , null , sstsConfig.messagePauseTimeOnReviewPage);
-									} else if(returnType=="containerSuccess"){//扫描的是篮筐
+									}else if(returnType=="containerSuccess"){//扫描的是篮筐
 										if(containerType == '灭菌筐'){
 											var basketName = Ext.getCmp("basketName").getValue();
 											var basketBarcode = Ext.getCmp("basketBarcode").getValue();
@@ -1845,6 +1845,38 @@
 											clearBarcodeAndBasketName();
 										}
 										
+									}else if(returnType == "scanBasketFoundNotDeliverTousseInContainer"){
+										if(containerType == '灭菌筐'){
+											var notDeliverTousseAmount = obj.notDeliverTousseAmount || 0;
+											var basketName = Ext.getCmp("basketName").getValue();
+											var basketBarcode = Ext.getCmp("basketBarcode").getValue();
+											Ext.MessageBox.confirm("请确认","【"+obj.containerName+"】内有"+notDeliverTousseAmount+"个未发货的包，继续使用会导致不能扫描篮筐条码发货，是否继续？",function(button, text) {
+												if ("yes" == button){
+													var basketName = Ext.getCmp("basketName").getValue();
+													var basketBarcode = Ext.getCmp("basketBarcode").getValue();
+													//说明在扫描之前已经扫描了另外一个篮筐，此时弹出提示询问用户是否审核上一次扫描的篮筐中的器械包
+													if(basketName!=null && basketName!='' && basketBarcode!=null && basketBarcode!=''){
+														var forReviewData = Ext.getCmp('forReviewGrid').getStore();
+														if(forReviewData!=null && forReviewData.getCount()>0){
+															Ext.Msg.confirm(""+reviewViewText+"确认","系统检测到您已扫描过["+basketName+"]，是否要"+reviewViewText+"["+basketName+"]？",function(btn){
+																if(btn=='yes'){
+																	reviewTousse(basketName,basketBarcode);
+																	
+																}
+															});
+														}
+													}
+													Ext.getCmp("basketName").setValue(obj.containerName);
+													Ext.getCmp('basketBarcode').setValue(barcode);
+													Ext.getCmp('barcode').setValue('');
+													Ext.getCmp('barcode').focus();
+													speaker.speak(obj.containerName);
+												}
+											});
+										}else {
+											showResult(""+reviewViewText+"入筐只能使用灭菌筐。" , null , sstsConfig.messagePauseTimeOnReviewPage);
+											clearBarcodeAndBasketName();
+										}
 									}else{
 										showResult(obj.message , null , sstsConfig.messagePauseTimeOnReviewPage);
 									}