From 391ea14026d1fe6417d4ce88ebedc6654b6519ad Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期二, 01 六月 2021 13:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/htwms' into htwms
---
src/main/java/zy/cloud/wms/manager/controller/StatisController.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/StatisController.java b/src/main/java/zy/cloud/wms/manager/controller/StatisController.java
index 4c787ee..fb0a317 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/StatisController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/StatisController.java
@@ -40,7 +40,7 @@
@RequestParam Map<String, Object> param) {
Page<LocDetl> stockStatis = locDetlService.getStockStatis(toPage(curr, limit, param, LocDetl.class));
for (LocDetl locDetl : stockStatis.getRecords()) {
- Mat mat = matService.selectById(locDetl.getMatnr());
+ Mat mat = matService.selectByMatnr(locDetl.getMatnr());
if (mat != null) {
VersionUtils.setLocDetl(locDetl, mat);
}
@@ -49,11 +49,10 @@
}
@RequestMapping(value = "/stock/statis/export")
- @ManagerAuth
public void stockStatisExport(HttpServletResponse response) throws IOException {
List<LocDetl> excel = locDetlService.getStockStatisExcel();
for (LocDetl locDetl : excel) {
- Mat mat = matService.selectById(locDetl.getMatnr());
+ Mat mat = matService.selectByMatnr(locDetl.getMatnr());
if (mat != null) {
VersionUtils.setLocDetl(locDetl, mat);
}
--
Gitblit v1.9.1