Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveDisposablegoods.java
===================================================================
diff -u -r13633 -r13901
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveDisposablegoods.java	(.../ExpensiveDisposablegoods.java)	(revision 13633)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveDisposablegoods.java	(.../ExpensiveDisposablegoods.java)	(revision 13901)
@@ -55,7 +55,11 @@
 	private Long userecordId;//使用记录id
 	
 	private String status = STATUS_IN_WAREHOUSE;
+	
+	private String location; // 位置（组织机构code）
 
+	private String locationForDisplay; // 位置（组织机构名称）
+
 	public ExpensiveDisposablegoods() {
 		super();
 		setType(BarcodeDevice.BARCODE_TYPE_EXPENSIVEDIPOSABLEGOODS);
@@ -207,6 +211,23 @@
 	public void setStatus(String status) {
 		this.status = status;
 	}
+	
+	public String getLocation() {
+		return location;
+	}
+
+	public void setLocation(String location) {
+		this.location = location;
+	}
+
+	public String getLocationForDisplay() {
+		return locationForDisplay;
+	}
+
+	public void setLocationForDisplay(String locationForDisplay) {
+		this.locationForDisplay = locationForDisplay;
+	}
+
 	@Transient
 	public boolean isAssociatedInfoValidForInvoice() {
 		if (!DatabaseUtil.isPoIdValid(invoiceId)) {