Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r19999 -r20013 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 19999) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 20013) @@ -274,12 +274,23 @@ delList.add(invoicePlan); continue; } + SupplyRoomConfig config = supplyRoomConfigManager.getSystemParamsObj(); + String invoiceOrigin = config.getInvoiceOrigin(); + boolean isBorrowTousse = InvoicePlan.TYPE_BORROWINGSINGLE + .equals(invoicePlan.getType()); List delItems = new LinkedList(); for (TousseItem tousseItem : items) { // 不发货 if(!tousseItem.disposable() && !TousseItemUtils.IsInvoice(tousseItem)){ delItems.add(tousseItem); + continue; } + int waitDeliverAmount = CssdUtils + .getWaitDeliverAmountForApply(tousseItem, + invoiceOrigin,isBorrowTousse, objectDao); + if(waitDeliverAmount <= 0){ + delItems.add(tousseItem); + } } if(items.size() == delItems.size()){ delList.add(invoicePlan);