Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r26866 -r26867 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 26866) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 26867) @@ -5087,15 +5087,15 @@ String proxyDisinfectionSent = tousseInstance.getProxyDisinfectionSent(); String comboTousseDefinitionName = tousseInstance.getComboTousseDefinitionName(); - if((canResendout && sent) || DatabaseUtil.isPoIdValid(tousseInstance.getInvoice_id())){ + if((canResendout && sent) || DatabaseUtil.isPoIdValid(tousseInstance.getInvoice_id()) || DatabaseUtil.isPoIdValid(tousseInstance.getInvoice2_id())){//多次发货 /*tousseInstance.setInvoice2_id(invoice.getId()); tousseInstance.setLocation_2(departCoding); tousseInstance.setLocationForDisplay2(depart); tousseInstance.setSettleAccountsDepart2(getInvoiceSettleAccountsDepart(invoicePlan, submitInvoiceContext)); tousseInstance.setSettleAccountsDepartCode2(getInvoiceSettleAccountsDepartCoding(invoicePlan, submitInvoiceContext)); tousseInstance.setInvoiceSender2(sender); tousseInstance.setInvoiceSendTime2(sendDate);*/ - + invoice2_id = invoice.getId(); location_2 = departCoding; locationForDisplay2 = depart;