Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
===================================================================
diff -u -r28014 -r28273
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java	(.../TousseDefinitionManager.java)	(revision 28014)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java	(.../TousseDefinitionManager.java)	(revision 28273)
@@ -656,7 +656,6 @@
 	 * @return
 	 */
 	public TousseDefinition newDisinfectGoodsDefinitionWithoutInvoicePlanId(TousseDefinition ancestorTD,JSONArray materialItemsJson);
-	public TousseDefinition newDisinfectGoodsDefinitionWithoutInvoicePlanId(TousseDefinition ancestorTD);
 
 	/**
 	 * 根据包定义构造材料实例的json数组(排除数量小于等于0的材料)
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r28135 -r28273
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 28135)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 28273)
@@ -3023,28 +3023,6 @@
 	}
 	
 	@Override
-	public TousseDefinition newDisinfectGoodsDefinitionWithoutInvoicePlanId(TousseDefinition ancestorTD){
-		JSONArray materialArry = new JSONArray();
-		List<MaterialInstance> mis = ancestorTD.getMaterialInstances();
-		if(mis != null){
-			for (int i = 0; i < mis.size(); i++) {
-				MaterialInstance ms = mis.get(i);
-				//跟申请单那里统一，不然相同名称的包定义md5不一致
-				if(ms.getCount() <= 0){
-					continue;
-				}
-				JSONObject obj = new JSONObject();
-				obj.put("name",CssdUtils.getMaterialName(ms.getMaterialDefinition()));
-				obj.put("count", ms.getCount());
-				obj.put("tousseType", "器械");
-				materialArry.add(obj);
-			}
-		}
-		return newDisinfectGoodsDefinitionWithoutInvoicePlanId(ancestorTD, materialArry);
-	}
-	
-	
-	@Override
 	public TousseDefinition newDisinfectGoodsDefinition(TousseDefinition ancestorTD,JSONArray materialItemsJson, Long invoicePlanId) {
 		if(invoicePlanId == null){
 			throw new RuntimeException("申请单ID不能为空");