Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
===================================================================
diff -u -r15903 -r15904
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java	(.../DisposableGoods.java)	(revision 15903)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java	(.../DisposableGoods.java)	(revision 15904)
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.forgon.Constants;
 import com.forgon.tools.string.StringTools;
+import com.forgon.tools.util.ForgonIntegerUtils;
 
 /**
  * 一次性物品定义
@@ -505,4 +506,26 @@
 	public void setSequence(Integer sequence) {
 		this.sequence = sequence;
 	}
+	/**
+	 * 申领单位、申领规格、转换系数这三个属性是否同时有效
+	 * @return
+	 */
+	public boolean applyValide(){
+		if(StringTools.isNotBlank(middlePackageUnit) 
+			&& ForgonIntegerUtils.isPositive(transferScale)
+			&& StringTools.isNotBlank(applicationSpecification)){
+			return true;
+		}
+		return false;
+	}
+	/**
+	 * 获取显示的规格
+	 * @return
+	 */
+	public String showSpecification(){
+		if(applyValide()){
+			return applicationSpecification;
+		}
+		return specification;
+	}
 }