Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java =================================================================== diff -u -r25611 -r26441 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 25611) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 26441) @@ -56,7 +56,10 @@ import com.forgon.disinfectsystem.recyclingapplication.service.RecyclingApplicationManager; import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager; import com.forgon.disinfectsystem.vo.RecyclingApplicationVo; +import com.forgon.disinfectsystem.vo.TousseItemVo; import com.forgon.exception.service.ExceptionHandler; +import com.forgon.log.model.Log; +import com.forgon.log.service.LogManager; import com.forgon.results.handler.LendGoodsBriefHandler; import com.forgon.results.handler.ResultBackHandler; import com.forgon.tools.GB2Alpha; @@ -107,6 +110,11 @@ private ExceptionHandler exceptionHandler; + private LogManager appLogManager; + + public void setAppLogManager(LogManager appLogManager) { + this.appLogManager = appLogManager; + } public void setTousseGroupManager(TousseGroupManager tousseGroupManager) { this.tousseGroupManager = tousseGroupManager; } @@ -279,7 +287,25 @@ invoicePlan.setReaded(InvoicePlan.READED); objectDao.saveOrUpdate(invoicePlan); } - return invoicePlanManager.invoicePlan2RecyclingApplicationVo(invoicePlan,true); + String operationInfo = ""; + RecyclingApplicationVo resultVo = invoicePlanManager.invoicePlan2RecyclingApplicationVo(invoicePlan,true); + if(resultVo != null){ + operationInfo = String.format("打开了待回收列表的%s,单号:%s", resultVo.getType(),resultVo.getSerialNumber()); + List items = resultVo.getApplicationItems(); + String itemStr = ""; + if(resultVo.getApplicationItems() != null){ + for (int i = 0; i < items.size(); i++) { + if(i == 0){ + itemStr = String.format(",物品清单:%sx%s", items.get(i).getTousseName(),items.get(i).getAmount()); + }else{ + itemStr += String.format(",%sx%s",items.get(i).getTousseName(),items.get(i).getAmount()); + } + } + } + operationInfo += itemStr; + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_RECYCLINGRECORD, Log.TYPE_QUERY, operationInfo); + } + return resultVo; } /**