Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r29569 -r29623 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 29569) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 29623) @@ -3988,6 +3988,10 @@ jsonObject = interveneApplyAmount(recyclingApplication, oldRecyclingApplication, getTousseItemVos(appGoodsStr, tousseInstanceInfos)); } else { jsonObject = createReturnApplicationOrRecyclingApplication(recyclingApplication, oldRecyclingApplication,appGoodsStr, tousseInstanceInfos,specifyDisposableTypes, autoReturnTheBorrowingTousse,committedStatus); + Collection srcTousseItemVoList = getTousseItemVos(appGoodsStr, tousseInstanceInfos); + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_APPLICATION, Log.TYPE_ADD, + "保存申请单:recyclingApplication=" + JSONUtil.toJsonObjecttWithSimpleProperty(recyclingApplication) + + ",tousseItems=" + JSONUtil.toJsonArraytWithSimpleProperty(srcTousseItemVoList)); } } else { throw new SystemException("此申请单数据异常,请联系系统管理员!"); @@ -4063,9 +4067,9 @@ RecyclingApplicationVo oldRecyclingApplication,String appGoodsStr,String tousseInstanceInfos, String specifyDisposableTypes,boolean autoReturnTheBorrowingTousse,boolean committedStatus) { Collection srcTousseItemVoList = getTousseItemVos(appGoodsStr, tousseInstanceInfos); - appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_APPLICATION, Log.TYPE_ADD, + /*appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_APPLICATION, Log.TYPE_ADD, "保存申请单:recyclingApplication=" + JSONUtil.toJsonObjecttWithSimpleProperty(recyclingApplication) - + ",tousseItems=" + JSONUtil.toJsonArraytWithSimpleProperty(srcTousseItemVoList)); + + ",tousseItems=" + JSONUtil.toJsonArraytWithSimpleProperty(srcTousseItemVoList));*/ //在借物模块提交借物单时,禁止申请的包数量超过状态为已灭菌的数量 boolean prohibitTousseExceedingSpecifiedQuantity = CssdUtils.getSystemSetConfigByNameBool("prohibitTousseExceedingSpecifiedQuantity", false); if(prohibitTousseExceedingSpecifiedQuantity && InvoicePlan.TYPE_BORROWINGSINGLE.equals(recyclingApplication.getType()) && recyclingApplication.getId() == null){