From dcc38d4417a0f958ab273db7282c3ebd9c4b10f8 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 10 四月 2024 09:47:19 +0800
Subject: [PATCH] #
---
src/main/webapp/views/locDetlStatis/locDetlStatis.html | 2 +-
src/main/resources/mapper/LocDetlMapper.xml | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 7c46e81..ee58380 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -224,10 +224,11 @@
select
ROW_NUMBER() over (order by sum(a.anfme) desc) as row
, a.matnr
+ ,a.batch
, sum(a.anfme) as anfme
from asr_loc_detl_all a
where 1=1
- group by a.matnr
+ group by a.matnr,a.batch
</select>
<select id="selectPakoutByRule" resultMap="BaseResultMap">
diff --git a/src/main/webapp/views/locDetlStatis/locDetlStatis.html b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
index e3a4042..7eb6617 100644
--- a/src/main/webapp/views/locDetlStatis/locDetlStatis.html
+++ b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
@@ -46,7 +46,7 @@
<script type="text/html" id="toolbar">
<div class="layui-btn-container layui-col-md1">
- <button class="layui-btn" lay-event="exportData" style="margin-top: -0px">瀵煎嚭鍏ㄩ儴</button>
+ <button class="layui-btn" lay-event="exportAll" style="margin-top: -0px">瀵煎嚭鍏ㄩ儴</button>
</div>
</script>
--
Gitblit v1.9.1