Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/dwr/table/InvoiceTableManager.java =================================================================== diff -u -r36854 -r38115 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/dwr/table/InvoiceTableManager.java (.../InvoiceTableManager.java) (revision 36854) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/dwr/table/InvoiceTableManager.java (.../InvoiceTableManager.java) (revision 38115) @@ -262,7 +262,7 @@ if (TousseItem.TYPE_DIPOSABLE_GOODS.equals(goodsType)) { idSql = String.format(" select i.invoiceID from InvoiceItem i where i.diposable = '%s' and i.disposableGoodsId = %s", InvoiceItem.DIPOSABLE_YES, goodsId); } else { - idSql = String.format(" select i.invoiceID from InvoiceItem i where i.diposable = '%s' and i.tousseDefinitionId = %s", InvoiceItem.DIPOSABLE_NO, goodsId); + idSql = String.format(" select i.invoiceID from InvoiceItem i where i.diposable = '%s' and (i.tousseDefinitionId = %s or i.ancestorId = %s)", InvoiceItem.DIPOSABLE_NO, goodsId, goodsId); } sql += String.format(" and po.id in( %s ) ", idSql); }