Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/ExpressInvoiceManagerImpl.java =================================================================== diff -u -r27532 -r28727 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/ExpressInvoiceManagerImpl.java (.../ExpressInvoiceManagerImpl.java) (revision 27532) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/ExpressInvoiceManagerImpl.java (.../ExpressInvoiceManagerImpl.java) (revision 28727) @@ -453,7 +453,7 @@ invoiceItem.setInvoicePlanID(invoicePlan.getId()); invoiceItem.setTousseName(tousseInstance.getTousseName()); - invoiceItem.setTousseType(tousseType); + invoiceItem.setTousseType(tousseDefinition.getTousseType()); invoiceItem.setWareHouseId(invoice.getWarehouseID()); invoiceItem.setWareHouseName(invoice.getWarehouseName()); invoiceItem.setSettlementPrice(totalPriceOfInvoice); @@ -652,7 +652,7 @@ invoiceItem.setInvoicePlanID(invoicePlan.getId()); invoiceItem.setTousseName(tousseInstance.getTousseName()); - invoiceItem.setTousseType(tousseType); + invoiceItem.setTousseType(tousseDefinition.getTousseType()); invoiceItem.setWareHouseId(invoice.getWarehouseID()); invoiceItem.setWareHouseName(invoice.getWarehouseName()); @@ -1020,7 +1020,7 @@ invoiceItem.setInvoicePlanID(invoicePlan.getId()); invoiceItem.setTousseName(tousseInstance.getTousseName()); - invoiceItem.setTousseType(tousseType); + invoiceItem.setTousseType(tousseDefinition.getTousseType()); invoiceItem.setWareHouseId(invoice.getWarehouseID()); invoiceItem.setWareHouseName(invoice.getWarehouseName()); @@ -1247,7 +1247,7 @@ invoiceItem.setInvoicePlanID(invoicePlan.getId()); invoiceItem.setTousseName(tousseInstance.getTousseName()); - invoiceItem.setTousseType(tousseType); + invoiceItem.setTousseType(tousseDefinition.getTousseType()); invoiceItem.setWareHouseId(invoice.getWarehouseID()); invoiceItem.setWareHouseName(invoice.getWarehouseName()); invoiceItem.setSettlementPrice(totalPriceOfInvoice); @@ -1600,7 +1600,7 @@ invoiceItem.setInvoicePlanID(invoicePlan.getId()); invoiceItem.setTousseName(disposableGoodsName); - invoiceItem.setTousseType(tousseType); + invoiceItem.setTousseType(TousseItem.TYPE_DIPOSABLE_GOODS); invoiceItem.setWareHouseId(invoice.getWarehouseID()); invoiceItem.setWareHouseName(invoice.getWarehouseName()); invoiceItem.setDisposableGoodsId(disposableGoods.getId());