diff --git a/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/FrequencyStatisticsController.java b/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/FrequencyStatisticsController.java index e9059e9..0872612 100644 --- a/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/FrequencyStatisticsController.java +++ b/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/FrequencyStatisticsController.java @@ -76,14 +76,18 @@ public class FrequencyStatisticsController extends BaseController { //物料 if (type.equals("materialCode")) { - String countSql="SUM(CASE WHEN transactionType = 10 THEN taskQty ELSE 0 END) AS inQty,ABS(SUM(CASE WHEN transactionType = 20 THEN taskQty ELSE 0 END)) AS outQty,SUM(CASE WHEN taskQty > 0 THEN taskQty ELSE 0 END) + ABS(SUM(CASE WHEN taskQty < 0 THEN taskQty ELSE 0 END)) AS taskQty,materialName,materialSpec,materialUnit\n"; + String countSql="SUM(CASE WHEN transactionType = 10 THEN taskQty ELSE 0 END) AS inQty," + + "ABS(SUM(CASE WHEN transactionType = 20 THEN taskQty ELSE 0 END)) AS outQty," + + "SUM(CASE WHEN taskQty > 0 THEN taskQty ELSE 0 END) + ABS(SUM(CASE WHEN taskQty < 0 THEN taskQty ELSE 0 END)) AS taskQty," + + "materialName,materialSpec,materialUnit\n"; QueryWrapper<InventoryTransaction> materialQueryWrapper = new QueryWrapper<>(); materialQueryWrapper .select(type,countSql) .like(StringUtils.isNotEmpty(inventoryTransaction.getMaterialCode()), "materialCode", inventoryTransaction.getMaterialCode())//物料编码 .in("transactionType", 10, 20) - .groupBy(type) + // 单独materialCode groupby 与SQL模式only_full_group_by不兼容 + .groupBy("materialCode","materialName","materialSpec","materialUnit") .ge(StringUtils.isNotEmpty(createdBegin), "created", createdBegin) .le(StringUtils.isNotEmpty(createdEnd), "created", createdEnd) .orderByDesc("taskQty");