From 1ea84a23004ebcfaf86cb436d84164602ca9091d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 08 八月 2025 17:03:36 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockStatisticController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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 c4bf3c7..365e798 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
@@ -11,6 +11,7 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.StockStatistic;
+import com.vincent.rsf.server.manager.enums.TaskType;
import com.vincent.rsf.server.manager.service.StockStatisticService;
import com.vincent.rsf.server.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -84,13 +85,15 @@
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`, SUM( anfme ) anfme, COUNT(IF (task_type = 1, 0, NULL)) in_anfme_count, COUNT(IF ( task_type = 101, 0, NULL)) out_anfme_count, SUM(CASE WHEN task_type = 1 THEN)");
- wrapper.groupBy("barcode, day_time");
+ wrapper.select("id, day_time, COUNT( barcode ) `count`, " +
+ "SUM( anfme ) anfme," +
+ "COUNT(IF (task_type = 1, 0, NULL)) in_anfme_count, " +
+ "COUNT(IF ( task_type = 101, 0, NULL)) out_anfme_count, " +
+ "SUM( CASE WHEN task_type = 1 THEN anfme ELSE 0 END ) in_anfme," +
+ "SUM( CASE WHEN task_type = 101 THEN anfme ELSE 0 END ) out_anfme");
+ wrapper.in("task_type", Arrays.asList(TaskType.TASK_TYPE_IN.type, TaskType.TASK_TYPE_OUT.type)).groupBy("day_time");
return R.ok().add(stockStatisticService.page(pageParam, wrapper));
}
-
-
-
@PreAuthorize("hasAuthority('manager:stockStatistic:list')")
@PostMapping("/stockStatistic/list")
--
Gitblit v1.9.1