Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java =================================================================== diff -u -r16764 -r16770 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java (.../InvoicePlanAction.java) (revision 16764) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java (.../InvoicePlanAction.java) (revision 16770) @@ -411,9 +411,9 @@ throw new RuntimeException("终止失败,找不到相关记录!"); } //除了借物单其他申请单发货状态如果是已发货则不能终止 - if (Invoice.STATUS_DELIVERED.equals(invoicePlan.getDeliverStatus()) && !InvoicePlan.TYPE_BORROWINGSINGLE.equals(invoicePlan.getType()) && !InvoicePlan.TYPE_FOREIGNPROXYDISINFECTION.equals(invoicePlan.getType())){ - throw new RuntimeException("该单已发货或已终止的,不能被终止!"); - } + // if (Invoice.STATUS_DELIVERED.equals(invoicePlan.getDeliverStatus()) && !InvoicePlan.TYPE_BORROWINGSINGLE.equals(invoicePlan.getType()) && !InvoicePlan.TYPE_FOREIGNPROXYDISINFECTION.equals(invoicePlan.getType())){ + // throw new RuntimeException("该单已发货或已终止的,不能被终止!"); + // } String userName = AcegiHelper.getLoginUser().getUserFullName(); if (StringUtils.isBlank(endCause)) { endCause = "不明";