Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntryItem.java
===================================================================
diff -u -r13206 -r13377
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntryItem.java	(.../GodownEntryItem.java)	(revision 13206)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntryItem.java	(.../GodownEntryItem.java)	(revision 13377)
@@ -415,4 +415,25 @@
 	public void setHasInvoice(String hasInvoice) {
 		this.hasInvoice = hasInvoice;
 	}
+	/**
+	 * 获取分类级别，只能是一类二类三类,如果都不是,返回null
+	 * @return
+	 */
+	public static String gradeOrDefault(String grade){
+		if(!"一类".equals(grade) && !"二类".equals(grade) && !"三类".equals(grade)){
+			return null;
+		}
+		return grade;
+	}
+	/**
+	 * 是否有发票及是否有生物检测报告的合法判断,如果非法，则返回null,否则返回原值
+	 * @param hasType
+	 * @return
+	 */
+	public static String hasTypeOrDefault(String hasType){
+		if(!HAS_TYPE_NO.equals(hasType) && !HAS_TYPE_YES.equals(hasType)){
+			return null;
+		}
+		return hasType;
+	}
 }