Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntryItem.java
===================================================================
diff -u -r13037 -r13206
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntryItem.java	(.../GodownEntryItem.java)	(revision 13037)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntryItem.java	(.../GodownEntryItem.java)	(revision 13206)
@@ -3,15 +3,18 @@
 import java.text.SimpleDateFormat;
 import java.util.Comparator;
 import java.util.Date;
+
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Transient;
+
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
+
 import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.hibernate.ObjectDao;
 
@@ -64,6 +67,12 @@
 	private Boolean newBatch; // 该入库物品是否新批次
 	
 	private String certification ;// 注册证号
+	
+	/**
+	 * 分类级别(分一类、二类、三类.按药监局标准分别表示不与人体皮肤接触、用于皮肤表面及用于人体类)
+	 */
+	private String grade;
+	
 	private String supplierName ;// 供应商
 
 	private String sterileBatchNumber ;// 灭菌批次
@@ -234,6 +243,14 @@
 		this.certification = certification;
 	}
 
+	public String getGrade() {
+		return grade;
+	}
+
+	public void setGrade(String grade) {
+		this.grade = grade;
+	}
+
 	public String getSupplierName() {
 		return supplierName;
 	}
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
===================================================================
diff -u -r13103 -r13206
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js	(.../godownEntryView.js)	(revision 13103)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js	(.../godownEntryView.js)	(revision 13206)
@@ -157,7 +157,7 @@
 	top.Ext.getCmp('warehouseName').setValue(name);
 }
 
-function addItems(disposableGoodsID,batchID,name,amount,cost,batchNumber,expDate,supplierName,sterileBatchNumber,manufacturer,certification,identification,producingArea){
+function addItems(disposableGoodsID,batchID,name,amount,cost,batchNumber,expDate,supplierName,sterileBatchNumber,manufacturer,certification,identification,producingArea,grade){
 	if(top.Ext.getCmp('name1').getValue() == null || top.Ext.getCmp('name1').getValue() == ''){
 		showResult("请填写物品名称!");
 		return false;
@@ -233,7 +233,8 @@
 		identification : identification,
 		producingArea: producingArea,
 		hasBiologicalTestReport : hasBiologicalTestReport,
-		hasInvoice : hasInvoice
+		hasInvoice : hasInvoice,
+		grade:grade
 	});
 	//top.Ext.getCmp('godownEntryItemGrid').getStore().add(godownEntryItem);
 	top.Ext.getCmp('godownEntryItemGrid').getStore().insert(0 , godownEntryItem);
@@ -528,7 +529,8 @@
 				  	    {name : 'totalPrice'},
 				  	    {name : 'deleteButton'},
 				  	    {name : 'hasBiologicalTestReport'},
-				  	    {name : 'hasInvoice'}
+				  	    {name : 'hasInvoice'},
+				  	    {name : 'grade'}
 				  	]
 				})
 			}),
@@ -708,6 +710,7 @@
 								top.Ext.getCmp('manufacturer').setValue(lastGodownEntryItem.manufacturer);
 								top.Ext.getCmp('sterileBatchNumber').setValue(lastGodownEntryItem.sterileBatchNumber);
 								top.Ext.getCmp('producingArea').setValue(lastGodownEntryItem.producingArea);
+								top.Ext.getCmp('grade').setValue(lastGodownEntryItem.grade);
 							}
 						});
 						batchNumStore.baseParams.disposableGoodsID = record.data.id;
@@ -1051,6 +1054,25 @@
 	    					}
 	    				}
 	    			},{
+	    				text : '类别:'
+	    			},{
+	    				xtype : 'combo',
+	    				id : 'grade',
+	    				name : 'grade',
+	    				minChars : 0,
+	    				valueField : 'name',
+	    				displayField : 'name',
+	    				mode : 'local',
+	    				triggerAction : 'all',
+	    				store : new Ext.data.SimpleStore({
+	    					data:[['一类'],['二类'],['三类']],
+	    					fields:['name']
+	    				}),
+	    				forceSelection : false,
+	    				allowBlank : true,
+	    				editable:false,
+	    				width : 60
+	    			},{
 	    				text : '添加',
 	    				iconCls : 'btn_ext_add',
 	    				id:'addBtn',
@@ -1315,18 +1337,19 @@
   	var day = currentDate.getDate();
   	var nextYearDate = year + "-" + month + "-" + day;
   	var producingArea = top.Ext.getCmp('producingArea').getValue();
+  	var grade = top.Ext.getCmp('grade').getValue();
   	if(expDateStr != ""){
   		if(dateCompare(expDateStr,nextYearDate) != 1){
 	    		top.Ext.MessageBox.confirm("请确认","添加的物品失效日期在一年之内,确定要添加吗？",function(button, text){
 	    			if("yes" == button){
-	    				addItems(disposableGoodsID,'',name,count,cost,batchNumber,expDate,supplierName,sterileBatchNumber,manufacturer,certification,'',producingArea);
+	    				addItems(disposableGoodsID,'',name,count,cost,batchNumber,expDate,supplierName,sterileBatchNumber,manufacturer,certification,'',producingArea,grade);
 	    				var grid = top.Ext.getCmp('godownEntryItemGrid');
 	    			  	setTotalMoney(grid);
 	    			  	top.Ext.getCmp('name1').focus(false,100);
 	    			}
 	    		});
 	  	}else{
-	  		addItems(disposableGoodsID,'',name,count,cost,batchNumber,expDate,supplierName,sterileBatchNumber,manufacturer,certification,'',producingArea);
+	  		addItems(disposableGoodsID,'',name,count,cost,batchNumber,expDate,supplierName,sterileBatchNumber,manufacturer,certification,'',producingArea,grade);
 	  		var grid = top.Ext.getCmp('godownEntryItemGrid');
 	  	  	setTotalMoney(grid);
 	  	}
@@ -1562,7 +1585,8 @@
 					totalPrice:parseFloat(Ext.util.Format.usMoney(amount*cost)),
 					producingArea: action.result.data.itemsList[i].producingArea,
 					hasBiologicalTestReport : action.result.data.itemsList[i].hasBiologicalTestReport,
-					hasInvoice : action.result.data.itemsList[i].hasInvoice
+					hasInvoice : action.result.data.itemsList[i].hasInvoice,
+					grade : action.result.data.itemsList[i].grade
 				});
 				
 				top.Ext.getCmp('godownEntryItemGrid').getStore().add(godownEntryItem);
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
===================================================================
diff -u -r13166 -r13206
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java	(.../GodownEntryManagerImpl.java)	(revision 13166)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java	(.../GodownEntryManagerImpl.java)	(revision 13206)
@@ -470,6 +470,15 @@
 			warehousingByGodownEntryItem(entry, warehouseID, warehouseName,
 					idToDisposableGoodsMap, idToDisposableGoodsStockMap,
 					idToBatchStockMap, godownEntryItem);
+			//根据入库单所选一次性物品类别所选更新一次性物品类别
+			if(godownEntryItem.getDisposableGoodsID() != null && StringUtils.isNotBlank(godownEntryItem.getGrade())){
+				DisposableGoods disposableGoods = 
+						(DisposableGoods)objectDao.getByProperty("DisposableGoods", "id", godownEntryItem.getDisposableGoodsID());
+				if(disposableGoods != null){
+					disposableGoods.setGrade(godownEntryItem.getGrade());
+					objectDao.saveOrUpdate(disposableGoods);
+				}
+			}
 			objectDao.update(godownEntryItem);// 更新item
 		}
 	}
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java
===================================================================
diff -u -r13073 -r13206
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java	(.../GodownEntryItemManagerImpl.java)	(revision 13073)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java	(.../GodownEntryItemManagerImpl.java)	(revision 13206)
@@ -133,6 +133,7 @@
 		if(StringTools.isBlank(hasInvoice)){
 			hasInvoice = null;
 		}
+		String grade = itemObject.optString("grade", null);//类别
 		
 		GodownEntryItem godownEntryItem = new GodownEntryItem();
 		godownEntryItem.setId(itemId);
@@ -156,6 +157,7 @@
 		godownEntryItem.setProducingArea(producingArea);
 		godownEntryItem.setHasBiologicalTestReport(hasBiologicalTestReport);
 		godownEntryItem.setHasInvoice(hasInvoice);
+		godownEntryItem.setGrade(grade);
 		return godownEntryItem;
 	}
 
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
===================================================================
diff -u -r12968 -r13206
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java	(.../DisposableGoods.java)	(revision 12968)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java	(.../DisposableGoods.java)	(revision 13206)
@@ -1,7 +1,9 @@
 package com.forgon.disinfectsystem.entity.assestmanagement;
 
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 
 import javax.persistence.Entity;
@@ -78,6 +80,22 @@
 	
 	private String certification;// 注册证号
 	
+	/**
+	 * 分类级别(分一类、二类、三类.按药监局标准分别表示不与人体皮肤接触、用于皮肤表面及用于人体类)
+	 */
+	private String grade;
+	
+	public static String GRADE_FIRST = "一类";
+	public static String GRADE_SECOND = "二类";
+	public static String GRADE_THIRD = "三类";
+	
+	public static List<String> gradeList = new ArrayList<String>();
+	static{
+		gradeList.add(GRADE_FIRST);
+		gradeList.add(GRADE_SECOND);
+		gradeList.add(GRADE_THIRD);
+	}
+	
 	private String inventorySerialNumber;	// 物资系统的物资编码，用于与物资系统交互
 	
 	@JsonIgnore
@@ -253,6 +271,14 @@
 		this.certification = certification;
 	}
 
+	public String getGrade() {
+		return grade;
+	}
+
+	public void setGrade(String grade) {
+		this.grade = grade;
+	}
+
 	@Transient
 	public String getShowName() {
 		if (StringUtils.isNotBlank(this.specification)) {
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
===================================================================
diff -u -r13181 -r13206
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java	(.../GodownEntryTableManager.java)	(revision 13181)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java	(.../GodownEntryTableManager.java)	(revision 13206)
@@ -19,6 +19,7 @@
 import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodsManager;
 import com.forgon.disinfectsystem.diposablegoods.service.GodownEntryItemManager;
 import com.forgon.disinfectsystem.diposablegoods.service.GodownEntryManager;
+import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods;
 import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntry;
 import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntryItem;
 import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
@@ -320,6 +321,7 @@
 		jsonObject.put("supplierName", "");
 		jsonObject.put("manufacturer", "");
 		jsonObject.put("sterileBatchNumber", "");
+		jsonObject.put("grade", "");
 		if (godownEntryItem != null) {
 			//注册证号
 			if(StringUtils.isNotBlank(godownEntryItem.getCertification())){
@@ -341,7 +343,17 @@
 			if(StringUtils.isNotBlank(godownEntryItem.getSterileBatchNumber())){
 				jsonObject.put("sterileBatchNumber", godownEntryItem.getSterileBatchNumber());
 			}
-			
+			//尖别
+			if(StringUtils.isNotBlank(godownEntryItem.getGrade())){
+				jsonObject.put("grade", godownEntryItem.getGrade());
+			}else{
+				//查一次性物品定义的类别
+				DisposableGoods disposableGoods = 
+						diposableGoodsManager.getDisposableGoodsById(disposableGoodsId);
+				if(disposableGoods != null && StringUtils.isNotBlank(disposableGoods.getGrade())){
+					jsonObject.put("grade", disposableGoods.getGrade());
+				}
+			}
 		}
 		return jsonObject.toString();
 	}