From 1553782fd262f97a336fecc8b38f8f309fc08ae6 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期三, 01 四月 2026 11:07:31 +0800
Subject: [PATCH] #前端
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockStatisticController.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockStatisticController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockStatisticController.java
index 7e8b86a..67ea781 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockStatisticController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockStatisticController.java
@@ -41,8 +41,10 @@
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<StockStatistic, BaseParam> pageParam = new PageParam<>(baseParam, StockStatistic.class);
QueryWrapper<StockStatistic> wrapper = pageParam.buildWrapper(true);
- wrapper.select("id, loc_code, day_time, task_type, task_status, barcode, maktx, matnr_code, batch, SUM(anfme) AS anfme, unit, fields_index, create_time, update_time");
- wrapper.groupBy("matnr_code, day_time");
+ wrapper.select("MIN(id) AS id, day_time, task_type, task_status, " +
+ "MAX(maktx) AS maktx, matnr_code, MAX(batch) AS batch, " +
+ "SUM(anfme) AS anfme, MAX(unit) AS unit");
+ wrapper.groupBy("day_time, task_type, task_status, matnr_code");
return R.ok().add(stockStatisticService.page(pageParam, wrapper));
}
@@ -52,8 +54,10 @@
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<StockStatistic, BaseParam> pageParam = new PageParam<>(baseParam, StockStatistic.class);
QueryWrapper<StockStatistic> wrapper = pageParam.buildWrapper(true);
- wrapper.select("id, loc_code, day_time, task_type, task_status, barcode, maktx, matnr_code, batch, SUM(anfme) AS anfme, unit, fields_index, create_time, update_time");
- wrapper.groupBy("matnr_code, day_time");
+ wrapper.select("MIN(id) AS id, day_time, task_type, task_status, " +
+ "MAX(maktx) AS maktx, matnr_code, MAX(batch) AS batch, " +
+ "SUM(anfme) AS anfme, MAX(unit) AS unit");
+ wrapper.groupBy("day_time, task_type, task_status, matnr_code");
return R.ok().add(stockStatisticService.page(pageParam, wrapper));
}
@@ -63,8 +67,10 @@
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<StockStatistic, BaseParam> pageParam = new PageParam<>(baseParam, StockStatistic.class);
QueryWrapper<StockStatistic> wrapper = pageParam.buildWrapper(true);
- wrapper.select("id, loc_code, day_time, task_type, task_status, barcode, maktx, matnr_code, batch, SUM(anfme) anfme, unit, fields_index, create_by, update_by, create_time, update_time");
- wrapper.groupBy("matnr_code, day_time, task_type, task_status");
+ wrapper.select("MIN(id) AS id, loc_code, day_time, task_type, task_status, barcode, " +
+ "MAX(maktx) AS maktx, matnr_code, MAX(batch) AS batch, SUM(anfme) AS anfme, " +
+ "MAX(unit) AS unit, create_by, update_by, create_time, update_time");
+ wrapper.groupBy("loc_code, day_time, task_type, task_status, barcode, matnr_code, create_by, update_by, create_time, update_time");
return R.ok().add(stockStatisticService.page(pageParam, wrapper));
}
@@ -74,8 +80,10 @@
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<StockStatistic, BaseParam> pageParam = new PageParam<>(baseParam, StockStatistic.class);
QueryWrapper<StockStatistic> wrapper = pageParam.buildWrapper(true);
- wrapper.select("id, loc_code, day_time, task_type, task_status, barcode, maktx, matnr_code, batch, SUM(anfme) anfme, unit, fields_index, create_by, update_by, create_time, update_time");
- wrapper.groupBy("matnr_code, day_time, task_type, task_status");
+ wrapper.select("MIN(id) AS id, loc_code, day_time, task_type, task_status, barcode, " +
+ "MAX(maktx) AS maktx, matnr_code, MAX(batch) AS batch, SUM(anfme) AS anfme, " +
+ "MAX(unit) AS unit, create_by, update_by, create_time, update_time");
+ wrapper.groupBy("loc_code, day_time, task_type, task_status, barcode, matnr_code, create_by, update_by, create_time, update_time");
return R.ok().add(stockStatisticService.page(pageParam, wrapper));
}
@@ -85,7 +93,7 @@
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<StockStatistic, BaseParam> pageParam = new PageParam<>(baseParam, StockStatistic.class);
QueryWrapper<StockStatistic> wrapper = pageParam.buildWrapper(true);
- wrapper.select("id, day_time, COUNT( barcode ) `count`, " +
+ wrapper.select("MIN(id) AS id, day_time, COUNT(barcode) AS `count`, " +
"SUM( anfme ) anfme," +
"COUNT(IF (task_type = 1, 0, NULL)) in_anfme_count, " +
"COUNT(IF ( task_type = 101, 0, NULL)) out_anfme_count, " +
--
Gitblit v1.9.1