Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r13691 -r13706 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 13691) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 13706) @@ -2509,7 +2509,7 @@ application.setSequence(supplyRoomConfigManager .getOrgUnitSequence(application.getDepartCoding())); // 保存器械包申请单 - returnMsg = mergeRecyclingApplication(application, newItemsList,committedStatus); + returnMsg = mergeRecyclingApplication(application,committedStatus); return returnMsg; @@ -2633,11 +2633,10 @@ /** * @param recyclingApplication - * @param itemList 申请物品 * @param isCommit 是否提交 * @return */ - private String mergeRecyclingApplication(RecyclingApplication recyclingApplication,List itemList,Boolean isCommit){ + private String mergeRecyclingApplication(RecyclingApplication recyclingApplication,Boolean isCommit){ StringBuffer sbf = new StringBuffer(); //合并申请单,如果没有匹配申请单返回原来的单,如果有就返回匹配的申请单(如果该申请单为新建,并且能够找到相同状态的同一类型申请单则将申请单合并)