Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r18111 -r18113
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 18111)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 18113)
@@ -4058,7 +4058,7 @@
 					return buildErrorMsgJsonResult("条码/篮筐(首)与条码/篮筐(尾)尾参数类型不一致!");
 				}
 			}
-			
+			String tousseNameAndBarcode = String.format("%s%s", tousseInstance.getTousseName(),barcode);
 			//如果器械包实例条件(尾)为空
 			if(StringUtils.isBlank(barcodeEnd)){
 				// 不追溯的消毒物品，发货扫描固定条码，返回多个器械包
@@ -4115,20 +4115,20 @@
 				// 如果是
 				if(tousseInstance.getTousseFixedBarcode() && TousseDefinition.STR_YES.equals(tousseDefinition
 						.getIsTraceable())){
-					return buildErrorMsgJsonResult(tousseInstance.getTousseName()+"为可追溯的包，不能扫描固定条码!");
+					return buildErrorMsgJsonResult(tousseNameAndBarcode+"为可追溯的包，不能扫描固定条码!");
 				}
 				// 可追溯器械包，返回单个器械包实例
 				if (!checkStatusForInvoice.evaluate(tousseInstance)) {
-					return buildErrorMsgJsonResult("器械包"+barcode+"状态为" + tousseInstance.getStatus() + ",不能发货！请扫描已消毒或者已灭菌的器械包");
+					return buildErrorMsgJsonResult(tousseNameAndBarcode+"状态为" + tousseInstance.getStatus() + ",不能发货！请扫描已消毒或者已灭菌的器械包");
 				}
 				if (!tousseInstanceManager.checkTousseInstanceHasNotRecall()
 						.evaluate(tousseInstance)) {
-					return buildErrorMsgJsonResult("器械包"+barcode+"+已被召回");
+					return buildErrorMsgJsonResult(tousseNameAndBarcode+"+已被召回");
 				}
 	
 				Date validUntil = tousseInstance.getValidUntil();
 				if (DateTools.isExpire(validUntil, new Date())) {
-					return buildErrorMsgJsonResult("器械包"+barcode+"已过期");
+					return buildErrorMsgJsonResult(tousseNameAndBarcode+"已过期");
 				}
 				Date warningUntil = tousseInstance.getWarningUntil();
 				if (DateTools.isDuringWarningPeriod(validUntil, warningUntil,
@@ -4137,14 +4137,14 @@
 					Boolean warningTousseWhetherDelivery = cofig
 							.getWarningTousseWhetherDelivery();
 					if (warningTousseWhetherDelivery) {
-						tips.add(new JsonPrimitive("器械包"+barcode+"即将失效"));
+						tips.add(new JsonPrimitive(tousseNameAndBarcode+"即将失效"));
 					} else {
-						return buildErrorMsgJsonResult("器械包"+barcode+"处于预警期不能发货");
+						return buildErrorMsgJsonResult(tousseNameAndBarcode+"处于预警期不能发货");
 					}
 				}
 				// 过滤科室
 				if(filterByDepart(tousseInstance, departCodeOfInvoicePlan)){
-					return buildErrorMsgJsonResult(String.format("%s%s不属于当前科室!", tousseInstance.getTousseName(),barcode));
+					return buildErrorMsgJsonResult(String.format("%s不属于当前科室!", tousseNameAndBarcode));
 				}
 	
 				JsonObject result = new JsonObject();