Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r26094 -r26128
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 26094)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 26128)
@@ -1956,6 +1956,11 @@
 					
 				}
 				
+				// 给vo的errorMsg属性赋值
+				if (data.has("errorMsg")){
+					vo.setErrorMsg(data.get("errorMsg").getAsString());
+				}
+				
 //				vo.setTousseType(tousseDefinition.getTousseType());
 //				vo.setSterilizerName(sterilizerName);
 //				vo.setFrequency(frequency);
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r26120 -r26128
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 26120)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 26128)
@@ -10288,8 +10288,10 @@
 		
 		boolean biologicalMonitoringEnable = CssdUtils.getSystemSetConfigByNameBool("biologicalMonitoringEnable", false);
 		
-		Map<String, JsonObject> map = getTousseInfoOfBarcodes(biologicalMonitoringEnable, false, barcodes);
+		boolean enableBiologicalMonitoringOfAllTousses = CssdUtils.getSystemSetConfigByNameBool("enableBiologicalMonitoringOfAllTousses", false);
 		
+		Map<String, JsonObject> map = getTousseInfoOfBarcodes(biologicalMonitoringEnable, enableBiologicalMonitoringOfAllTousses, barcodes);
+		
 		JsonArray jsonArray = new JsonArray();
 		for (JsonObject value : map.values()) {
 			jsonArray.add(value);
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java
===================================================================
diff -u -r26083 -r26128
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java	(.../InvoiceGoodsVo.java)	(revision 26083)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java	(.../InvoiceGoodsVo.java)	(revision 26128)
@@ -77,6 +77,11 @@
 	private String[] confirmMsgs;
 	
 	/**
+	 * 错误消息，返回到前端，不允许继续本操作。例如，不允许将物品加入到已扫描物品列表
+	 */
+	private String errorMsg;
+	
+	/**
 	 * 是否没有做生物监测，默认是做了
 	 */
 	private Boolean noBiologicalMonitoring = false;
@@ -333,7 +338,15 @@
 	public void setConfirmMsgs(String[] confirmMsgs) {
 		this.confirmMsgs = confirmMsgs;
 	}
+	
+	public String getErrorMsg() {
+		return errorMsg;
+	}
 
+	public void setErrorMsg(String errorMsg) {
+		this.errorMsg = errorMsg;
+	}
+
 	public Boolean getNoBiologicalMonitoring() {
 		return noBiologicalMonitoring;
 	}