Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r29905 -r29906 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 29905) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 29906) @@ -4266,20 +4266,20 @@ return "申请单已经被其他用户修改,请重新打开该申请单进行处理!"; } } - //(2)回收状态检查:如果状态为“部分回收”或者“已回收”,则提示:申请单已经回收,不能进行修改! - if(StringUtils.equals(recyclingApplication.getRecyclingStatus(), RecyclingApplication.RECYCLINGSTATUS_PARTRECYCLE) - || StringUtils.equals(recyclingApplication.getRecyclingStatus(), RecyclingApplication.RECYCLINGSTATUS_RECYCLED)){ - return "申请单已经回收,不能进行修改!"; + //(2)终止状态检查:如果状态为“部分终止”或者“已终止”,则提示:申请单已经进行了终止,不能进行修改! + if(StringUtils.equals(recyclingApplication.getEndStatus(), RecyclingApplication.STATUS_PART_END) + || StringUtils.equals(recyclingApplication.getEndStatus(), RecyclingApplication.STATUS_END)){ + return "申请单已经进行了终止,不能进行修改!"; } //(3)发货状态检查:如果状态为“部分发货”或者“已发货”,则提示:申请单已经发货,不能进行修改! if(StringUtils.equals(recyclingApplication.getDeliverStatus(), RecyclingApplication.DELIVERSTATUS_PARTDELIVERED) || StringUtils.equals(recyclingApplication.getDeliverStatus(), RecyclingApplication.DELIVERSTATUS_DELIVERED)){ return "申请单已经发货,不能进行修改!"; } - //(4)终止状态检查:如果状态为“部分终止”或者“已终止”,则提示:申请单已经进行了终止,不能进行修改! - if(StringUtils.equals(recyclingApplication.getEndStatus(), RecyclingApplication.STATUS_PART_END) - || StringUtils.equals(recyclingApplication.getEndStatus(), RecyclingApplication.STATUS_END)){ - return "申请单已经进行了终止,不能进行修改!"; + //(4)回收状态检查:如果状态为“部分回收”或者“已回收”,则提示:申请单已经回收,不能进行修改! + if(StringUtils.equals(recyclingApplication.getRecyclingStatus(), RecyclingApplication.RECYCLINGSTATUS_PARTRECYCLE) + || StringUtils.equals(recyclingApplication.getRecyclingStatus(), RecyclingApplication.RECYCLINGSTATUS_RECYCLED)){ + return "申请单已经回收,不能进行修改!"; } return result; }