Index: ssts-web/src/main/resources/spring/projects/dgszyy/timer.xml
===================================================================
diff -u -r16703 -r17059
--- ssts-web/src/main/resources/spring/projects/dgszyy/timer.xml	(.../timer.xml)	(revision 16703)
+++ ssts-web/src/main/resources/spring/projects/dgszyy/timer.xml	(.../timer.xml)	(revision 17059)
@@ -22,10 +22,31 @@
 		</property>
 	</bean>
 	
+	<!-- 每天0点清理两天前未二次回收的外来器械申请单 -->
+	<bean id="timingForeignTousseApplicationBatchConfirmReturnJob"
+		class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+		<property name="targetObject">
+			<ref bean="maintainManager" />
+		</property>
+		<property name="targetMethod">
+			<value>foreignTousseApplicationBatchConfirmReturn</value>
+		</property>
+		<property name="concurrent" value="false"/> 
+	</bean>
+	<bean id="timingForeignTousseApplicationBatchConfirmReturnJobTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
+		<property name="jobDetail">
+			<ref bean="timingForeignTousseApplicationBatchConfirmReturnJob" />
+		</property>
+		<property name="cronExpression">
+			<value>0 0 0 * * ?</value>
+		</property>
+	</bean>
+	
 	<bean id="schedulerFactoryBean" class = "org.springframework.scheduling.quartz.SchedulerFactoryBean">
 		<property name="triggers">
 			<list>
 				<ref bean="timingUpdateBiologicalMonitoringStatusJobTrigger"/>
+				<ref bean="timingForeignTousseApplicationBatchConfirmReturnJobTrigger"/>
 			</list>
 		</property>
 	</bean>
Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManager.java
===================================================================
diff -u -r16052 -r17059
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManager.java	(.../MaintainManager.java)	(revision 16052)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManager.java	(.../MaintainManager.java)	(revision 17059)
@@ -82,4 +82,9 @@
 	
 	public void qualityMonitoringDataMove();
 	
+	/**
+	 * 定时任务，外来器械申请单批量确认归还
+	 */
+	public void foreignTousseApplicationBatchConfirmReturn();
+	
 }
Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java
===================================================================
diff -u -r16655 -r17059
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java	(.../MaintainManagerImpl.java)	(revision 16655)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java	(.../MaintainManagerImpl.java)	(revision 17059)
@@ -23,6 +23,7 @@
 import net.sf.json.JSONObject;
 
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.apache.poi.hssf.usermodel.HSSFCell;
@@ -33,6 +34,8 @@
 import org.hibernate.Query;
 import org.hibernate.Session;
 
+import sun.util.calendar.CalendarUtils;
+
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.forgon.Constants;
 import com.forgon.databaseadapter.service.DateQueryAdapter;
@@ -61,12 +64,14 @@
 import com.forgon.disinfectsystem.entity.customform.formdefinition.FormDefinitionItemOption;
 import com.forgon.disinfectsystem.entity.customform.forminstance.FormInstanceItem;
 import com.forgon.disinfectsystem.entity.customform.forminstance.FormInstanceOptionValue;
+import com.forgon.disinfectsystem.entity.foreigntousseapplication.ForeignTousseApplication;
 import com.forgon.disinfectsystem.entity.invoicemanager.DiposableGoodsItem;
 import com.forgon.disinfectsystem.entity.invoicemanager.Invoice;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoiceItem;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
 import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoring.QualityMonitoringInstance;
 import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoringconfig.QualityMonitoringDefinition;
+import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication;
 import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord;
 import com.forgon.disinfectsystem.entity.returngoodsrecord.ReturnGoodsItem;
 import com.forgon.disinfectsystem.entity.sterilizationmanager.foreignproxydisinfection.ForeignProxyDisinfection;
@@ -75,6 +80,7 @@
 import com.forgon.disinfectsystem.entity.tousseitem.TousseItem;
 import com.forgon.disinfectsystem.entity.useRecord.UseRecord;
 import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord;
+import com.forgon.disinfectsystem.foreigntousseapplication.service.ForeignTousseApplicationManager;
 import com.forgon.disinfectsystem.invoicemanager.service.InvoiceManager;
 import com.forgon.disinfectsystem.recyclingapplication.service.InvoicePlanManager;
 import com.forgon.disinfectsystem.recyclingrecord.service.RecyclingRecordManager;
@@ -93,6 +99,8 @@
 import com.forgon.tools.hibernate.ObjectDao;
 import com.forgon.tools.util.FileUtils;
 
+import freemarker.template.utility.DateUtil;
+
 /**
  * @author Terry Kwan
  *
@@ -126,6 +134,13 @@
 	
 	private SupplyRoomConfigManager supplyRoomConfigManager;
 	
+	private ForeignTousseApplicationManager foreignTousseApplicationManager;
+	
+	public void setForeignTousseApplicationManager(
+			ForeignTousseApplicationManager foreignTousseApplicationManager) {
+		this.foreignTousseApplicationManager = foreignTousseApplicationManager;
+	}
+
 	public void setSupplyRoomConfigManager(
 			SupplyRoomConfigManager supplyRoomConfigManager) {
 		this.supplyRoomConfigManager = supplyRoomConfigManager;
@@ -1951,4 +1966,27 @@
 		}
 		return optionValue;
 	}
+	
+	@Override
+	public void foreignTousseApplicationBatchConfirmReturn() {
+		Date date = DateUtils.addDays(new Date(), -2);
+		String dateTime = Constants.SIMPLEDATEFORMAT_YYYYMMDD.format(date);
+		dateTime += " 00:00:00";
+		String sql = String.format("where po.submitTime < %s and po.recyclingStatus = '%s' and po.endStatus is null and po.type = '%s'", 
+				dateQueryAdapter.dateAdapter(dateTime),InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE,
+				InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION);
+		@SuppressWarnings("unchecked")
+		List<ForeignTousseApplication> applications = objectDao.findBySql(ForeignTousseApplication.class.getSimpleName(),sql);
+		if(applications != null){
+			int i = 1;
+			for (ForeignTousseApplication application : applications) {
+				foreignTousseApplicationManager.foreignTousseReturn(application);
+				if(i % 50 == 0){
+					objectDao.flush();
+				}
+				i++;
+			}
+		}
+		
+	}
 }
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r16633 -r17059
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 16633)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 17059)
@@ -801,7 +801,7 @@
 					title : '请确认',
 					modal : true,
 					border : true,
-					html : '<br>&nbsp&nbsp提前归还会终止申请单,并删除装配任务,是否要提交归还?&nbsp&nbsp<br><br>',
+					html : '<br>&nbsp&nbsp提前归还会终止申请单,并删除装配任务,是否要提前归还?&nbsp&nbsp<br><br>',
 					buttonAlign : 'center',
 					buttons:[{
 						text:'是',
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/RecyclingErrorAndDamageUtil.java
===================================================================
diff -u -r16230 -r17059
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/RecyclingErrorAndDamageUtil.java	(.../RecyclingErrorAndDamageUtil.java)	(revision 16230)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/RecyclingErrorAndDamageUtil.java	(.../RecyclingErrorAndDamageUtil.java)	(revision 17059)
@@ -62,27 +62,27 @@
 				List<RecyclingError> errors = task
 						.findRecyclingErrors(objectDao);
 				
-				boolean isEmptyp = true;
+				boolean isEmpty = true;
 				if (CollectionUtils.isNotEmpty(errors)) {
 					for (RecyclingError error : errors) {
 						if(error.getAmount() != null && error.getAmount() > 0){
-							isEmptyp = false;
+							isEmpty = false;
 							break;
 						}
 					}
 				}
-				if(isEmptyp){
+				if(isEmpty){
 					List<RecyclingDamageItem> damages = task.findRecyclingDamages(objectDao);
 					if(damages != null){
 						for (RecyclingDamageItem damage : damages) {
 							if(damage.getAmount() != null && damage.getAmount() > 0){
-								isEmptyp = false;
+								isEmpty = false;
 								break;
 							}
 						}
 					}
 				}
-				if (isEmptyp) {
+				if (isEmpty) {
 					task.setStatus(PackingTask.STATUS_AWAIT_PACKING);
 				}else if(RecyclingRecord.STATUS_UNCONFIRMED.equals(recyclingStatus)){
 					task.setStatus(PackingTask.STATUS_AWAIT_VERIFYING);