Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r21295 -r21446 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 21295) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 21446) @@ -84,7 +84,6 @@ import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; import com.forgon.disinfectsystem.entity.invoicemanager.TimeQuantum; import com.forgon.disinfectsystem.entity.operationreservation.OperationReservation; -import com.forgon.disinfectsystem.entity.packing.PackingRecord; import com.forgon.disinfectsystem.entity.packing.PackingTask; import com.forgon.disinfectsystem.entity.packing.ReviewedBasket; import com.forgon.disinfectsystem.entity.printinvoiceconfig.PrintInvoiceConfig; @@ -1960,7 +1959,6 @@ Set invoicePlanIds = new HashSet(); for (TousseInstance tousseInstance : tousseInstances) { Long invoicePlanId = tousseInstance.getInvoicePlanID(); - Long foreignTousseAppId = tousseInstance.getForeignTousseApp_id(); TousseDefinition tousseDefinition = tousseInstance.getTousseDefinition(); if(tousseDefinition == null){ @@ -1973,9 +1971,6 @@ if(DatabaseUtil.isPoIdValid(invoicePlanId)){ invoicePlanIds.add(invoicePlanId); } - if(DatabaseUtil.isPoIdValid(foreignTousseAppId)){ - invoicePlanIds.add(foreignTousseAppId); - } } if(invoicePlanIds.isEmpty()){ return ; @@ -5900,7 +5895,7 @@ if(amount == null || amount == 0){ continue; } - Long foreignTousseApp_id = tousseInstance.getForeignTousseApp_id(); + Long foreignTousseApp_id = tousseInstance.getInvoicePlanID(); if(foreignTousseApp_id == null || !foreignTousseApp_id.equals(invoicePlanId)){ continue; }