Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r20109 -r20141 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 20109) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 20141) @@ -147,7 +147,7 @@ private TaskGroupManager taskGroupManager; - private InvoicePlanManager invoicePlanManager; + private InvoicePlanManager invoicePlanManagerTarget; private DiposableGoodBatchStockManager diposableGoodBatchStockManager; @@ -214,8 +214,9 @@ this.taskGroupManager = taskGroupManager; } - public void setInvoicePlanManager(InvoicePlanManager invoicePlanManager) { - this.invoicePlanManager = invoicePlanManager; + public void setInvoicePlanManagerTarget( + InvoicePlanManager invoicePlanManagerTarget) { + this.invoicePlanManagerTarget = invoicePlanManagerTarget; } public void setDiposableGoodBatchStockManager( @@ -4628,7 +4629,7 @@ Date now = new Date(); invoicePlans = new HashSet<>(invoicePlans); for(InvoicePlan invoicePlan : invoicePlans){ - invoicePlanManager.computeAndSetPrintStatus(invoicePlan); + invoicePlanManagerTarget.computeAndSetPrintStatus(invoicePlan); if(setPrintTime){ invoicePlan.setPrintTime(now); } @@ -5282,7 +5283,7 @@ //写日志 String compareResult = new RecyclingApplicationComparator().doCompare(oldRecyclingApplication, - invoicePlanManager.invoicePlan2RecyclingApplicationVo(recyclingApplication, false), newTousseItemVoList); + invoicePlanManagerTarget.invoicePlan2RecyclingApplicationVo(recyclingApplication, false), newTousseItemVoList); //保存申请单后插入更新的日志 if (StringUtils.isNotBlank(compareResult)){ applicationLogManager.saveApplicationLog(recyclingApplication, compareResult, ApplicationLogStatusEnum.INTERVENE);