Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
===================================================================
diff -u -r21944 -r21994
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java	(.../ExpensiveGoodsManagerImpl.java)	(revision 21944)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java	(.../ExpensiveGoodsManagerImpl.java)	(revision 21994)
@@ -585,7 +585,7 @@
 	}
 
 	@Override
-	public boolean verifyDiposableGoods(String id, String name,
+	public boolean verifyExpensiveGoods(String id, String name,
 			String specification) {
 		String sql = "where po.name = '" + name + "'";
 		if (StringUtils.isNotEmpty(id)) {
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsView.js
===================================================================
diff -u -r21982 -r21994
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsView.js	(.../expensiveGoodsView.js)	(revision 21982)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsView.js	(.../expensiveGoodsView.js)	(revision 21994)
@@ -76,7 +76,6 @@
 	
 	batchRecord = Ext.data.Record.create([
 		{name : 'id'},
-		{name : 'name'},
 		{name : 'certification'}
 	]);
 
@@ -394,8 +393,8 @@
 						select : function(combo, record, index) {
 							diposableGoodsBatchNumStore.removeAll();
 							top.Ext.getCmp("certification").setValue('');
-							var diposableGoodsID = record.data.id+'';
-							ExpensiveGoodsTableManager.getCertificationsByExpensiveGoodsSupplierId(diposableGoodsID,
+							var expensiveGoodsSupplierId = record.data.id+'';
+							ExpensiveGoodsTableManager.getCertificationsByExpensiveGoodsSupplierId(expensiveGoodsSupplierId,
 									function(batchesStr){
 											var batches = top.Ext4.JSON.decode(batchesStr);
 											if(batches.length > 0){
@@ -627,7 +626,7 @@
 							blur : function(thiz) {},
 							select : function(combo, record, index) {
 								selCertification = {
-										id: record.data.certificationId,
+										id: record.data.id,
 										certification: record.data.certification
 								}
 							}
@@ -1108,8 +1107,8 @@
 		params : {id : id},
 		success : function(form, action) {
 			var expensiveGoods = action.result.data;
-//			top.Ext.getCmp("orginalName").setValue(expensiveGoods.name);
-//			top.Ext.getCmp("orginalSpecification").setValue(expensiveGoods.specification);
+			top.Ext.getCmp("orginalName").setValue(expensiveGoods.name);
+			top.Ext.getCmp("orginalSpecification").setValue(expensiveGoods.specification);
 //			top.Ext.getCmp("registrationCertification").setValue(expensiveGoods.registrationCertification);
 //			top.Ext.getCmp("manufactor").setValue(expensiveGoods.expensiveGoodsSupplier);
 		},
@@ -1197,7 +1196,7 @@
 		{header : "最小申请数量",width : 80,dataIndex : 'minApplyAmount'},
 		{header : "最大申请数量",width : 80,dataIndex : 'maxApplyAmount'},
 		{header : "单位",width : 50,dataIndex : 'unit'},
-		{header : "顺序号",width : 50,dataIndex : 'sequence'},
+		{header : "注册证",width : 50,dataIndex : 'certification'},
 		{header : "拼音码",width : 90,dataIndex : 'spelling'},
 		{header : "五笔码",width : 90,dataIndex : 'wbCode'},
 		{header : "能否作为器械包材料",width : 120,dataIndex : 'isPartOfTousseMaterial'},
@@ -1219,7 +1218,7 @@
 	    {name : 'minApplyAmount'}, 
 	    {name : 'maxApplyAmount'},
 	    {name : 'unit'},
-	    {name : 'sequence'},
+	    {name : 'certification'},
 	    {name : 'minStorage'},
 	    {name : 'maxStorage'}, 
 	    {name : 'spelling'},
@@ -1238,7 +1237,7 @@
 	        {type: 'numeric',  dataIndex: 'minApplyAmount'},
 	        {type: 'numeric',  dataIndex: 'maxApplyAmount'},
 	        {type: 'string',  dataIndex: 'unit'},
-	        {type: 'numeric',  dataIndex: 'sequence'},
+	        {type: 'string',  dataIndex: 'certification'},
 	        {type: 'numeric',  dataIndex: 'minStorage'},
 	        {type: 'numeric',  dataIndex: 'maxStorage'},
 	        {type: 'string',  dataIndex: 'spelling'},
Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java
===================================================================
diff -u -r21944 -r21994
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java	(.../ExpensiveGoodsAction.java)	(revision 21944)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java	(.../ExpensiveGoodsAction.java)	(revision 21994)
@@ -208,7 +208,7 @@
 		String specification = StrutsParamUtils.getPraramValue("specification",
 				null);
 		String message = "{success:true,message:'验证成功',stauts:1}";
-		boolean result = expensiveGoodsManager.verifyDiposableGoods(id, name,
+		boolean result = expensiveGoodsManager.verifyExpensiveGoods(id, name,
 				specification);
 		if (!result) {
 			message = "{success:false,message:'一次性物品的名称不唯一',stauts:0}";
@@ -226,7 +226,7 @@
 	}
 
 
-	// 保存一次性物品定义
+	// 保存高值耗材定义
 	public String saveExpensiveGoods() {
 		JSONObject obj = new JSONObject();
 		obj.put("success", true);
@@ -237,7 +237,7 @@
 				if(idLong != null){
 					id = idLong.toString();
 				}
-				boolean vr = expensiveGoodsManager.verifyDiposableGoods(id, expensiveGoods.getName(),
+				boolean vr = expensiveGoodsManager.verifyExpensiveGoods(id, expensiveGoods.getName(),
 						expensiveGoods.getSpecification());
 				if (!vr) {
 					throw new RuntimeException("高值耗材名称不唯一!");
@@ -277,7 +277,8 @@
 		}
 		return null;
 	}
-
+	
+	// 加载高值耗材定义
 	public String loadExpensiveGoods() {
 		StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8");
 		String id = StrutsParamUtils.getPraramValue("id", "");
@@ -294,7 +295,7 @@
 		JSONObject expensiveGoodsObj = JSONObject.fromObject(expensiveGoods);
 		if(registrationCertification != null){
 			expensiveGoodsSupplier = registrationCertification.getExpensiveGoodsSupplier();
-			expensiveGoodsObj.put("registrationCertification", registrationCertification.getCertification());
+//			expensiveGoodsObj.put("certification", registrationCertification.getCertification());
 			if(expensiveGoodsSupplier != null){
 				expensiveGoodsObj.put("expensiveGoodsSupplier",expensiveGoodsSupplier.getCompanyName());
 			}
Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManager.java
===================================================================
diff -u -r21955 -r21994
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManager.java	(.../ExpensiveGoodsManager.java)	(revision 21955)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManager.java	(.../ExpensiveGoodsManager.java)	(revision 21994)
@@ -41,7 +41,7 @@
 	
 	public ExpensiveGoodsStock getExpensiveGoodsStockByExpensiveGoodsID(Long warehouseID,Long expensiveGoodssID);
 	
-	public boolean verifyDiposableGoods(String id, String name,
+	public boolean verifyExpensiveGoods(String id, String name,
 			String specification);
 
 	public String getDiposableGoodsTypeTreeJson();