Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r15035 -r15091 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 15035) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 15091) @@ -344,7 +344,7 @@ if (invoicePlan instanceof ForeignTousseApplication) { for (TousseItem item : invoicePlan.getApplicationItems()) { TousseDefinition tousseDefinition = tousseDefinitionManager - .getTousseDefinitionByName(item.getTousseName()); + .getTousseDefinitionByTousseItem(item); if (tousseDefinition != null) { tousseDefinitionManager.delete(tousseDefinition); } @@ -368,9 +368,10 @@ return true;// 已经被删除 } boolean canDelete = true; - if (invoicePlan.getRecyclingStatus() != null - && InvoicePlan.RECYCLINGSTATUS_RECYCLED - .equals(invoicePlan.getRecyclingStatus())) { + String recyclingStatus = invoicePlan.getRecyclingStatus(); + if (recyclingStatus != null + && (InvoicePlan.RECYCLINGSTATUS_RECYCLED.equals(recyclingStatus) + || InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVED.equals(recyclingStatus))) { canDelete = false; } if (invoicePlan.delivered() @@ -382,14 +383,6 @@ if (invoicePlan.getType().equals( InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION)) { foreignTousseApplication = (ForeignTousseApplication) invoicePlan; - // 待接收状态可以删除,其他都不能删除 - if (foreignTousseApplication - .getPackageStatus() - .equals(ForeignTousseDefinition.PACKAGE_STATUS_RECEIVING)) { - canDelete = true; - } else { - canDelete = false; - } } // 一次性物品 if (invoicePlan.getType().equals(