Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r14843 -r14850 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 14843) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 14850) @@ -2889,6 +2889,15 @@ existApplication.getApplicationItems().addAll(needToBeAdded); // 取得用户自填备注,加入到新的申请单中 CssdUtils.appendRemarkOfInvoicePlan(existApplication,recyclingApplication.getRemark()); + + //如果为借物单,合并后将物品简要拼到原借物单后面 + if(InvoicePlan.TYPE_BORROWINGSINGLE.equals(existApplication.getType())){ + if(StringUtils.isBlank(existApplication.getLendGoodsBrief())){ + existApplication.setLendGoodsBrief(recyclingApplication.getLendGoodsBrief()); + }else{ + existApplication.setLendGoodsBrief(existApplication.getLendGoodsBrief() + "," + recyclingApplication.getLendGoodsBrief()); + } + } existApplication.setCurrentRemark(((existApplication .getCurrentRemark() != null || existApplication