Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java
===================================================================
diff -u -r20779 -r20780
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java	(.../ExpensiveGoodsAction.java)	(revision 20779)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java	(.../ExpensiveGoodsAction.java)	(revision 20780)
@@ -310,7 +310,7 @@
 	
 	
 
-	public void deleteDiposableGoods() {
+	public void deleteExpensiveGoods() {
 		String idStr = StrutsParamUtils.getPraramValue("ids", "");
 		String message = "";
 		try {
Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
===================================================================
diff -u -r20779 -r20780
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java	(.../ExpensiveGoodsManagerImpl.java)	(revision 20779)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java	(.../ExpensiveGoodsManagerImpl.java)	(revision 20780)
@@ -172,14 +172,13 @@
 		}
 		
 		//查出对应的一次性物品库存数据,并将最小申请数量等属性更新为与一次性物品的一致
+		// 更新ExpensiveGoodsStock的属性
+		
 		if(DatabaseUtil.isPoIdValid(expensiveGoodss.getId())){
-			List<ExpensiveGoodsStock> list = 
-					objectDao.findBySql(ExpensiveGoodsStock.class.getSimpleName(), " where expensiveGoods_id=" + expensiveGoodss.getId());
-			if(CollectionUtils.isNotEmpty(list)){
-				for(ExpensiveGoodsStock expensiveGoodssStock : list){
-					expensiveGoodssStock.setReferencePrice(expensiveGoodss.getReferencePrice());
-					expensiveGoodssStock.setName(expensiveGoodss.getName());  //同步更新一次性物品的中名字（陈家儒改）
-					expensiveGoodssStock.setSpecification(expensiveGoodss.getSpecification());  //同步更新一次性物品的中规格（陈家儒改）
+			List<ExpensiveGoodsStock> expensiveGoodssStockList = getExpensiveGoodsStockByExpensiveGoodsId(expensiveGoodss.getId());
+			if(CollectionUtils.isNotEmpty(expensiveGoodssStockList)){
+				for(ExpensiveGoodsStock expensiveGoodssStock : expensiveGoodssStockList){
+					updateExpensiveGoodsStockProperties(expensiveGoodssStock, expensiveGoodss);
 					objectDao.saveOrUpdate(expensiveGoodssStock);
 				}
 			}
@@ -248,14 +247,8 @@
 		}
 		updateExpensiveGoodsProperties(curExpensiveGoods, expensiveGoodss);
 		save(curExpensiveGoods);
-		// 更新ExpensiveGoodsStock的属性
-		List<ExpensiveGoodsStock> expensiveGoodssStockList = getExpensiveGoodsStockByExpensiveGoodsId(expensiveGoodss.getId());
-		if(expensiveGoodssStockList != null){
-			for (ExpensiveGoodsStock expensiveGoodssStock : expensiveGoodssStockList) {
-				updateExpensiveGoodsStockProperties(expensiveGoodssStock, expensiveGoodss);
-			}
-		}
 		
+		
 		if(!StringUtils.isBlank(oldName) || !StringUtils.isBlank(newName)){
 			nameChanged = !StringUtils.equals(oldName, newName);
 		}
@@ -569,20 +562,7 @@
 	@Override
 	public String getDiposableGoodsTypeTreeJson() {
 		JSONArray jsonArray = new JSONArray();
-		List<String> types = httpOptionManager
-				.getHttpOptionTextById(HttpOption.SYSTEMSETTING_DIPOSABLEGOODS_TYPE);
-		for (String type : types) {
-			JSONObject json = new JSONObject();
-			json.put("expanded", false);
-			json.put("href", "javascript:reloadGrid('"+type+"');");
-			json.put("hrefTarget", "_self");
-			json.put("isManager", false);
-			json.put("keyId", "");
-			json.put("leaf", true);
-			json.put("singleClickExpand", true);
-			json.put("text", type);
-			jsonArray.add(json);
-		}
+		
 		return jsonArray.toString();
 	}
 	
@@ -1072,14 +1052,14 @@
 //			throw new RuntimeException("物品定义有关联的入库单/退库单/调拨单记录，不能被删除!");
 //		}
 		// 库存对象，因为目前所有的相关记录都是关联库存对象，所以只需要库存对象为空，就允许删除。
-		String sql = String.format(" where %s", SqlUtils.getStringFieldInCollectionsPredicate("po.expensiveGoodssID", idsSet));
+		String sql = String.format(" where %s", SqlUtils.getStringFieldInCollectionsPredicate("po.expensiveGoods.id", idsSet));
 		if(objectDao.countObjectBySql(ExpensiveGoodsInstance.class.getSimpleName(), sql) > 0){
+			throw new RuntimeException("物品定义有关联的实例对象，不能被删除!");
+		}
+		sql = String.format(" where %s", SqlUtils.getStringFieldInCollectionsPredicate("po.expensiveGoods.id", idsSet));
+		if(objectDao.countObjectBySql(ExpensiveGoodsStock.class.getSimpleName(), sql) > 0){
 			throw new RuntimeException("物品定义有关联的库存对象，不能被删除!");
 		}
-		sql = String.format(" where %s", SqlUtils.getStringFieldInCollectionsPredicate("po.expensiveGoodssID", idsSet));
-		if(objectDao.countObjectBySql(ExpensiveDisposablegoods.class.getSimpleName(), sql) > 0){
-			throw new RuntimeException("物品定义有关联的高值耗材对象，不能被删除!");
-		}
 		String deleteSql = String.format("delete from %s where %s",ExpensiveGoods.class.getSimpleName(), SqlUtils.getStringFieldInCollectionsPredicate("id", idsSet));
 		objectDao.executeUpdate(deleteSql);
 //		for (String id : ids.split(";")) {
@@ -1564,9 +1544,9 @@
 		return getExpensiveGoodsStockByExpensiveGoodsIDs(warehouseID, expensiveGoodssIds);
 	}
 	@Override
-	public List<ExpensiveGoodsStock> getExpensiveGoodsStockByExpensiveGoodsId(Long expensiveGoodssID){
+	public List<ExpensiveGoodsStock> getExpensiveGoodsStockByExpensiveGoodsId(Long expensiveGoodsId){
 		String getExpensiveGoodsStockSql = String.format(" where %s ",
-				SqlUtils.getLongFieldPredicate("po.expensiveGoodssID", expensiveGoodssID));
+				SqlUtils.getLongFieldPredicate("po.expensiveGoods.id", expensiveGoodsId));
 		List<ExpensiveGoodsStock> expensiveGoodssStocks = objectDao.findBySql(ExpensiveGoodsStock.class.getSimpleName(),getExpensiveGoodsStockSql);
 		return expensiveGoodssStocks;
 	}
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsView.js
===================================================================
diff -u -r20779 -r20780
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsView.js	(.../expensiveGoodsView.js)	(revision 20779)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsView.js	(.../expensiveGoodsView.js)	(revision 20780)
@@ -193,6 +193,7 @@
 						fieldLabel : "能否配包",
 						valueField : 'value',
 						displayField : 'value',
+						value: '能',
 						store : isPartOfTousseMaterialStore,
 						forceSelection : true,
 						allowBlank : false,
@@ -211,6 +212,7 @@
 						fieldLabel : '能否申请',
 						valueField : 'value',
 						displayField : 'value',
+						value: '能',
 						store : isApplicationMaterialStore,
 						forceSelection : true,
 						allowBlank : false,
@@ -229,6 +231,7 @@
 						fieldLabel : '消毒供应中心物品',
 						valueField : 'value',
 						displayField : 'value',
+						value: '是',
 						store : yesNoStore,
 						forceSelection : true,
 						allowBlank : false,
@@ -247,6 +250,7 @@
 						fieldLabel : '包外标签是否打印',
 						valueField : 'value',
 						displayField : 'value',
+						value: '是',
 						store : yesNoStore,
 						forceSelection : true,
 						allowBlank : false,
@@ -744,7 +748,7 @@
 			ids = ids + ';' + records[i].data['id'];
 		}
 	}
-	top.Ext.MessageBox.confirm("请确认","是否确定要删除选中的高值耗材信息？",
+	top.Ext.MessageBox.confirm("请确认","是否确定要删除选中的高值耗材？",
 		function(button, text) {
 			if ("yes" == button){
 				Ext.Ajax.request({
@@ -940,7 +944,7 @@
 		}
 	}, '-', {
 		text : '删除',
-		hidden : SSTS_ExpensiveGoods_Delete,
+//		hidden : SSTS_ExpensiveGoods_Delete,
 		iconCls : 'btn_ext_application_del',
 		handler : function() {
 			deleteExpensiveGoods(grid);