Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
===================================================================
diff -u -r36327 -r36395
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 36327)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 36395)
@@ -1272,62 +1272,6 @@
 		return json;
 	}
 
-	/**
-	 * 通过器械包名获取包内的材料信息
-	 */
-	public String getMaterialNameByTousseName(String tousseName,
-			String supplierName) {
-		String result = "";
-		if (StringUtils.isNotBlank(tousseName)) {
-			String querySql = "";
-			if (StringUtils.isBlank(supplierName)) {
-				querySql = "where po.name = '" + tousseName
-						+ "' and po.supplierName is null ";
-			} else {
-				querySql = "where po.name = '" + tousseName
-						+ "' and po.supplierName = '" + supplierName + "'";
-			}
-			TousseDefinition tousseDefinition = tousseDefinitionManager
-					.getTousseDefinitionBySql(querySql);
-			if (tousseDefinition != null
-					&& tousseDefinition.getMaterialInstances() != null) {
-				List<MaterialInstance> materialInstanceList = tousseDefinition
-						.getMaterialInstances();
-				for (int i = 0; i < materialInstanceList.size(); i++) {
-					if (i == (materialInstanceList.size() - 1)) {
-						result += materialInstanceList.get(i).getMaterialName()
-								+ "#*" + materialInstanceList.get(i).getCount();
-					} else {
-						result += materialInstanceList.get(i).getMaterialName()
-								+ "#*" + materialInstanceList.get(i).getCount()
-								+ " #& ";
-					}
-				}
-
-				List<DiposableGoodsInstance> diposableGoodsList = tousseDefinition
-						.getDiposableGoodsItems();
-				if (diposableGoodsList != null) {
-					for (int i = 0; i < diposableGoodsList.size(); i++) {
-						if (i == (diposableGoodsList.size() - 1)) {
-							result += diposableGoodsList.get(i)
-									.getDiposableGoods().getName()
-									+ "#*"
-									+ diposableGoodsList.get(i).getAmount();
-						} else {
-							result += diposableGoodsList.get(i)
-									.getDiposableGoods().getName()
-									+ "#*"
-									+ diposableGoodsList.get(i).getAmount()
-									+ " #& ";
-						}
-					}
-				}
-			}
-
-		}
-		return result;
-	}
-
 	public void updateTousseExpirationDate(String barcode, String validDateStr) {
 		Date validDate = DateTools.coverStrToDate(validDateStr,
 				"yyyy-MM-dd HH:mm:ss");