Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
===================================================================
diff -u -r12829 -r12871
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 12829)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 12871)
@@ -267,11 +267,6 @@
 	   ]
 });
 
-setTimeout(function(){
-	comboGoodsStore.sorters.clear();
-	comboGoodsStore.load();
-},1000);
-
 var tousseAndDiposableGoodsStore = new Ext.data.Store({
 	proxy : new Ext.data.HttpProxy({
 		url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!searchInsideTousseData.do',
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
===================================================================
diff -u -r12867 -r12871
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 12867)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 12871)
@@ -638,21 +638,18 @@
 		temp.put("unit", StringTools.getDefaultString(disposableGoods.getUnit()));
 		temp.put("tousseType", "一次性物品");
 		temp.put("packageSpec", disposableGoods.getPackageSpec());
-
-		String displayName = "";
-		if(goodsStocks != null){
+		temp.put("amount", 0);
+		temp.put("price", 0.00);
+		String displayName = (goodsName + "<font color='red'>(库存：0)</font>");
+		if(goodsStocks != null && goodsStocks.size() > 0){
 			for (DisposableGoodsStock goodsStock : goodsStocks) {
 				//如果不是当前一次性物品定义的库存,则跳过
 				if(goodsStock.getDisposableGoodsID() != disposableGoods.getId()){
 					continue;
 				}
 				Object obj = temp.get("amount");
-				if (obj == null) {
-					temp.put("amount", goodsStock.getAmount());
-				} else {
-					temp.put("amount", Integer.parseInt(obj.toString())
+				temp.put("amount", Integer.parseInt(obj.toString())
 							+ goodsStock.getAmount());
-				}
 				if (showReferencePrice) {
 					temp.put("referencePrice", disposableGoods.getReferencePrice());
 
@@ -665,9 +662,6 @@
 					displayName = getDisposableGoodsDisplayName(disposableGoods,goodsStock);
 				}
 			}
-		}else{
-			displayName = DisposableGoodsUtils.getDisposableGoodsFullName(
-					disposableGoods.getName(),disposableGoods.getSpecification());
 		}
 		temp.put("displayName", displayName);
 		return temp;