Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js
===================================================================
diff -u -r25681 -r26083
--- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js	(.../operationReservationInvoiceView.js)	(revision 25681)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js	(.../operationReservationInvoiceView.js)	(revision 26083)
@@ -714,25 +714,32 @@
 //					continue;
 				}
 				
-				if (goods.noBiologicalMonitoring && (goods.tousseType == '外来器械包' || goods.tousseType == '外来器械拆分小包')) {  //此外来器械包没做生物监测（cjr）
-					if (!confirm('[' + goods.name + ']没做生物监测，确定要发货吗？')){
-						continue;
-					}
-				}
 				
-				if (goods.isRoutine == '否'){  //此外来器械包正在做生物监测（cjr）
-					if (!confirm('[' + goods.name + ']正在做生物监测的器械包，需要紧急发货吗？')){
-						continue;
-					}
+				// 是否有错误信息
+				if (goods.errorMsg){
+					showResult(goods.errorMsg);
+					continue;
 				}
+
 				
+				// 是否到继续下一个循环
+				var isContinue = false;
+				
 				// 是否需要弹窗让用户确认
-				if (result.needConfirm){
-					if (!confirm(result.confirmMessage)){
-						continue;
+				if (goods.confirmMsgs){
+					for (var ii =0 ;ii < goods.confirmMsgs.length; ii++){
+						// 如果用户选择不继续操作，则跳出本循环，并且跳出上一层循环
+						if (!confirm(goods.confirmMsgs[ii])){
+							isContinue = true;
+							break;
+						}
 					}
 				}
 				
+				if (isContinue){
+					continue;
+				}
+				
 				// 增加物品到已扫描列表
 				addGoods(goods,speakBasket);
 			  }