Index: ssts-web/src/main/webapp/homepage/portalPage.jsp
===================================================================
diff -u -r32223 -r32878
--- ssts-web/src/main/webapp/homepage/portalPage.jsp	(.../portalPage.jsp)	(revision 32223)
+++ ssts-web/src/main/webapp/homepage/portalPage.jsp	(.../portalPage.jsp)	(revision 32878)
@@ -219,7 +219,8 @@
 var overStorageDisabledGoods = '<%=SystemWarningItemVO.WARNING_TYPE_OVERSTORAGE_DIPOSABLEGOODS%>';
 var belowStorageDiposableGoods = '<%=SystemWarningItemVO.WARNING_TYPE_BELOWSTORAGE_DIPOSABLEGOODS%>';
 var warningTousseGoods = '<%=SystemWarningItemVO.WARNING_TYPE_TOUSSE%>';
-var warningMaterialGoods = '<%=SystemWarningItemVO.WARNING_TYPE_MATERIAL_MIN_STOCK%>'
+var materialMinStock = '<%=SystemWarningItemVO.WARNING_TYPE_MATERIAL_MIN_STOCK%>';
+var materialMaxStock = '<%=SystemWarningItemVO.WARNING_TYPE_MATERIAL_MAX_STOCK%>';
 var disabledTousseGoods = '<%=SystemWarningItemVO.WARNING_TYPE_DISABLED_TOUSSE%>';
 var satisfactionSurveyNotice = '<%=SystemWarningItemVO.NOTICE_TYPE_SATISFACTIONSURVEY_TABLE%>';
 var warningCertification = '<%=SystemWarningItemVO.WARNING_TYPE_REGISTRATIONCERTIFICATION%>';
Index: ssts-web/src/main/webapp/homepage/portalPage.js
===================================================================
diff -u -r32617 -r32878
--- ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 32617)
+++ ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 32878)
@@ -1813,8 +1813,8 @@
 		addTab('warningInfo','告警管理',WWWROOT + '/disinfectsystem/assestManagement/diposableGoods/diposableGoodsWarningView.jsp?queryType='+params);
 	}else if(v == warningTousseGoods || v == disabledTousseGoods){
 		addTab('warningInfo','告警管理',WWWROOT + '/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.jsp?warningType='+params);
-	}else if(v == warningMaterialGoods ){
-		addTab('warningInfo','告警管理',WWWROOT + '/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp?warning=warning');
+	}else if(v == materialMinStock || v == materialMaxStock){
+		addTab('warningInfo','告警管理',WWWROOT + '/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp?warning=warning&warningType='+v);
 	}else if(v == warningCertification || v == disabledCertification){
 		addTab('warningInfo','告警管理',WWWROOT + '/disinfectsystem/basedatamanager/supplier/supplierCertificationWarningView.jsp?queryType='+params);
 	}else if(v == warningExpensiveGoods || v == warningMaxExpensiveGoods){
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js
===================================================================
diff -u -r24066 -r32878
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js	(.../materialDefinitionView.js)	(revision 24066)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js	(.../materialDefinitionView.js)	(revision 32878)
@@ -166,6 +166,7 @@
 	Ext.QuickTips.init();
 	// 记录cookie（3步）
 	$Id('parm_s_onlyShowDisable').value = onlyShowDisable;
+	$Id('parm_s_warningType').value = warningType;
 		var columns = [ {
 			header : "器械名称",
 			width : 150,
@@ -379,51 +380,39 @@
 			name : 'sequence'
 		}];
 
-		var sign = true;
-		var tbar = [ {
-			text : '添加',
-			hidden : SSTS_Material_Create,
-			iconCls : 'btn_ext_application_add',
-			handler : function() {
-				addAndEditMaterialDefinition(0);
-			}
-		},{
-			text : '取消停用',
-			hidden : enableDisable,
-			iconCls : 'btn_ext_refresh',
-			handler : function() {
-				changeDisable(grid);
-			}
-		}, '-', {
-			text : '修改',
-			hidden : SSTS_Material_Update,
-			iconCls : 'btn_ext_application_edit',
-			id : 'editTbar',
-			handler : function() {
-				loadFormData(grid);
-			}
-		}, '-', {
-			text : '删除',
-			hidden : SSTS_Material_Delete,
-			iconCls : 'btn_ext_application_del',
-			handler : function() {
-				deleteMaterialDefinition(grid);
-			}
-		}, '-', {
-			text : '导出',
-			hidden : enableDownloadBtn,
-			iconCls:'btn_ext_download',
-			handler : function() {
-				location.href = WWWROOT + "/disinfectsystem/basedatamanager/materialDefinition/exportMaterials.jsp";
-			}
-		}];
 		var dwrCallParams = null;
 
 		Ext.ux.ForgonPageGrid.prototype.getGridParameterMap = function() {
 
 		};
 		//系统告警模式,显示当前库存小于最小库存的材料
 		if(warning != null && warning != "" && warning != "null"){
+			var warningTypeStore = new Ext.data.SimpleStore( {
+				fields : ['value'],
+				data : [['全部'],['小于最小库存材料'],['大于最大库存材料']]
+			});
+			var tbar = [{
+				text : '告警类型：'
+			},{
+				xtype : 'combo',
+				id : 'warningType',
+				name : 'waringType',
+				valueField : 'value',
+				displayField : 'value',
+				store : warningTypeStore,
+				forceSelection : true,
+				mode : 'local',
+				editable:false,
+				triggerAction : 'all',
+				width : 180,
+				value:warningType,
+				listeners : {
+					select : function(combo,record,index ){
+						$Id('parm_s_warningType').value = record.data.value;
+						grid.dwrReload();
+					}
+				}
+			}];
 			grid = new Ext.ux.ForgonPageGrid( {
 				title : '材料列表',
 				tbar : tbar,
@@ -444,6 +433,43 @@
 			dwrCallParams // 这个参数只是占位作用
 			);
 		}else{
+			var tbar = [ {
+				text : '添加',
+				hidden : SSTS_Material_Create,
+				iconCls : 'btn_ext_application_add',
+				handler : function() {
+					addAndEditMaterialDefinition(0);
+				}
+			},{
+				text : '取消停用',
+				hidden : enableDisable,
+				iconCls : 'btn_ext_refresh',
+				handler : function() {
+					changeDisable(grid);
+				}
+			}, '-', {
+				text : '修改',
+				hidden : SSTS_Material_Update,
+				iconCls : 'btn_ext_application_edit',
+				id : 'editTbar',
+				handler : function() {
+					loadFormData(grid);
+				}
+			}, '-', {
+				text : '删除',
+				hidden : SSTS_Material_Delete,
+				iconCls : 'btn_ext_application_del',
+				handler : function() {
+					deleteMaterialDefinition(grid);
+				}
+			}, '-', {
+				text : '导出',
+				hidden : enableDownloadBtn,
+				iconCls:'btn_ext_download',
+				handler : function() {
+					location.href = WWWROOT + "/disinfectsystem/basedatamanager/materialDefinition/exportMaterials.jsp";
+				}
+			}];
 			//如果没有warning这个参数,显示所有
 			grid = new Ext.ux.ForgonPageGrid( {
 				title : '材料列表',
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp
===================================================================
diff -u -r29513 -r32878
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp	(.../materialDefinitionView.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp	(.../materialDefinitionView.jsp)	(revision 32878)
@@ -54,6 +54,11 @@
 SSTS_Material_Delete = false;
 </operation:authorize>
 
+var warningType = '<%= request.getParameter("warningType")%>';
+if(warningType == null || warningType == "null"){
+	warningType = "全部";
+}
+
 var enableEditBtn = false;
 var enableSaveBtn = false;
 var enableSaveAndNewBtn = false;
@@ -85,6 +90,7 @@
 </table>
 <form name="parametersFrm">
     <input type="hidden" id="parm_s_onlyShowDisable" name="parm_s_onlyShowDisable" value="">
+	<input type="hidden" id="parm_s_warningType" name="parm_s_warningType" value="全部">
 </form>
 </body>
 </html>
\ No newline at end of file