Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r25611 -r25615
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 25611)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 25615)
@@ -163,7 +163,7 @@
 	
 	private TaskGroupManager taskGroupManager;
 	
-	private InvoicePlanManager invoicePlanManagerTarget;
+	private InvoicePlanManager invoicePlanManager;
 	
 	private DiposableGoodBatchStockManager diposableGoodBatchStockManager;
 
@@ -268,9 +268,9 @@
 		this.taskGroupManager = taskGroupManager;
 	}
 
-	public void setInvoicePlanManagerTarget(
-			InvoicePlanManager invoicePlanManagerTarget) {
-		this.invoicePlanManagerTarget = invoicePlanManagerTarget;
+	public void setInvoicePlanManager(
+			InvoicePlanManager invoicePlanManager) {
+		this.invoicePlanManager = invoicePlanManager;
 	}
 
 	public void setDiposableGoodBatchStockManager(
@@ -4368,7 +4368,7 @@
 //		MultiValueMap<String, Integer> actualAllReturnTousses = new MultiValueMap<>();
 		ReturnGoodVo returnGoodVo = new ReturnGoodVo();
 		for (InvoicePlan borrowApplication : borrowApplications) {
-			Map<String, Integer> canReturnAmount = invoicePlanManagerTarget.getCanReturnAmount(borrowApplication.getId());
+			Map<String, Integer> canReturnAmount = invoicePlanManager.getCanReturnAmount(borrowApplication.getId());
 			if (org.apache.commons.collections.MapUtils.isEmpty(canReturnAmount)) {
 				continue;
 			}
@@ -4457,7 +4457,7 @@
 
 		
 		// 将申请归还和待归还的物品做对比，获得实际应还的物品及数量
-		Map<String, Integer> unreturnTousseMap = invoicePlanManagerTarget.getUnreturnTousse(borrowApplicationId);
+		Map<String, Integer> unreturnTousseMap = invoicePlanManager.getUnreturnTousse(borrowApplicationId);
 		Map<String, Integer> actualReturnTousses = new HashMap<>();
 		for(Map.Entry<String,Integer> unreturnEntry : unreturnTousseMap.entrySet()){
 			String tousseName = unreturnEntry.getKey();
@@ -4636,7 +4636,7 @@
 	 * @return 返回参数有两个(key:物品的名称,value:该物品被转换成申请单的数量)
 	 */
 	private Map<String, Integer> getConvertAppAmount(Long borrowApplicationId){
-		List<Map<String, Object>> list = invoicePlanManagerTarget.getConvertAppAmountDetail(borrowApplicationId);
+		List<Map<String, Object>> list = invoicePlanManager.getConvertAppAmountDetail(borrowApplicationId);
 		Map<String, Integer> resultMap = new HashMap<>();
 		for (Map<String, Object> objectMap : list) {
 			resultMap.put(objectMap.get("tousseName").toString(), Integer.parseInt(objectMap.get("convertAmount").toString()));
@@ -4646,7 +4646,7 @@
 	
 	@Override
 	public Map<String, Integer> getCanReturnAmountIncludeSubtractConvertAppAmount(Long borrowApplicationId) {
-		Map<String, Integer> unReturnTousse = invoicePlanManagerTarget.getUnreturnTousse(borrowApplicationId);
+		Map<String, Integer> unReturnTousse = invoicePlanManager.getUnreturnTousse(borrowApplicationId);
 		logger.info("待归还的:" + unReturnTousse);
 		Map<String, Integer> convertAppAmount = this.getConvertAppAmount(borrowApplicationId);
 		logger.info("已经换成使用记录的:" + convertAppAmount);
@@ -4675,7 +4675,7 @@
 
 	@Override
 	public void returnApplication(Long borrowId) {
-		Map<String, Integer> unReturnTousse = invoicePlanManagerTarget.getCanReturnAmount(borrowId);
+		Map<String, Integer> unReturnTousse = invoicePlanManager.getCanReturnAmount(borrowId);
 		if (MapUtils.isNotEmpty(unReturnTousse)){
 			throw new ParameterException("借物单还有东西没完全归还,不能使用这个功能归还!");
 		}
@@ -5515,7 +5515,7 @@
 		Date now = new Date();
 		invoicePlans = new HashSet<>(invoicePlans);
 		for(InvoicePlan invoicePlan : invoicePlans){
-			invoicePlanManagerTarget.computeAndSetPrintStatus(invoicePlan);
+			invoicePlanManager.computeAndSetPrintStatus(invoicePlan);
 			if(setPrintTime){
 				boolean writePrintTime = false;
 				if(invoicePlan.getPrintTime() != null){
@@ -6216,7 +6216,7 @@
 		
 		//重新计算发货状态
 		if (recalculateDeliverStatus) {
-			invoicePlanManagerTarget.computeAndSetInvoiceStatus(recyclingApplication);
+			invoicePlanManager.computeAndSetInvoiceStatus(recyclingApplication);
 		}
 		
 		//写备注
@@ -6233,7 +6233,7 @@
 		
 		//写日志
 		String compareResult = new RecyclingApplicationComparator().doCompare(oldRecyclingApplication, 
-				invoicePlanManagerTarget.invoicePlan2RecyclingApplicationVo(recyclingApplication, false), newTousseItemVoList);
+				invoicePlanManager.invoicePlan2RecyclingApplicationVo(recyclingApplication, false), newTousseItemVoList);
 		//保存申请单后插入更新的日志
 		if (StringUtils.isNotBlank(compareResult)){
 			applicationLogManager.saveApplicationLog(recyclingApplication, compareResult, ApplicationLogStatusEnum.INTERVENE);