Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
===================================================================
diff -u -r20427 -r20622
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java	(.../DiposableGoodsAction.java)	(revision 20427)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java	(.../DiposableGoodsAction.java)	(revision 20622)
@@ -1,9 +1,13 @@
 package com.forgon.disinfectsystem.diposablegoods.action;
 
 import java.io.IOException;
+
+import com.forgon.databaseadapter.service.DateQueryAdapter;
+
 import java.io.PrintWriter;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -42,6 +46,7 @@
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsStock;
 import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveDisposablegoods;
 import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
+import com.forgon.disinfectsystem.entity.systemwarning.SystemWarningItemVO;
 import com.forgon.disinfectsystem.inventorymanagement.model.Inventory;
 import com.forgon.systemsetting.model.HttpOption;
 import com.forgon.systemsetting.service.HttpOptionManager;
@@ -88,6 +93,12 @@
 	
 	private ObjectDao objectDao;
 	
+	private DateQueryAdapter dateQueryAdapter;
+	
+	public void setDateQueryAdapter(DateQueryAdapter dateQueryAdapter) {
+		this.dateQueryAdapter = dateQueryAdapter;
+	}
+	
 	public void setWareHouseManager(WareHouseManager wareHouseManager) {
 		this.wareHouseManager = wareHouseManager;
 	}
@@ -1366,6 +1377,49 @@
 	}
 	
 	/**
+	 * 根据警告类型和一次性物品id获得批次库存信息
+	 */
+	public void loadExpiredGodownEntryItemByid() {
+		String type = StrutsParamUtils.getPraramValue("type","");//警告类型
+		String disposableGoodsID = StrutsParamUtils.getPraramValue("id", "");
+		if (StringUtils.isNotBlank(disposableGoodsID) && disposableGoodsID.equals("0") == false) {// 初始化加载的数据
+			try {
+				Calendar calendar = Calendar.getInstance();
+				calendar.setTime(new Date());
+				calendar.add(Calendar.DAY_OF_YEAR, 30);// 默认告警日期为30天
+				String warningDate = new SimpleDateFormat("yyyy-MM-dd").format(calendar.getTime());
+				String currentDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+				//sql语句
+				String sql = String.format(" where %s ",SqlUtils.getLongFieldPredicate("po.disposableGoodsId", Long.valueOf(disposableGoodsID)));
+				switch (type) {
+				case SystemWarningItemVO.WARNING_TYPE_DIPOSABLEGOODS:
+					sql += " and po.expDate between "
+							+ dateQueryAdapter.dateAdapter(currentDate) + " and "
+							+ "order by expDate";
+					break;
+				case SystemWarningItemVO.WARNING_TYPE_DISABLED_DIPOSABLEGOODS:
+					sql += " and po.expDate < "
+							+ dateQueryAdapter.dateAdapter(currentDate)
+							+ "order by expDate";
+					break;
+				default:
+					sql += " and po.expDate < "
+							+ dateQueryAdapter.dateAdapter(currentDate)
+							+ "order by expDate";
+					break;
+				}
+				List<DisposableGoodsBatchStock> disposableGoodsBatchStocks = objectDao.findBySql(DisposableGoodsBatchStock.class.getSimpleName(),sql);
+				
+				String jsonString = JSONUtil.toJSONString(disposableGoodsBatchStocks, true);
+				StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8");
+				StrutsParamUtils.getResponse().getWriter().println(jsonString);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+	}
+	
+	/**
 	 * 比较一次性物品包定义的修改，用于记录日志
 	 * @param origineDG 修改前的包定义
 	 * @param disposableGoods 修改后的包定义
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsWarningView.js
===================================================================
diff -u -r12331 -r20622
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsWarningView.js	(.../diposableGoodsWarningView.js)	(revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsWarningView.js	(.../diposableGoodsWarningView.js)	(revision 20622)
@@ -30,7 +30,7 @@
 	
 	var godownEntryItemStore = new top.Ext.data.Store({
 		proxy : new top.Ext.data.HttpProxy({
-			url : WWWROOT + '/disinfectSystem/diposableGoodsAction!loadGodownEntryItemByid.do?id=' + id,
+			url : WWWROOT + '/disinfectSystem/diposableGoodsAction!loadExpiredGodownEntryItemByid.do?id=' + id,
 			method : 'POST'
 		}),
 		reader : new top.Ext.data.JsonReader({
@@ -326,6 +326,7 @@
 	formWindow.show();
 	diposableGooodsStore.load();
 	if(id != 0){
+		godownEntryItemStore.baseParams.type = $Id("parm_s_type").value//警告类型
 		godownEntryItemStore.load();
 	}
 }