diff --git a/src/main/java/cn/lihongjie/coal/warehouseReceipt/service/WarehouseReceiptService.java b/src/main/java/cn/lihongjie/coal/warehouseReceipt/service/WarehouseReceiptService.java index c1f45ce3..813cf3fa 100644 --- a/src/main/java/cn/lihongjie/coal/warehouseReceipt/service/WarehouseReceiptService.java +++ b/src/main/java/cn/lihongjie/coal/warehouseReceipt/service/WarehouseReceiptService.java @@ -1002,6 +1002,10 @@ from ( <#if unitIds?has_content> and gs.unit_id in :unitIds + + <#if warehouseIds?has_content> + and d.warehouse_id in :warehouseIds + ) as "入库单数量", @@ -1051,6 +1055,9 @@ from ( <#if unitIds?has_content> and gs.unit_id in :unitIds + <#if warehouseIds?has_content> + and d.warehouse_id in :warehouseIds + ) as "入库单明细数量", (select count(distinct d.goods_id) @@ -1098,7 +1105,9 @@ from ( <#if unitIds?has_content> and gs.unit_id in :unitIds - + <#if warehouseIds?has_content> + and d.warehouse_id in :warehouseIds + ) as "入库商品种数", (select round(sum(d.number)::::numeric, 2) @@ -1146,6 +1155,10 @@ from ( <#if unitIds?has_content> and gs.unit_id in :unitIds + <#if warehouseIds?has_content> + and d.warehouse_id in :warehouseIds + + ) as "入库商品数量", (select round(sum(d.amount)::::numeric, 2) @@ -1194,6 +1207,10 @@ from ( <#if unitIds?has_content> and gs.unit_id in :unitIds + + <#if warehouseIds?has_content> + and d.warehouse_id in :warehouseIds + ) as "入库商品总价"