Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r15452 -r15455 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 15452) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 15455) @@ -4760,19 +4760,25 @@ continue; } } - + int appAmount = 0; + if(invoicePlan.isOperationReservationApplication()){ + appAmount = applicationItem.getAmount(); + }else{ + appAmount = CssdUtils.getWaitDeliverAmount(applicationItem, + invoiceOrigin, recycledDeliver, isBorrowTousse, objectDao); + } // 验证未发货或部分发货的物品 - int appAmount = CssdUtils.getWaitDeliverAmount(applicationItem, - invoiceOrigin, recycledDeliver, isBorrowTousse, objectDao); if (appAmount == 0) continue; + Integer sendOutAmount = applicationItem.getSendOutAmount(); if (sendOutAmount == null) continue; // 未发数量 = 申请数量-发货数量 int notSendAmount = appAmount - sendOutAmount; if (notSendAmount <= 0) continue; + String goodsName = applicationItem.getTousseName(); TousseDefinition tousseDefinition = null; if(applicationItem.isDisinfection()){