Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r25665 -r25670
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 25665)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 25670)
@@ -1811,14 +1811,10 @@
 			type = src.get("type").getAsString();
 		}
 		
-		if (src.has("needConfirmForPC")){
-			result.addProperty("needConfirmForPC", src.get("needConfirmForPC").getAsBoolean());
+		if (src.has("needConfirm")){
+			result.addProperty("needConfirm", src.get("needConfirm").getAsBoolean());
 		}
 		
-		if (src.has("needConfirmForPDA")){
-			result.addProperty("needConfirmForPDA", src.get("needConfirmForPDA").getAsBoolean());
-		}
-		
 		if (src.has("confirmMessage")){
 			result.addProperty("confirmMessage", src.get("confirmMessage").getAsString());
 		}
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
===================================================================
diff -u -r25665 -r25670
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 25665)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 25670)
@@ -1140,7 +1140,7 @@
 				}
 				
 				// 在PC端需要弹窗让用户确认
-				if (result.needConfirmForPC){
+				if (result.needConfirm){
 					if (!confirm(result.confirmMessage)){
 						continue;
 					}
Index: ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js
===================================================================
diff -u -r25667 -r25670
--- ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js	(.../config.js)	(revision 25667)
+++ ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js	(.../config.js)	(revision 25670)
@@ -155,10 +155,8 @@
   //enableExpressIntoContainer: true,
   //是否启用清点确认按钮 (true为启用,false或者不配置都不启用)
   //enbaleCheckToConfirm:true,
-  //是否启用存在更早失效物品的PC端的弹窗确认提示
-  enableExistEarlierExpirationGoodsConfirmDialogForPC:true,
-  //是否启用存在更早失效物品的PDA端的弹窗确认提示
-  enableExistEarlierExpirationGoodsConfirmDialogForPDA:true,
+  //存在更早失效物品的提示方式
+  existEarlierExpirationGoodsAlertMode:1,
   //标识牌打印显示包名和编号
   printIdCardNameWithIdNumber:true,
   //是否显示设备接口菜单（true:不显示 false:显示）
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r25665 -r25670
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 25665)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 25670)
@@ -5567,15 +5567,12 @@
 					return buildErrorMsgJsonResult(tousseNameAndBarcode+"已过期",tousseInstance);
 				}
 				
-				// 是否启用存在更早失效物品的PC端的弹窗确认提示
-				Boolean enableExistEarlierExpirationGoodsConfirmDialogForPC = CssdUtils.getSystemSetConfigByNameBool("enableExistEarlierExpirationGoodsConfirmDialogForPC");
-				// 是否启用存在更早失效物品的PC端的弹窗确认提示
-				Boolean enableExistEarlierExpirationGoodsConfirmDialogForPDA = CssdUtils.getSystemSetConfigByNameBool("enableExistEarlierExpirationGoodsConfirmDialogForPDA");
+				// 存在更早失效物品的提示方式
+				Integer existEarlierExpirationGoodsAlertMode = CssdUtils.getSystemSetConfigByNameInt("existEarlierExpirationGoodsAlertMode" , 0);
 				
 				// 查询是否有失效日期更早，但是还没过失效期的器械包，提示用户是否优先发放该物品
-				String confirmMessage = isExistEarlierExpirationGoods(tousseInstance,
-						enableExistEarlierExpirationGoodsConfirmDialogForPC,
-						enableExistEarlierExpirationGoodsConfirmDialogForPDA);
+				String existEarlierExpirationGoodsMessage = isExistEarlierExpirationGoods(tousseInstance,
+						existEarlierExpirationGoodsAlertMode);
 				
 				
 				// 判断物品是否处于告警期
@@ -5612,21 +5609,20 @@
 				JsonObject dataJSONObject = buildJSONObjectForTousseInstance(tousseInstance);
 				result.add("data", dataJSONObject);
 				logScannedTousse(dataJSONObject);
-				result.add("tips", tips);
 				
 				// 如果需要用户确认，返回额外的信息
-				if (StringUtils.isNotBlank(confirmMessage)){
-					// PC端是否需要弹出确认框
-					if (enableExistEarlierExpirationGoodsConfirmDialogForPC){
-						result.addProperty("needConfirmForPC", true);
+				if (StringUtils.isNotBlank(existEarlierExpirationGoodsMessage)){
+					if (existEarlierExpirationGoodsAlertMode == 1){
+						result.addProperty("needConfirm", true);
+						result.addProperty("confirmMessage", existEarlierExpirationGoodsMessage);
 					}
-					// PDA端是否需要弹出确认框
-					if (enableExistEarlierExpirationGoodsConfirmDialogForPDA){
-						result.addProperty("needConfirmForPDA", true);
+					else if (existEarlierExpirationGoodsAlertMode == 2){
+						tips.add(new JsonPrimitive(existEarlierExpirationGoodsMessage));
 					}
-					result.addProperty("confirmMessage", confirmMessage);
 				}
 				
+				result.add("tips", tips);
+				
 				return result;
 			}else{
 				//如果存在器械包实例条码(尾)
@@ -6030,24 +6026,22 @@
 	 * 如果存在，则返回确认提示信息，提示用户同名的最早过期的包的日期。
 	 * 
 	 * @param tousseInstance 扫描的器械包实例
-	 * @param enableExistEarlierExpirationGoodsConfirmDialogForPC
-	 * @param enableExistEarlierExpirationGoodsConfirmDialogForPDA
+	 * @param existEarlierExpirationGoodsAlertMode 0：不提醒；1：通过确认筐提醒；2：消息提示
 	 * @return 需要确认的消息文本。如果没有需要确认的消息，则返回空值
 	 */
 	private String isExistEarlierExpirationGoods(
 			final TousseInstance tousseInstance,
-			Boolean enableExistEarlierExpirationGoodsConfirmDialogForPC,
-			Boolean enableExistEarlierExpirationGoodsConfirmDialogForPDA) {
+			Integer existEarlierExpirationGoodsAlertMode) {
 		
-		String confirmMessage = "";
+		String existEarlierExpirationGoodsMessage = "";
 		
 		// 如果不是器械包类型，不进行判断
 		if (!TousseDefinition.PACKAGE_TYPE_INSIDE.equals(tousseInstance.getType())){
-			return confirmMessage;
+			return existEarlierExpirationGoodsMessage;
 		}
 		
 		// 查询是否存在同名字的更早失效的物品
-		if (enableExistEarlierExpirationGoodsConfirmDialogForPC || enableExistEarlierExpirationGoodsConfirmDialogForPDA){
+		if (existEarlierExpirationGoodsAlertMode > 0){
 			
 			Session session = objectDao.getHibernateSession();
 			
@@ -6085,11 +6079,16 @@
 				
 				String expireDate = earlistTousseInstance.getValidUntilStr(ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDD);
 				
-				confirmMessage = "有" + expireDate + "过期的" + tousseName + "，是否继续发放本物品？";
+				if (existEarlierExpirationGoodsAlertMode == 1){
+					existEarlierExpirationGoodsMessage = "有" + expireDate + "过期的" + tousseName + "，是否继续发放本物品?";
+				}
+				else{
+					existEarlierExpirationGoodsMessage = "有" + expireDate + "过期的" + tousseName + "!";
+				}
 			}
 
 		}
-		return confirmMessage;
+		return existEarlierExpirationGoodsMessage;
 	}
 	
 	@Override