Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java =================================================================== diff -u -r23908 -r23943 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 23908) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 23943) @@ -398,6 +398,9 @@ // 如果为true,则为提交申请单(默认值),否则暂存申请单 boolean committedStatus = "true".equals(StrutsParamUtils .getPraramValue("committedStatus", "true").trim()); + if(!committedStatus){ + application.setCommittedStatus(false); + } String code = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig(); SupplyRoomConfig cssd = supplyRoomConfigManager.getFirstSupplyRoomConfig(); if (committedStatus && !StringTools.equals(code, cssd.getOrgUnitCoding()) @@ -437,6 +440,7 @@ application.setLendGoodsBrief(StringUtils.join(lendGoodsBriefArray, ",")); } } + String msg = recyclingApplicationManager.saveRecyclingApplication(application, newTousseItemVoList, committedStatus); if (StringUtils.isNotBlank(msg)){ @@ -685,8 +689,8 @@ for(String wn:wareHouseNameSet){ wareHouseName=wareHouseName+wn; } - - String str="{applicant:\'"+recyclingApplication.getApplicant()+"\',depart:\'"+recyclingApplication.getDepart() + String loginUserName=AcegiHelper.getLoginUserFullName(); + String str="{loginUserName:\'"+loginUserName+"\',applicant:\'"+recyclingApplication.getApplicant()+"\',depart:\'"+recyclingApplication.getDepart() +"\',handleDepart:\'"+recyclingApplication.getHandleDepart()+"\',wareHouse:\'"+wareHouseName.substring(0,wareHouseName.length())+"\'}"; try { LoadTousseLeaseItemsResultBuilder resultBuilder = new LoadTousseLeaseItemsResultBuilder(recyclingApplicationManager, objectDao,tousseDefinitionManager);