Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/ExpressInvoiceManagerImpl.java
===================================================================
diff -u -r27450 -r27532
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/ExpressInvoiceManagerImpl.java	(.../ExpressInvoiceManagerImpl.java)	(revision 27450)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/ExpressInvoiceManagerImpl.java	(.../ExpressInvoiceManagerImpl.java)	(revision 27532)
@@ -1928,7 +1928,8 @@
 			}
 			TousseDefinition tousseDefinition = tousseInstance.getTousseDefinition();
 			if(!StringUtils.equals(tousseDefinitionId, tousseDefinition.getId().toString())){
-				throw new RuntimeException(String.format("参数tousseDefinitionId的值为%s,与条码对应的包定义id的值%s不一致",tousseDefinitionId,tousseDefinition.getId()));
+				//throw new RuntimeException(String.format("参数tousseDefinitionId的值为%s,与条码对应的包定义id的值%s不一致",tousseDefinitionId,tousseDefinition.getId()));
+				throw new RuntimeException(String.format("物品【%s】不在发货计划内!",tousseDefinition.getName()));
 			}
 			if(!StringUtils.equals(tousseDefinition.getExpressInvoice(), Constants.STR_YES)){
 				throw new RuntimeException("该包未开启快速发货");
@@ -2127,6 +2128,8 @@
 				rows.add(obj);
 			}
 			data.add(JSONUtil.JSON_KEY_ROWS, rows);
+		}else{
+			throw new SystemException("物品【" + StringUtils.join(tips, ",") + "】库存不足,不能发货!");
 		}
 		
 		return data;