Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
===================================================================
diff -u -r30501 -r31886
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js	(.../foreignProxyDisinfectionView.js)	(revision 30501)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js	(.../foreignProxyDisinfectionView.js)	(revision 31886)
@@ -492,23 +492,39 @@
 			top.Ext.getCmp("remark").setValue(remark);
 		}else if(returnType == "scanBasketFoundNotDeliverTousseInContainer"){
 			var notDeliverTousseAmount = obj.notDeliverTousseAmount;
-			top.Ext.MessageBox.confirm("请确认","【"+obj.containerName+"】内有"+notDeliverTousseAmount+"个未发货的包，继续使用会导致不能扫描篮筐条码发货，是否继续？",function(button, text) {
-				if ("yes" == button){
-					top.Ext.getCmp("basketName").setValue(obj.containerName);
-					top.Ext.getCmp("basketBarcode1").setValue(barcode);
-					
-					for ( var i = 0; i < foreignItemStore.getCount(); i++) {
-						var record = foreignItemStore.getAt(i);
-						if(record.get('basketBarcode') == "" || record.get('basketName') == ""){
-							record.set("basketBarcode",barcode);
-							record.set("basketName",obj.containerName);
-						}
+			if(sstsConfig.disableGoodsNotShippedAlert){
+				top.Ext.getCmp("basketName").setValue(obj.containerName);
+				top.Ext.getCmp("basketBarcode1").setValue(barcode);
+				
+				for ( var i = 0; i < foreignItemStore.getCount(); i++) {
+					var record = foreignItemStore.getAt(i);
+					if(record.get('basketBarcode') == "" || record.get('basketName') == ""){
+						record.set("basketBarcode",barcode);
+						record.set("basketName",obj.containerName);
 					}
-					var remark = top.Ext.getCmp("remark").getValue();
-					remark = barcode+";"+remark;
-					top.Ext.getCmp("remark").setValue(remark);
 				}
-			})
+				var remark = top.Ext.getCmp("remark").getValue();
+				remark = barcode+";"+remark;
+				top.Ext.getCmp("remark").setValue(remark);
+			}else {
+				top.Ext.MessageBox.confirm("请确认","【"+obj.containerName+"】内有"+notDeliverTousseAmount+"个未发货的包，继续使用会导致不能扫描篮筐条码发货，是否继续？",function(button, text) {
+					if ("yes" == button){
+						top.Ext.getCmp("basketName").setValue(obj.containerName);
+						top.Ext.getCmp("basketBarcode1").setValue(barcode);
+						
+						for ( var i = 0; i < foreignItemStore.getCount(); i++) {
+							var record = foreignItemStore.getAt(i);
+							if(record.get('basketBarcode') == "" || record.get('basketName') == ""){
+								record.set("basketBarcode",barcode);
+								record.set("basketName",obj.containerName);
+							}
+						}
+						var remark = top.Ext.getCmp("remark").getValue();
+						remark = barcode+";"+remark;
+						top.Ext.getCmp("remark").setValue(remark);
+					}
+				})
+			}
 		}else{
 			showResult("找不到该篮筐。");
 		}
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.js
===================================================================
diff -u -r31679 -r31886
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.js	(.../proxyDisinfectionView.js)	(revision 31679)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.js	(.../proxyDisinfectionView.js)	(revision 31886)
@@ -788,40 +788,73 @@
 								return false;
 							}
 							if(notDeliverTousseAmount > 0){
-								top.Ext.MessageBox.confirm("请确认","【"+result.containerName+"】内有"+notDeliverTousseAmount+"个未发货的包，继续使用会导致不能扫描篮筐条码发货，是否继续？",function(button, text) {
-									if ("yes" == button){
-										top.Ext.getCmp('basketBarcode').setValue(barcode);
-										var remark = top.Ext.getCmp('remark').getValue();
-										remark = barcode+";"+remark;
-										top.Ext.getCmp('remark').setValue(remark);
-										top.Ext.getCmp('reviewedBasketId').setValue(result.basketId);
-										top.Ext.getCmp('basketName').setValue(result.containerName);
-										
-										var orgUnitCode = result.produceDeptCode;
-										var orgUnitName = result.produceDeptName;
-										if(currentDepartCoding != orgUnitCode){
-											var departCodingCmp = top.Ext.getCmp('departCoding');
-											if(departCodingCmp.getValue() == ''){
-												departCodingCmp.setValue(orgUnitCode);
-												top.Ext.getCmp('depart').setValue(orgUnitName);
-												bindTousseToBaseket(result.basketId,barcode,result.containerName,result.instances);									
-											}else if(departCodingCmp.getValue() != orgUnitCode){
-												top.Ext.MessageBox.confirm("请确认","该灭菌筐属于"+orgUnitName+",是否将申请科室改为"+orgUnitName+"并清空器械包明细列表?",
-													function(button, text) {
-														if ("yes" == button){
-															departCodingCmp.setValue(orgUnitCode);
-															top.Ext.getCmp('depart').setValue(orgUnitName);
-															clearGoodsGrid();
-															bindTousseToBaseket(result.basketId,barcode,result.containerName,result.instances);
-														}
+								if(sstsConfig.disableGoodsNotShippedAlert){
+									top.Ext.getCmp('basketBarcode').setValue(barcode);
+									var remark = top.Ext.getCmp('remark').getValue();
+									remark = barcode+";"+remark;
+									top.Ext.getCmp('remark').setValue(remark);
+									top.Ext.getCmp('reviewedBasketId').setValue(result.basketId);
+									top.Ext.getCmp('basketName').setValue(result.containerName);
+									
+									var orgUnitCode = result.produceDeptCode;
+									var orgUnitName = result.produceDeptName;
+									if(currentDepartCoding != orgUnitCode){
+										var departCodingCmp = top.Ext.getCmp('departCoding');
+										if(departCodingCmp.getValue() == ''){
+											departCodingCmp.setValue(orgUnitCode);
+											top.Ext.getCmp('depart').setValue(orgUnitName);
+											bindTousseToBaseket(result.basketId,barcode,result.containerName,result.instances);									
+										}else if(departCodingCmp.getValue() != orgUnitCode){
+											top.Ext.MessageBox.confirm("请确认","该灭菌筐属于"+orgUnitName+",是否将申请科室改为"+orgUnitName+"并清空器械包明细列表?",
+												function(button, text) {
+													if ("yes" == button){
+														departCodingCmp.setValue(orgUnitCode);
+														top.Ext.getCmp('depart').setValue(orgUnitName);
+														clearGoodsGrid();
+														bindTousseToBaseket(result.basketId,barcode,result.containerName,result.instances);
 													}
-												);
-											}else{
-												bindTousseToBaseket(result.basketId,barcode,result.containerName,result.instances);
-											}
+												}
+											);
+										}else{
+											bindTousseToBaseket(result.basketId,barcode,result.containerName,result.instances);
 										}
 									}
-								});
+								}else {
+									top.Ext.MessageBox.confirm("请确认","【"+result.containerName+"】内有"+notDeliverTousseAmount+"个未发货的包，继续使用会导致不能扫描篮筐条码发货，是否继续？",function(button, text) {
+										if ("yes" == button){
+											top.Ext.getCmp('basketBarcode').setValue(barcode);
+											var remark = top.Ext.getCmp('remark').getValue();
+											remark = barcode+";"+remark;
+											top.Ext.getCmp('remark').setValue(remark);
+											top.Ext.getCmp('reviewedBasketId').setValue(result.basketId);
+											top.Ext.getCmp('basketName').setValue(result.containerName);
+											
+											var orgUnitCode = result.produceDeptCode;
+											var orgUnitName = result.produceDeptName;
+											if(currentDepartCoding != orgUnitCode){
+												var departCodingCmp = top.Ext.getCmp('departCoding');
+												if(departCodingCmp.getValue() == ''){
+													departCodingCmp.setValue(orgUnitCode);
+													top.Ext.getCmp('depart').setValue(orgUnitName);
+													bindTousseToBaseket(result.basketId,barcode,result.containerName,result.instances);									
+												}else if(departCodingCmp.getValue() != orgUnitCode){
+													top.Ext.MessageBox.confirm("请确认","该灭菌筐属于"+orgUnitName+",是否将申请科室改为"+orgUnitName+"并清空器械包明细列表?",
+														function(button, text) {
+															if ("yes" == button){
+																departCodingCmp.setValue(orgUnitCode);
+																top.Ext.getCmp('depart').setValue(orgUnitName);
+																clearGoodsGrid();
+																bindTousseToBaseket(result.basketId,barcode,result.containerName,result.instances);
+															}
+														}
+													);
+												}else{
+													bindTousseToBaseket(result.basketId,barcode,result.containerName,result.instances);
+												}
+											}
+										}
+									});
+								}
 							}else {
 								top.Ext.getCmp('basketBarcode').setValue(barcode);
 								var remark = top.Ext.getCmp('remark').getValue();
Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
===================================================================
diff -u -r30859 -r31886
--- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js	(.../reviewView.js)	(revision 30859)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js	(.../reviewView.js)	(revision 31886)
@@ -2029,29 +2029,51 @@
 											var notDeliverTousseAmount = obj.notDeliverTousseAmount || 0;
 											var basketName = Ext.getCmp("basketName").getValue();
 											var basketBarcode = Ext.getCmp("basketBarcodes").getValue();
-											Ext.MessageBox.confirm("请确认","【"+obj.containerName+"】内有"+notDeliverTousseAmount+"个未发货的包，继续使用会导致不能扫描篮筐条码发货，是否继续？",function(button, text) {
-												if ("yes" == button){
-													var basketName = Ext.getCmp("basketName").getValue();
-													var basketBarcode = Ext.getCmp("basketBarcodes").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);
-																	
-																}
-															});
-														}
+											if(sstsConfig.disableGoodsNotShippedAlert){
+												var basketName = Ext.getCmp("basketName").getValue();
+												var basketBarcode = Ext.getCmp("basketBarcodes").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('basketBarcodes').setValue(barcode);
-													Ext.getCmp('barcodes').setValue('');
-													Ext.getCmp('barcodes').focus();
-													speaker.speak(obj.containerName);
 												}
-											});
+												Ext.getCmp("basketName").setValue(obj.containerName);
+												Ext.getCmp('basketBarcodes').setValue(barcode);
+												Ext.getCmp('barcodes').setValue('');
+												Ext.getCmp('barcodes').focus();
+												speaker.speak(obj.containerName);
+											}else {
+												Ext.MessageBox.confirm("请确认","【"+obj.containerName+"】内有"+notDeliverTousseAmount+"个未发货的包，继续使用会导致不能扫描篮筐条码发货，是否继续？",function(button, text) {
+													if ("yes" == button){
+														var basketName = Ext.getCmp("basketName").getValue();
+														var basketBarcode = Ext.getCmp("basketBarcodes").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('basketBarcodes').setValue(barcode);
+														Ext.getCmp('barcodes').setValue('');
+														Ext.getCmp('barcodes').focus();
+														speaker.speak(obj.containerName);
+													}
+												});
+											}
 										}else {
 											showResult(""+reviewViewText+"入筐只能使用灭菌筐。" , null , sstsConfig.messagePauseTimeOnReviewPage);
 											clearBarcodeAndBasketName();