Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r20108 -r20109 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 20108) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 20109) @@ -3222,6 +3222,13 @@ } + /** + * 判断是否需要合并申请单. + * @param recyclingApplication + * @param supplyRoomConfig + * @param autoMerge + * @return + */ private boolean isApplicationFormMerge( RecyclingApplication recyclingApplication, SupplyRoomConfig supplyRoomConfig, boolean autoMerge) { Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java =================================================================== diff -u -r20089 -r20109 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java (.../RecyclingApplicationManager.java) (revision 20089) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java (.../RecyclingApplicationManager.java) (revision 20109) @@ -69,6 +69,11 @@ */ public boolean isUseRecord2ApplicationNeedInvoice(RecyclingApplication application); + /** + * 保存或者更新申请单. + * @param recyclingApplication 申请单对象 + * @param isCommit 是否提交 + */ public void saveOrUpdateRecyclingApplication( RecyclingApplication recyclingApplication,Boolean isCommit);