Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationMergeInvoiceForm.js
===================================================================
diff -u -r18491 -r25674
--- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationMergeInvoiceForm.js	(.../operationReservationMergeInvoiceForm.js)	(revision 18491)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationMergeInvoiceForm.js	(.../operationReservationMergeInvoiceForm.js)	(revision 25674)
@@ -719,6 +719,14 @@
 					}
 				}
 				
+				// 是否需要弹窗让用户确认
+				if (result.needConfirm){
+					if (!confirm(result.confirmMessage)){
+						continue;
+					}
+				}
+				
+				// 增加物品到已扫描列表
 				addGoods(goods,record,speakBasket);
 			  }