Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java
===================================================================
diff -u -r14353 -r14483
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java	(.../Invoice.java)	(revision 14353)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java	(.../Invoice.java)	(revision 14483)
@@ -56,6 +56,8 @@
 	
 	private Date applicationTime; // 申请时间  
 	
+	private Date recyclingTime; // 回收时间
+	
 	private String receiptor; // 签收人
 
 	private Date receiptingTime; // 签收时间
@@ -298,6 +300,14 @@
 		this.applicationTime = applicationTime;
 	}
 
+	public Date getRecyclingTime() {
+		return recyclingTime;
+	}
+
+	public void setRecyclingTime(Date recyclingTime) {
+		this.recyclingTime = recyclingTime;
+	}
+
 	@Transient
 	public String getRecyclingApplicationType(){
 		String type = "";
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
===================================================================
diff -u -r14379 -r14483
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 14379)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 14483)
@@ -1718,6 +1718,7 @@
 	    {header : "流水号",width : 100,dataIndex : 'serialNumber',renderer : renderCallModifyFunction},
 	    {header : "申请科室",width : 120,dataIndex : 'depart'},
 	    {header : "申请时间",width : 120,dataIndex : 'applicationTime',renderer : myDateFormatByMinute},
+	    {header : "回收时间",width : 120,dataIndex : 'recyclingTime',renderer : myDateFormatByMinute},
 	    {header : "发货员",width : 70,dataIndex : 'sender'},
 	    {header : "拼音码",width : 100,dataIndex : 'spelling',hidden:true}, 
 	    {header : "五笔码",width : 100,dataIndex : 'wbCode',hidden:true}, 
@@ -1743,8 +1744,9 @@
 	    {name : 'settleAccountsDepart'},
 	    {name : 'isPrint'},
 	    {name : 'spelling'},
-	     {name : 'wbCode'},
+	    {name : 'wbCode'},
 	    {name : 'applicationTime'},
+	    {name : 'recyclingTime'},
 	    {name : 'sender'},
 	    {name : 'assistantSender'},
 	    {name : 'sendTime'},
Index: forgon-core/src/main/java/com/forgon/Constants.java
===================================================================
diff -u -r14477 -r14483
--- forgon-core/src/main/java/com/forgon/Constants.java	(.../Constants.java)	(revision 14477)
+++ forgon-core/src/main/java/com/forgon/Constants.java	(.../Constants.java)	(revision 14483)
@@ -18,7 +18,7 @@
 	public final static String[] SOFTWARE_VERSION_ARRAY = new String[] {
 			"3.3.0","3.3.8", "3.3.9", "3.3.10","3.3.12","3.3.13","3.8.0","3.9.0","3.9.1","3.9.2","4.0.2","4.0.3","4.0.4",
 			"4.0.5","4.0.6","4.0.44","4.0.45","4.1.0","4.1.1","4.1.2","4.1.3","4.1.4","4.1.5","4.1.6","4.1.7","4.1.8","4.1.9","4.2.0","4.2.1","4.2.2",
-			"4.2.3","4.2.4","4.2.5","4.2.6","4.2.7","4.2.8","4.2.9"};// 版本列表
+			"4.2.3","4.2.4","4.2.5","4.2.6","4.2.7","4.2.8","4.2.9","4.3.0"};// 版本列表
 	public final static List<String> SOFTWARE_VERSION_LIST = Arrays
 			.asList(SOFTWARE_VERSION_ARRAY);
 	public final static String SOFTWARE_VERSION = SOFTWARE_VERSION_ARRAY[SOFTWARE_VERSION_ARRAY.length - 1];// 软件最新版本
Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.2.9_4.3.0.sql
===================================================================
diff -u
--- ssts-web/src/main/webapp/dataUpdater/sqls/4.2.9_4.3.0.sql	(revision 0)
+++ ssts-web/src/main/webapp/dataUpdater/sqls/4.2.9_4.3.0.sql	(revision 14483)
@@ -0,0 +1,2 @@
+update invoicePlan set recyclingTime = (select max(recyclingTime) from RecyclingRecord where recyclingApplication_id=invoicePlan.id) where recyclingTime is null;
+update Invoice set recyclingTime = (select recyclingTime from invoicePlan where id=Invoice.invoicePlan_ID) where recyclingTime is null and invoicePlan_ID is not null;
\ No newline at end of file
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
===================================================================
diff -u -r14423 -r14483
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java	(.../InvoicePlan.java)	(revision 14423)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java	(.../InvoicePlan.java)	(revision 14483)
@@ -47,6 +47,11 @@
 	 * 
 	 */
 	private Date applicationTime; 
+	/**
+	 * 回收时间
+	 * 
+	 */
+	private Date recyclingTime; 
 	
 	/**
 	 * 申请单的最后修改时间。
@@ -261,6 +266,14 @@
 		this.applicationTime = applicationTime;
 	}
 
+	public Date getRecyclingTime() {
+		return recyclingTime;
+	}
+
+	public void setRecyclingTime(Date recyclingTime) {
+		this.recyclingTime = recyclingTime;
+	}
+
 	public String getDepartCoding() {
 		return departCoding;
 	}
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r14452 -r14483
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 14452)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 14483)
@@ -1993,6 +1993,7 @@
 		String personInChargeCode = JSONUtil.optString(params, "personInChargeCode", "");
 		invoice.setApplicant(invoicePlan.getApplicant());
 		invoice.setApplicationTime(invoicePlan.getApplicationTime());
+		invoice.setRecyclingTime(invoicePlan.getRecyclingTime());
 		invoice.setDepart(invoicePlan.getDepart());
 		invoice.setDiposableGoodsItems(diposableGoodsItems);
 		invoice.setInvoiceItem(invoiceItems);