Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java =================================================================== diff -u -r15506 -r15554 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java (.../ForeignProxyDisinfectionManagerImpl.java) (revision 15506) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java (.../ForeignProxyDisinfectionManagerImpl.java) (revision 15554) @@ -149,9 +149,9 @@ if(foreignProxyDisinfection.deliverEnd()){ throw new RuntimeException(String.format("该申请单已经被终止!")); } - if(foreignProxyDisinfection.delivered()){ - throw new RuntimeException(String.format("申请单已发货,不能终止!")); - } +// if(foreignProxyDisinfection.delivered()){ +// throw new RuntimeException(String.format("申请单已发货,不能终止!")); +// } String userName = AcegiHelper.getLoginUser().getUserFullName(); invoicePlanManager.terminateInvoicePlan(foreignProxyDisinfection, userName, ""); }