Index: forgon-tools/src/main/java/com/forgon/Constants.java
===================================================================
diff -u -r29282 -r29311
--- forgon-tools/src/main/java/com/forgon/Constants.java	(.../Constants.java)	(revision 29282)
+++ forgon-tools/src/main/java/com/forgon/Constants.java	(.../Constants.java)	(revision 29311)
@@ -25,7 +25,7 @@
 			"4.7.8","4.7.9","4.8.0","4.8.1","4.8.2","4.8.3","4.8.4","4.8.5","4.8.6","4.8.7","4.8.8","4.8.9","4.9.0","4.9.1","4.9.2","4.9.3","4.9.4","4.9.5","4.9.6",
 			"4.9.7","4.9.8","4.9.9","4.9.10","4.9.11","4.9.12","4.9.13","4.9.14","4.9.15","4.9.16","4.9.17","4.9.18","4.9.19","4.9.20","4.9.21","4.9.22","4.9.23","4.9.24",
 			"4.9.25","4.9.26","4.9.27","4.9.28","4.9.29","4.9.30","4.9.31","4.9.32","4.9.33","4.9.34","4.9.35","4.9.36","4.9.37","4.9.38","4.9.39","4.9.40","4.9.41","4.9.42","4.9.43","4.9.44",
-			"4.9.45","4.9.46","4.9.47","4.9.48","4.9.49","4.9.50","4.9.51","4.9.52"};
+			"4.9.45","4.9.46","4.9.47","4.9.48","4.9.49","4.9.50","4.9.51","4.9.52","4.9.53"};
 
 	// 版本列表(4.0版本升级4.1版需要分两步:先从4.0升到4.1.0、然后从4.1.0升级4.1最新版本)
 	/*public final static String[] SOFTWARE_VERSION_ARRAY = new String[] {
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
===================================================================
diff -u -r27739 -r29311
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java	(.../SupplyRoomConfig.java)	(revision 27739)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java	(.../SupplyRoomConfig.java)	(revision 29311)
@@ -93,13 +93,28 @@
 	 */
 	private Boolean isORAppFormMerge;
 
+	/**
+	 * 回收后发货,用tousseDeliverOccasion替代
+	 * @deprecated
+	 */
 	private Boolean afterRecyclingTousseDeliver = false;
+
 	/**
+	 * 器械包发货时间(时机?)
+	 * BJ307YY-13 预回收功能增加功能改进-允许预回收后发货
+	 */
+	private String tousseDeliverOccasion;
+
+	public final static String TOUSSEDELIVEROCCASION_BEFORERECYCLING = "回收前发货";
+	public final static String TOUSSEDELIVEROCCASION_AFTERPRERECYCLING = "预回收后发货";
+	public final static String TOUSSEDELIVEROCCASION_AFTERRECYCLING = "回收后发货";
+
+	/**
 	 * 定时签收时间(单位：分钟)
 	 */
 	private Integer timingSignInvoiceTime;
 	/**
-	 * 发货单发货数量来源
+	 * 发货单发货数量来源-即页面上的发货数量依据
 	 */
 	private String invoiceOrigin = INVOICE_ORIGIN_APPLICATION;
 	/**
@@ -554,6 +569,7 @@
 		this.autoSignInvoice = autoSignInvoice;
 	}
 
+	@Deprecated
 	public boolean getAfterRecyclingTousseDeliver() {
 		return afterRecyclingTousseDeliver;
 	}
@@ -562,6 +578,18 @@
 		this.afterRecyclingTousseDeliver = afterRecyclingTousseDeliver;
 	}
 
+	public String getTousseDeliverOccasion() {
+		return tousseDeliverOccasion;
+	}
+
+	public void setTousseDeliverOccasion(String tousseDeliverOccasion) {
+		this.tousseDeliverOccasion = tousseDeliverOccasion;
+		if(StringUtils.equals(tousseDeliverOccasion, TOUSSEDELIVEROCCASION_AFTERPRERECYCLING)
+				|| StringUtils.equals(tousseDeliverOccasion, TOUSSEDELIVEROCCASION_AFTERRECYCLING)){
+			setAfterRecyclingTousseDeliver(true);
+		}
+	}
+
 	public boolean getAutoMergeApplication() {
 		return autoMergeApplication;
 	}
Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.9.52_4.9.53.sql
===================================================================
diff -u
--- ssts-web/src/main/webapp/dataUpdater/sqls/4.9.52_4.9.53.sql	(revision 0)
+++ ssts-web/src/main/webapp/dataUpdater/sqls/4.9.52_4.9.53.sql	(revision 29311)
@@ -0,0 +1 @@
+update SupplyRoomConfig set tousseDeliverOccasion = (case when afterRecyclingTousseDeliver = 1 then '回收后发货' else '回收前发货' end) where supplyRoomType = 0;
\ No newline at end of file