Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsWarningView.js
===================================================================
diff -u -r30707 -r31143
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsWarningView.js	(.../diposableGoodsWarningView.js)	(revision 30707)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsWarningView.js	(.../diposableGoodsWarningView.js)	(revision 31143)
@@ -56,32 +56,32 @@
 	}
 });
 
-// 根据grid id构造json对象数组
-function buildJSONArrayFromStore(store,attName){
-	var items = new Array();
-	if(typeof(attName) == 'undefined'){
-		attName = 'data';
-	}
-	if(typeof(store) != 'undefined' && store != null){
-		var count = store.getCount();
-		for(var i = 0;i < count;++i){
-			var record = store.getAt(i);
-			var data = record.data;
-			data.recordProperties = {
-				dirty: record.dirty,
-				modified: record.modified
-			}
-			items.push(data);
-		}
-	}
-	return items;
+// 根据grid id构造json对象数组
+function buildJSONArrayFromStore(store,attName){
+	var items = new Array();
+	if(typeof(attName) == 'undefined'){
+		attName = 'data';
+	}
+	if(typeof(store) != 'undefined' && store != null){
+		var count = store.getCount();
+		for(var i = 0;i < count;++i){
+			var record = store.getAt(i);
+			var data = record.data;
+			data.recordProperties = {
+				dirty: record.dirty,
+				modified: record.modified
+			}
+			items.push(data);
+		}
+	}
+	return items;
 }
 
-function buildJSONStringFromStore(store){
-	var itemsJSONArray = buildJSONArrayFromStore(store);
-	var jsonStr = JSON.stringify(itemsJSONArray);
-	
-	return jsonStr;
+function buildJSONStringFromStore(store){
+	var itemsJSONArray = buildJSONArrayFromStore(store);
+	var jsonStr = JSON.stringify(itemsJSONArray);
+	
+	return jsonStr;
 }
 /**
  * 设置仓库的id和name的隐藏域的内容
@@ -831,9 +831,15 @@
 	    ]}
 	);
 
+	var invoiceTypeStoreData = [['0','全部'],['1',disabledGoods],['2',diposableGoods]];
+
+	if(sstsConfig.enableDisposableGoodsStorageAlertWindow){
+		invoiceTypeStoreData = [['0','全部'],['1',disabledGoods],['2',diposableGoods],['3',overStorageDisabledGoods],['4',belowStorageDiposableGoods]];
+	}
+
 	var invoiceTypeStore = new Ext.data.SimpleStore( {
 		fields : [ 'id','value'],
-		data : [['0','全部'],['1',disabledGoods],['2',diposableGoods]]
+		data : invoiceTypeStoreData
 	});
 	
 	var tbar = [{
@@ -857,10 +863,10 @@
 				grid.dwrReload();
 			}
 		}
-	},'-', {
-		text : '退库',
-		iconCls : 'btn_ext_application_edit',
-		id : 'editTbar',
+	},'-', {
+		text : '退库',
+		iconCls : 'btn_ext_application_edit',
+		id : 'editTbar',
 		handler : function() {
 			var records = grid.getSelectionModel().getSelections();
 			if (records.length == 0) {
@@ -876,8 +882,8 @@
 					ids = ids + ';' + records[i].json['disposableGoodsId'];
 				}
 			}			
-			diposableGoodsOut(ids);
-		}
+			diposableGoodsOut(ids);
+		}
 	}];
 
 	grid = new Ext.ux.ForgonPageGrid( {
Index: ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/config.js
===================================================================
diff -u -r31076 -r31143
--- ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/config.js	(.../config.js)	(revision 31076)
+++ ssts-web/src/main/webapp/disinfectsystem/config/jfjzyydwyxzx/config.js	(.../config.js)	(revision 31143)
@@ -254,6 +254,8 @@
   askWhetherMergeAllPartsOfForeignTousseSplitInRecyclingToOneWhenPacking:true,
   //外来器械包装配时允许部分拆包
   allowForeignToussePartSplitWhenPacking:true,
+  //启用一次性物品库存的告警弹窗提醒
+  enableDisposableGoodsStorageAlertWindow:true,
   //桌面快捷图标配置
   desktopShortcutIconsConfig:["外部代理灭菌","外来器械申请"],
   //显示申请科室的核算月报的列配置
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsWarningView.jsp
===================================================================
diff -u -r29513 -r31143
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsWarningView.jsp	(.../diposableGoodsWarningView.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsWarningView.jsp	(.../diposableGoodsWarningView.jsp)	(revision 31143)
@@ -21,12 +21,14 @@
     var CONSTANT_NO = '<%=DisposableGoods.CONSTANT_NO %>';//否
     var disabledGoods = '<%=SystemWarningItemVO.WARNING_TYPE_DISABLED_DIPOSABLEGOODS%>';
     var diposableGoods = '<%=SystemWarningItemVO.WARNING_TYPE_DIPOSABLEGOODS%>';
+    var overStorageDisabledGoods = '<%=SystemWarningItemVO.WARNING_TYPE_OVERSTORAGE_DIPOSABLEGOODS%>';
+    var belowStorageDiposableGoods = '<%=SystemWarningItemVO.WARNING_TYPE_BELOWSTORAGE_DIPOSABLEGOODS%>';
     var warningType = '<%= request.getParameter("queryType")%>';
     if(warningType == null || warningType == "null"){
     	warningType = "全部";
     }
 </script>
-
+<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/ext/example/examples.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/js/json3.min.js?version=${svnRevision}"></script>
Index: ssts-web/src/main/webapp/homepage/portalPage.js
===================================================================
diff -u -r30949 -r31143
--- ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 30949)
+++ ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 31143)
@@ -1636,7 +1636,7 @@
 	var params = encodeURI(v);
 	if(v == recall){//召回页面
 		addTab('recallRecord','器械包召回',WWWROOT + '/disinfectsystem/recallRecord/recallRecordViewForDepart.jsp');
-	}else if(v ==disabledGoods || v == diposableGoods){
+	}else if(v ==disabledGoods || v == diposableGoods || v ==overStorageDisabledGoods || v == belowStorageDiposableGoods){
 		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);
Index: ssts-web/src/main/webapp/homepage/portalPage.jsp
===================================================================
diff -u -r30940 -r31143
--- ssts-web/src/main/webapp/homepage/portalPage.jsp	(.../portalPage.jsp)	(revision 30940)
+++ ssts-web/src/main/webapp/homepage/portalPage.jsp	(.../portalPage.jsp)	(revision 31143)
@@ -215,6 +215,8 @@
 var recall = '<%=SystemWarningItemVO.WARNING_TYPE_RECALLRECORD%>';
 var disabledGoods = '<%=SystemWarningItemVO.WARNING_TYPE_DISABLED_DIPOSABLEGOODS%>';
 var diposableGoods = '<%=SystemWarningItemVO.WARNING_TYPE_DIPOSABLEGOODS%>';
+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 disabledTousseGoods = '<%=SystemWarningItemVO.WARNING_TYPE_DISABLED_TOUSSE%>';