From 2c1720ea4614c4d18b6eb9f0f27c7250dc450bf8 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 12 三月 2024 10:45:44 +0800
Subject: [PATCH] #库存统计
---
src/main/webapp/static/js/locDetl/locDetl.js | 4 ++--
src/main/webapp/static/js/locDetlStatis/locDetlStatis.js | 1 -
src/main/resources/mapper/LocDetlMapper.xml | 7 ++++---
src/main/webapp/static/js/common.js | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index fa37930..3704d4e 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -574,14 +574,14 @@
(
select
ROW_NUMBER() over (order by sum(a.anfme) desc) as row
- , a.matnr
+ , a.matnr,a.batch
, sum(a.anfme) as anfme
,owner
,payment
from asr_loc_detl_all a
where 1=1
<include refid="stockOutCondition"></include>
- group by a.matnr,a.owner,a.payment
+ group by a.matnr,a.batch,a.owner,a.payment
) t
LEFT JOIN man_mat m on t.matnr = m.matnr
where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
@@ -592,12 +592,13 @@
(
select
a.matnr
+ ,a.batch
,owner
,payment
from asr_loc_detl_all a
where 1=1
<include refid="stockOutCondition"></include>
- group by a.matnr,a.owner,a.payment
+ group by a.matnr,a.batch,a.owner,a.payment
) b
</select>
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 01cbe00..ca698e8 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -244,7 +244,7 @@
,{field: 'batch', align: 'center',title: '鎵瑰彿', sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺(浠�)',hide: false}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜',hide: false}
- ,{field: 'specs', align: 'center',title: '瑙勬牸',hide: true}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸',hide: false}
,{field: 'model', align: 'center',title: '浠ｇ爜', hide: false}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index dcc1056..7355982 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -4,11 +4,11 @@
{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'},
{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸',hide: false}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 200, sort:true}
+ ,{field: 'batch', align: 'center',title: '鎵规', sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
- ,{field: 'specs', align: 'center',title: '閰嶇疆',hide: true}
,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
diff --git a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
index 1cc77fc..a259837 100644
--- a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
+++ b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
@@ -5,7 +5,6 @@
];
arrRemove(detlCols, "field", "anfme")
arrRemove(detlCols, "field", "zpallet")
- arrRemove(detlCols, "field", "batch")
arrRemove(detlCols, "field", "model")
arrRemove(detlCols, "field", "weight")
cols.push.apply(cols, detlCols);
--
Gitblit v1.9.1