Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
===================================================================
diff -u -r27331 -r27811
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java	(.../TousseItem.java)	(revision 27331)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java	(.../TousseItem.java)	(revision 27811)
@@ -1108,4 +1108,20 @@
 	public void setMaterialAmount(Integer materialAmount) {
 		this.materialAmount = materialAmount;
 	}
+
+	@Override
+	public String toString() {
+		return "{id:" + id + ", tousseName:'" + tousseName
+				+ "', ttsName:'" + ttsName + "', amount:" + amount
+				+ ", urgentAmount:" + urgentAmount + ", urgentLevel:"
+				+ urgentLevel + ", tallyAmount:" + tallyAmount
+				+ ", recyclingAmount:" + recyclingAmount + ", sendOutAmount:"
+				+ sendOutAmount + ", unit:'" + unit + "', disposableGoodsType:'"
+				+ disposableGoodsType + "', middlePackageAmount:"
+				+ middlePackageAmount + ", transferScale:" + transferScale
+				+ ", price:" + price + ", diposable:'" + diposable
+				+ "', tousseDefinitionId:" + tousseDefinitionId
+				+ ", disposableGoodsId:" + disposableGoodsId + ", tousseType:'"
+				+ tousseType + "'}";
+	}
 }
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
===================================================================
diff -u -r27520 -r27811
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 27520)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 27811)
@@ -100,20 +100,22 @@
 	
 	public static final String STATUS_PACKED = "已装配";
 	public static final String STATUS_REVIEWED = "已审核";
+	public static final String STATUS_DISINFECTED = "已消毒";
+	public static final String STATUS_STERILING = "灭菌中";
+	public static final String STATUS_DELAY_CONFIRM = "灭菌待确认";
 	public static final String STATUS_STERILED = "已灭菌";
 	public static final String STATUS_SHIPPED = "已发货";
 	public static final String STATUS_SIGNED = "已签收";
+	@Deprecated
 	public static final String STATUS_NO_DELIVER = "待发货";
 	public static final String STATUS_USED = "已使用";
-	public static final String STATUS_STERILING = "灭菌中";
-	public static final String STATUS_DISINFECTED = "已消毒";
+	@Deprecated
 	public static final String STATUS_RETURNED = "已退货";
 	public static final String STATUS_PRERECYCLED = "预回收";
 	public static final String STATUS_RECYCLED = "已回收";
 	public static final String STATUS_DISCARD = "已废弃";
 	public static final String STATUS_WAIT_FOR_RECALL = "待召回";
 	public static final String STATUS_RECALLED = "已召回";
-	public static final String STATUS_DELAY_CONFIRM = "灭菌待确认";
 	/**
 	 * 基数管理查询各种包状态的数量时使用，实际并非包状态。cardinalNum:科室库存设置的基数
 	 */
@@ -2574,5 +2576,17 @@
 	public void setMaterialSplitAmount(Integer materialSplitAmount) {
 		this.materialSplitAmount = materialSplitAmount;
 	}
+
+	@Override
+	public String toString() {
+		return "{id:" + getId() + ",tousseName:'" + tousseName + "', operator:'"
+				+ operator + "', operationTime:'" + operationTime + "', status:'"
+				+ status + "', price:" + price + ", location:'" + location
+				+ "', locationForDisplay:'" + locationForDisplay
+				+ "', sterilingType:'" + sterilingType + "', sterilingMode:'"
+				+ sterilingMode + "', validUntil:'" + validUntil + "', depart:'"
+				+ depart + "', wareHouseName:'" + wareHouseName
+				+ "', barcode:'" + getBarcode() + "'}";
+	}
 	
 }
\ No newline at end of file
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/DiposableGoodsItem.java
===================================================================
diff -u -r25145 -r27811
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/DiposableGoodsItem.java	(.../DiposableGoodsItem.java)	(revision 25145)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/DiposableGoodsItem.java	(.../DiposableGoodsItem.java)	(revision 27811)
@@ -92,12 +92,16 @@
 	
 	/**
 	 * 装配记录id
+	 * 冒似没有用到,暂时标记为过时 since:2020-04-01
 	 */
+	@Deprecated
 	private Long packingRecordId;
 	
 	/**
 	 * 装配扣减明细id
+	 * 冒似没有用到,暂时标记为过时 since:2020-04-01
 	 */
+	@Deprecated
 	private Long packingRecordOutItemId;
 	
 	private Long tousseInstanceId;
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceItem.java
===================================================================
diff -u -r27373 -r27811
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceItem.java	(.../InvoiceItem.java)	(revision 27373)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceItem.java	(.../InvoiceItem.java)	(revision 27811)
@@ -48,7 +48,10 @@
 	private String tousseName;// 名字
 
 	private Integer amount = 0;// 数量
-	
+
+	/**
+	 * 经检查,当diposable为"是"时,此字段才有值
+	 */
 	private String barcode;//只有当是外部代理灭菌器械包时，该值才不为空
 	
 	private Long expensiveDisposablegoodsId;// 高值耗材id
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakerecordmanager/StockTakeRecord.java
===================================================================
diff -u -r23492 -r27811
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakerecordmanager/StockTakeRecord.java	(.../StockTakeRecord.java)	(revision 23492)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakerecordmanager/StockTakeRecord.java	(.../StockTakeRecord.java)	(revision 27811)
@@ -53,7 +53,7 @@
 	private String orgUnitCoding;//科室编码
 	
 	/**
-	 * 盘点记录id
+	 * 盘点记录id(定时器定时结算的记录此字段为null、手工盘点的单据此字典才有值,关联InventoryRecord的id)
 	 */
 	private Long inventoryRecordId;
 
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
===================================================================
diff -u -r27533 -r27811
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java	(.../TousseDefinition.java)	(revision 27533)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java	(.../TousseDefinition.java)	(revision 27811)
@@ -501,7 +501,7 @@
 	 */
 	private Long invoicePlanID;
 	/**
-	 * 父包定义ID
+	 * 父包定义ID(用于外来器械拆分小包包实例的包定义id所关联的外来器械申请项的包定义id)
 	 */
 	private Long parentID;
 	/**
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
===================================================================
diff -u -r26996 -r27811
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java	(.../InvoicePlan.java)	(revision 26996)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java	(.../InvoicePlan.java)	(revision 27811)
@@ -583,6 +583,12 @@
 	public String getDepartCoding() {
 		return departCoding;
 	}
+
+	/**
+	 * 获取科室编码的字段名(申请科室编码或结算科室编码,默认申请科室编码)
+	 * @param groupBy
+	 * @return
+	 */
 	@Transient
 	public String getInvoiceGroupByDepartCoding(String groupBy) {
 		if (InvoiceUtils.isInvoiceGroupBySettleAccountsDepartCoding(groupBy)) {
@@ -1569,5 +1575,22 @@
 	public void setUrgentLevel(UrgentLevel urgentLevel) {
 		this.urgentLevel = urgentLevel;
 	}
+
+	@Override
+	public String toString() {
+		return "{id:'" + id + "', serialNumber:'" + serialNumber
+				+ "', applicant:'" + applicant + "', applicationTime:'"
+				+ applicationTime + "', recyclingTime:'" + recyclingTime
+				+ "', departCoding:'" + departCoding + "', depart:'" + depart
+				+ "', settleAccountsDepart:'" + settleAccountsDepart
+				+ "', settleAccountsDepartCoding:'"
+				+ settleAccountsDepartCoding + "', handleDepartCoding:'"
+				+ handleDepartCoding + "', handleDepart:'" + handleDepart
+				+ "', recyclingStatus:'" + recyclingStatus
+				+ "', deliverStatus:'" + deliverStatus + "', committedStatus:'"
+				+ committedStatus + "', printed:'" + printed + "', type:'"
+				+ type + "', endStatus:'" + endStatus + "', lastInvoiceTime:'"
+				+ lastInvoiceTime + "}";
+	}
 	
 }