Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
===================================================================
diff -u -r14519 -r14525
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java	(.../PackingAction.java)	(revision 14519)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java	(.../PackingAction.java)	(revision 14525)
@@ -57,6 +57,7 @@
 import com.forgon.tools.ImageUtils;
 import com.forgon.tools.StrutsParamUtils;
 import com.forgon.tools.StrutsResponseUtils;
+import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.hibernate.ObjectDao;
 import com.forgon.tools.json.JSONUtil;
 import com.forgon.tools.json.JsonPropertyFilter;
@@ -486,12 +487,15 @@
 	}
 
 	/**
-	 * 获取包定义的配包注意事项
+	 * 获取包定义的配包注意事项。对于动态生成的包定义，取祖先id对应的包定义的注意事项
 	 */
 	public void getPackageNote(){
 		try{
 			String id = StrutsParamUtils.getPraramValue("td_id", "");
 			TousseDefinition td = tousseDefinitionManager.getTousseDefinitionById(id);
+			if(td != null && DatabaseUtil.isPoIdValid(td.getAncestorID()) && !td.getId().equals(td.getAncestorID())){
+				td = tousseDefinitionManager.getTousseDefinitionById(td.getAncestorID());
+			}
 			if(td != null){
 				JSONObject json = JSONUtil.buildJsonObject(true);
 				JSONUtil.addProperty(json, "packageName", td.getName());