Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
===================================================================
diff -u -r14022 -r14026
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp	(.../tousseImage.jsp)	(revision 14022)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp	(.../tousseImage.jsp)	(revision 14026)
@@ -160,7 +160,7 @@
                 <img id="tousseOrMaterialImage" style="width:568px;height:400px;vertical-align:left;"></img>
                 <div class="remark-box">
 					<div class="box" style="width:568px;height:45px;text-align:left;">
-						<h4 class="title">注意事项</h4>
+						<h4 class="noticetitle">注意事项</h4>
                			<div class="notice" id="materialRemark">
                			</div>
                		</div>
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java
===================================================================
diff -u -r14022 -r14026
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java	(.../MaterialDefinitionAction.java)	(revision 14022)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java	(.../MaterialDefinitionAction.java)	(revision 14026)
@@ -414,25 +414,33 @@
 			}
 		}
 	}
-	
+	/**
+	 * 获取材料定义的注意事项,可以根据材料的名称或者材料定义的id获取对应的材料定义对象
+	 * 使用材料的名称主要是因为有些界面暂时只有材料定义的名称，没有材料定义的id
+	 */
 	public void getMaterialNotice(){
-		String name = StrutsParamUtils.getPraramValue("materialName", null);
-		String specification = null;
-		if (StringUtils.isNotBlank(name) && name.lastIndexOf("[") != -1) {
-			specification = name.substring(name.lastIndexOf("[") + 1,
-					name.length() - 1);
-			name = name.substring(0, name.lastIndexOf("[")).trim();
-		}
-		
-		if (StringUtils.isNotBlank(name)){
-			MaterialDefinition def = materialDefinitionManager
-					.getMaterialDefinitionByName(name, specification);
-			if(def != null){
-				JSONObject json = JSONUtil.buildJsonObject(true);
-				json.put("notice", def.getNotice());
-				StrutsResponseUtils.output(json);
+		String materialDefinitionId = StrutsParamUtils.getPraramValue("materialDefinitionId", null);
+		MaterialDefinition materialDefinition = null;
+		if(DatabaseUtil.isPoIdValid(materialDefinitionId)){
+			materialDefinition = materialDefinitionManager.getMaterialDefinitionById(materialDefinitionId);
+		}else{
+			String name = StrutsParamUtils.getPraramValue("materialName", null);
+			String specification = null;
+			if (StringUtils.isNotBlank(name) && name.lastIndexOf("[") != -1) {
+				specification = name.substring(name.lastIndexOf("[") + 1,
+						name.length() - 1);
+				name = name.substring(0, name.lastIndexOf("[")).trim();
 			}
+			if (StringUtils.isNotBlank(name)){
+				materialDefinition = materialDefinitionManager
+						.getMaterialDefinitionByName(name, specification);
+			}
 		}
+		if(materialDefinition != null){
+			JSONObject json = JSONUtil.buildJsonObject(true);
+			json.put("notice", materialDefinition.getNotice());
+			StrutsResponseUtils.output(json);
+		}
 		StrutsResponseUtils.output(JSONUtil.buildJsonObject(false));
 	}
 
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp
===================================================================
diff -u -r13390 -r14026
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp	(.../disinfectionTousseItems.jsp)	(revision 13390)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp	(.../disinfectionTousseItems.jsp)	(revision 14026)
@@ -66,7 +66,23 @@
         });
     }
 }
-
+function loadMaterialNotice(materialDefinitionId){
+	$.ajax({
+        type:'post',
+        url:'${ctx}/disinfectSystem/baseData/materialDefinitionAction!getMaterialNotice.do',
+        data:'materialDefinitionId=' + materialDefinitionId,
+        dataType:'json',
+        success:function(result){
+        	if(result.success){
+        		var notice = result.notice;
+        		var text = notice.replace(/\r\n/g,"<p/>");
+        		$("#materialRemark").html(text);
+        	}
+        },
+        error:function(XMLHttpRequest, textStatus, errorThrown){
+        }
+    });
+}
 $(document).ready(function() {
     $.ajax({
         type:'post',
@@ -75,7 +91,7 @@
         dataType:'json',
         success:function(msg){
             for(var i = 0 ;i < msg.length ;i++){
-                var materialItemsElement = $('<tr><input type="hidden" id="materialDefinitionId'+i+'" value="'+msg[i].materialDefinition.id+'"/><td id="materialName'+i+'" class="w5">'+msg[i].materialDefinition.name+'</td>'+
+                var materialItemsElement = $('<tr><input type="hidden" id="materialDefinitionId'+i+'" value="'+msg[i].materialDefinition.id+'"/><td onclick=loadMaterialNotice('+msg[i].materialDefinition.id+') id="materialName'+i+'" class="w5">'+msg[i].materialDefinition.name+'</td>'+
                     '<td id="count'+i+'" class="w6">'+msg[i].count+'</td>'+
                     '<td><a href="javascript:void(0);" class="add" onclick="add('+i+');"></a><a href="javascript:void(0);" class="minus" onclick="reduce('+i+');"></a></td>'+
                   '</tr>');
@@ -97,12 +113,19 @@
             <th width="2%">&nbsp;</th>
           </tr>
         </table>
-        <div class="box">
+        <div class="box" style="height:450px;">
             <table id="materialItemsTable" border="0" cellspacing="0" cellpadding="0">
             </table>
         </div>
     </div>
     <div class="send">
+    	<div class="remark-box">
+			<div class="box" style="width:100%;height:45px;text-align:left;">
+				<h4 class="noticetitle">注意事项</h4>
+       			<div class="notice" id="materialRemark">
+       			</div>
+            </div>
+        </div>
         <table width="50%" border="0" align="center" cellpadding="0" cellspacing="0">
             <tr>
                 <td><a href="javascript:void(0);" class="submit" onclick="submit();">保存</a></td>
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
===================================================================
diff -u -r14022 -r14026
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css	(.../style.css)	(revision 14022)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css	(.../style.css)	(revision 14026)
@@ -162,7 +162,7 @@
 .remark-box .table{ border:1px solid #ddd; padding:1px}
 .remark-box .box{ overflow-y:scroll; background:#fff; overflow-x:hidden}
 .remark-box .box .notice{color:#2e6271;}
-.remark-box .box .title{text-align:center;font-size:15px;color:#2e6271;}
+.remark-box .box .noticetitle{text-align:center;font-size:15px;color:#2e6271;}
 
 .afrl-box{ width:1980px; margin:0 auto; font-size:18px; background:#f0f0f0; padding:15px 10px}
 .afrl-box .table{ border:1px solid #ddd; padding:1px}