Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
===================================================================
diff -u -r12809 -r12817
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 12809)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 12817)
@@ -1441,6 +1441,16 @@
 		// 此时获取的是按照id升序排列的
 		return objectDao.findBySql(DisposableGoodsBatch.class.getSimpleName(),sql);
 	}
+	public List<DisposableGoodsBatch> getDisposableGoodsBatchesByDisposableGoodsID(Long disposableGoodsID){
+		if(disposableGoodsID == null){
+			return null;
+		}
+		// 锁定的方式批量查询
+		String sql = String
+				.format(" where %s ",SqlUtils.getLongFieldPredicate("po.diposableGoods.id", disposableGoodsID));
+		// 此时获取的是按照id升序排列的
+		return objectDao.findBySql(DisposableGoodsBatch.class.getSimpleName(),sql);
+	}
 	// 在新的事务中执行删除。
 	public void deleteDiposableGoodsById_TRANS_NEW(String id) {
 		// TODO
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.js
===================================================================
diff -u -r12813 -r12817
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.js	(.../disposableGoodsStockView.js)	(revision 12813)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.js	(.../disposableGoodsStockView.js)	(revision 12817)
@@ -895,7 +895,7 @@
 		renderTo : 'gridDiv',
 		frame : false
 	}, readerDetail,
-		DiposableGoodsTableManager.findDiposableGoodsTableList,
+		DiposableGoodsTableManager.findDisposableGoodsStockTableList,
 		null 
 	);
 
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
===================================================================
diff -u -r12811 -r12817
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java	(.../DiposableGoodsTableManager.java)	(revision 12811)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java	(.../DiposableGoodsTableManager.java)	(revision 12817)
@@ -54,8 +54,8 @@
 			DiposableGoodsManager diposableGoodsManager) {
 		this.diposableGoodsManager = diposableGoodsManager;
 	}
-
-	public String findDiposableGoodsTableList(
+	// 查找物品库存
+	public String findDisposableGoodsStockTableList(
 			Map<String, List<String>> parameterMap) {
 		Map<String, String> sqlWhereParamMap = gridManager
 				.getParamFromView(parameterMap);
@@ -83,7 +83,36 @@
 				DisposableGoodsStock.class.getSimpleName(), sql,
 				new String[] { "goodsBatchs" });
 	}
+	
+	public String findDisposableGoodsTableList(
+			Map<String, List<String>> parameterMap) {
+		Map<String, String> sqlWhereParamMap = gridManager
+				.getParamFromView(parameterMap);
 
+		// 关键字查询-》把小写字母转换成大写字母
+		if (!parameterMap.get("grid_search_query").isEmpty()) {
+			List keyList = parameterMap.get("grid_search_query");
+			List queryKey = new ArrayList(keyList.size());
+			for (int i = 0; i < keyList.size(); i++) {
+				queryKey.add(((String) keyList.get(i)).toUpperCase());
+			}
+			parameterMap.put("grid_search_query", queryKey);
+		}
+
+		String type = sqlWhereParamMap.get("type");
+		String sql = "where 1=1";
+		
+		if (StringUtils.isNotBlank(type)) {
+			sql = String.format(" where %s", SqlUtils.getStringFieldPredicate("po.type", type));
+		} else {
+			sql += " and 1=1";
+		}
+		return gridManager.renderGrid(parameterMap,
+				DisposableGoods.class.getSimpleName(), sql,
+				new String[] { "goodsBatchs" });
+	}
+	
+
 	/**
 	 * 一次性物品告警grid
 	 * 
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
===================================================================
diff -u -r12788 -r12817
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java	(.../DiposableGoodsAction.java)	(revision 12788)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java	(.../DiposableGoodsAction.java)	(revision 12817)
@@ -24,10 +24,9 @@
 import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodBatchStockManager;
 import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodsManager;
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods;
+import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatch;
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatchStock;
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsStock;
-import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig;
-import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.systemsetting.model.HttpOption;
 import com.forgon.systemsetting.service.HttpOptionManager;
 import com.forgon.tools.GB2Alpha;
@@ -150,6 +149,24 @@
 			}
 		}
 	}
+	public void loadDisposableGoodsBatchesByDisposableGoodsID() {
+		String disposableGoodsID = StrutsParamUtils.getPraramValue("id", "");
+		if (StringUtils.isNotBlank(disposableGoodsID) && disposableGoodsID.equals("0") == false) {// 初始化加载的数据
+			try {
+				List<DisposableGoodsBatch> disposableGoodsBatchStocks = diposableGoodsManager.getDisposableGoodsBatchesByDisposableGoodsID(Long.valueOf(disposableGoodsID));
+				if(disposableGoodsBatchStocks == null){
+					disposableGoodsBatchStocks = new ArrayList<DisposableGoodsBatch>();
+				}
+				String jsonString = JSONUtil.toJSONString(disposableGoodsBatchStocks, true);
+				StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8");
+				StrutsParamUtils.getResponse().getWriter()
+						.println(jsonString);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+	} 
+	
 
 	public void deleteDiposableGoods() {
 		String idStr = StrutsParamUtils.getPraramValue("ids", "");
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
===================================================================
diff -u -r12806 -r12817
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java	(.../DiposableGoodsManager.java)	(revision 12806)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java	(.../DiposableGoodsManager.java)	(revision 12817)
@@ -100,6 +100,8 @@
 	
 	public List<DisposableGoodsBatch> getDisposableGoodsBatchByBatchBarcodes(Collection<String> barcodes);
 	
+	public List<DisposableGoodsBatch> getDisposableGoodsBatchesByDisposableGoodsID(Long disposableGoodsID);
+	
 //	public List<DiposableGoods> getDiposableGoodsByIds_ForUpdate(asd);
 	// 在新的事务中执行删除。
 	public void deleteDiposableGoodsById_TRANS_NEW(String id);
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
===================================================================
diff -u -r12757 -r12817
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js	(.../diposableGoodsView.js)	(revision 12757)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js	(.../diposableGoodsView.js)	(revision 12817)
@@ -28,10 +28,9 @@
 		fields : [ 'value'],
 		data : [[SUPPLYROOMGOODS_YES],[SUPPLYROOMGOODS_NO]]
 	});
-	
 	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!loadDisposableGoodsBatchesByDisposableGoodsID.do?id=' + id,
 			method : 'POST'
 		}),
 		reader : new top.Ext.data.JsonReader({
@@ -890,7 +889,7 @@
 		renderTo : 'gridDiv',
 		frame : false
 	}, readerDetail,
-		DiposableGoodsTableManager.findDiposableGoodsTableList,
+		DiposableGoodsTableManager.findDisposableGoodsTableList,
 		null 
 	);