Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java =================================================================== diff -u -r14759 -r14761 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java (.../ForeignProxyDisinfectionManagerImpl.java) (revision 14759) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java (.../ForeignProxyDisinfectionManagerImpl.java) (revision 14761) @@ -608,7 +608,9 @@ throw new RuntimeException("申请单已被删除,不能修改!"); } } - + if(foreignProxyDisinfection.ended() || foreignProxyDisinfection.partEnded()){ + throw new RuntimeException(String.format("申请单已%s,不能装配!", foreignProxyDisinfection.getEndStatus())); + } if(foreignProxyDisinfection.hasPacked()){ throw new RuntimeException("申请单已装配,不能再次装配!"); } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java =================================================================== diff -u -r14758 -r14761 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 14758) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 14761) @@ -324,6 +324,19 @@ this.deliverStatus = deliverStatus; } + public boolean ended() { + if (STATUS_END.equals(endStatus)) { + return true; + } + return false; + } + public boolean partEnded() { + if (STATUS_PART_END.equals(endStatus)) { + return true; + } + return false; + } + public boolean deliverStatusNotSet() { if (StringUtils.isBlank(deliverStatus)) { return true;