Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
===================================================================
diff -u -r23974 -r24022
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java	(.../InvoicePlan.java)	(revision 23974)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java	(.../InvoicePlan.java)	(revision 24022)
@@ -155,10 +155,10 @@
 	public static final Integer UNREAD = 0;
 	public static final Integer READED = 1;
 	
-	public static String RETURN_STATUS_UNRETURNED = "未归还";
-	public static String RETURN_STATUS_PARTIALLY_RETURNED = "部分归还";
-	public static String RETURN_STATUS_RETURNED = "已归还";
-	public static String RETURN_STATUS_AWAITCONFIRM = "归还待确认";
+	public final static String RETURN_STATUS_UNRETURNED = "未归还";
+	public final static String RETURN_STATUS_PARTIALLY_RETURNED = "部分归还";
+	public final static String RETURN_STATUS_RETURNED = "已归还";
+	public final static String RETURN_STATUS_AWAITCONFIRM = "归还待确认";
 
 	
 	public static final String RECYCLINGSTATUS_AWAITRECYCLE = "待回收";
@@ -421,6 +421,11 @@
 	 */
 	private String gatherInvoicePlanIds;
 
+	/**
+	 * 器械返消记录id(因为外来器械申请单也需要器械包返消的id,所以将此字段移动该po中)
+	 */
+	private Long tousseReturnDisinfectRecordId;
+	
 	@Override
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
@@ -1385,6 +1390,14 @@
 		this.gatherInvoicePlanIds = gatherInvoicePlanIds;
 	}
 
+	public Long getTousseReturnDisinfectRecordId() {
+		return tousseReturnDisinfectRecordId;
+	}
+
+	public void setTousseReturnDisinfectRecordId(Long tousseReturnDisinfectRecordId) {
+		this.tousseReturnDisinfectRecordId = tousseReturnDisinfectRecordId;
+	}
+
 	/**
 	 * 判断是否能二次发货
 	 * @return