Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
===================================================================
diff -u -r25141 -r25142
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 25141)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 25142)
@@ -3129,8 +3129,8 @@
 		//4、根据一次性物品id分组求和仓库数量
 		Map<Long,Long> dgIdToStockAmount = disposableGoodsStocks.stream().
 				collect(Collectors.groupingBy(DisposableGoodsStock::getDisposableGoodsID,Collectors.summingLong(DisposableGoodsStock::getAmount)));
-		for (DisposableGoods disposableGoods : disposableGoodsList) {
 		//5、返回物品信息
+		for (DisposableGoods disposableGoods : disposableGoodsList) {
 			Map<String,Object> item = buildDisposableGoodsPropertyMapWithStock(disposableGoods,dgIdToStockAmount);
 			if(item != null){
 				mapList.add(item);
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
===================================================================
diff -u -r25105 -r25142
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java	(.../DiposableGoodsAction.java)	(revision 25105)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java	(.../DiposableGoodsAction.java)	(revision 25142)
@@ -976,15 +976,8 @@
 				if(warehouse != null){
 					handleDepartCode = warehouse.getOrgUnitCode();
 				}
-				// JSONObject json = diposableGoodsManager.searchDisposableGoodsList(
-				// 		spell, allItems,handleDepartCode,true);
 				List<Map<String, Object>> reList = diposableGoodsManager.findDisposableGoodsList(spell, allItems, null, handleDepartCode, canInventory, true);
 				PageUtil.outPutResult(PageUtil.getPagePara(), reList);
-				// HttpServletResponse response = StrutsParamUtils.getResponse();
-				// response.setCharacterEncoding("UTF-8");
-				// PrintWriter out = response.getWriter();
-				// out.print(json);
-				// out.close();
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/storageRecordView.js
===================================================================
diff -u -r16322 -r25142
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/storageRecordView.js	(.../storageRecordView.js)	(revision 16322)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/storageRecordView.js	(.../storageRecordView.js)	(revision 25142)
@@ -3,7 +3,8 @@
 // 全部一次性物品
 var allDiposableGoodsStore = new Ext.data.Store({
 	proxy : new Ext.data.HttpProxy({
-		url : WWWROOT + '/disinfectSystem/diposableGoodsAction!getDiposableGoodsData.do?allItems=yes',
+//		url : WWWROOT + '/disinfectSystem/diposableGoodsAction!getDiposableGoodsData.do?allItems=yes',
+		url : WWWROOT + '/disinfectSystem/diposableGoodsAction!getDiposableGoodsDataWithStock.do',
 		method : 'POST'
 	}),
 	reader : new Ext.data.JsonReader({