Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r13962 -r14037
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 13962)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 14037)
@@ -1609,7 +1609,9 @@
 			    {name : 'materialDefinitionId'},
 			    {name : 'name'},
 			    {name : 'count'},
-			    {name : 'type'}
+			    {name : 'type'},
+			    {name : 'notice'},
+			    {name : 'hasNotice'}
 			],
     listeners : {
     	load : function(thiz,records,options){
@@ -1646,6 +1648,17 @@
          {header : "材料名称",width : 140,flex: 1,menuDisabled: true,dataIndex : 'name'}, 
       	 {header : "数量",width : 40,menuDisabled: true,dataIndex : 'count'}
     ],
+    plugins: [{
+        ptype: 'rowexpander',
+        rowBodyTpl : new Ext4.XTemplate(
+        	    '<tpl if="hasNotice == true">',
+        	    	'<center>注意事项</center>',
+        	    	'<tpl for="notice">',
+        	    		'<div>{.}</div>',
+        	    	'</tpl>',
+        	    '</tpl>'
+        )
+    }],
     frame:false,
     border:false,
     title:'材料清单',
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java
===================================================================
diff -u -r14022 -r14037
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java	(.../MaterialDefinition.java)	(revision 14022)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java	(.../MaterialDefinition.java)	(revision 14037)
@@ -344,5 +344,12 @@
 	public void setNotice(String notice) {
 		this.notice = StringTools.defaultString(notice);
 	}
-	
+	/**
+	 * 判断是否有注意事项。如果注意事项非空，则认为有注意事项，否则就没有
+	 * @return
+	 */
+	@Transient
+	public boolean hasNotice(){
+		return StringTools.isNotBlank(notice);
+	}
 }
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManager.java
===================================================================
diff -u -r13089 -r14037
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManager.java	(.../MaterialDefinitionManager.java)	(revision 13089)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManager.java	(.../MaterialDefinitionManager.java)	(revision 14037)
@@ -5,6 +5,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 
+import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
 import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition;
@@ -53,5 +54,11 @@
 	public void exportMaterial(OutputStream ops);
 	
 	public MaterialDefinition getMaterialDefinitionByInventorySerialNumber(String inventorySerialNumber);
+	/**
+	 * 获取材料定义的注意事项数组。数组的每一项为注意事项的一条内容，由用户在文本框中换行输入
+	 * @param materialDefinition 材料定义
+	 * @return
+	 */
+	public JSONArray getMaterialNoticeArray(MaterialDefinition materialDefinition);
 	
 }
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
===================================================================
diff -u -r13520 -r14037
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java	(.../MaterialDefinitionManagerImpl.java)	(revision 13520)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java	(.../MaterialDefinitionManagerImpl.java)	(revision 14037)
@@ -643,4 +643,16 @@
 				inventorySerialNumber);
 	}
 
+	@Override
+	public JSONArray getMaterialNoticeArray(
+			MaterialDefinition materialDefinition) {
+		JSONArray array = new JSONArray();
+		if(materialDefinition != null && materialDefinition.hasNotice()){
+			for(String str : materialDefinition.getNotice().split(System.lineSeparator())){
+				array.add(str);
+			}
+		}
+		return array;
+	}
+
 }
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
===================================================================
diff -u -r14021 -r14037
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 14021)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 14037)
@@ -812,6 +812,8 @@
 							obj.put("count", instance.getCount());
 							obj.put("type", "器械");
 							obj.put("cost", cost == null ? 0.00 : cost);
+							obj.put("notice", materialDefinitionManager.getMaterialNoticeArray(md));
+							obj.put("hasNotice", md.hasNotice());
 							array.add(obj);
 						}
 					}