From e0771f5cca8636156e2021bbc5db736cdeec79a6 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 16 十二月 2023 10:52:50 +0800
Subject: [PATCH] #
---
src/main/webapp/views/locDetlStatis/locDetlStatis.html | 3 +++
src/main/resources/mapper/LocDetlMapper.xml | 10 +++++++---
src/main/webapp/static/js/manLocDetl/manLocDetl.js | 13 +++++++------
src/main/webapp/static/js/common.js | 1 +
4 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 71f512f..49d29d1 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -122,6 +122,9 @@
<if test="crnNo!=null and crnNo!='' ">
and b.crn_no=#{crnNo}
</if>
+ <if test="owner!=null and owner!='' ">
+ and a.owner=#{owner}
+ </if>
</sql>
<select id="getStockOutPage" resultMap="BaseResultMap">
@@ -573,10 +576,11 @@
ROW_NUMBER() over (order by sum(a.anfme) desc) as row
, a.matnr
, sum(a.anfme) as anfme
+ , a.owner
from asr_loc_detl_all a
where 1=1
<include refid="stockOutCondition"></include>
- group by a.matnr
+ group by a.matnr, a.owner
) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
</select>
@@ -584,11 +588,11 @@
select count(1) as count from
(
select
- a.matnr
+ a.matnr, a.owner
from asr_loc_detl_all a
where 1=1
<include refid="stockOutCondition"></include>
- group by a.matnr
+ group by a.matnr, a.owner
) b
</select>
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 4b5c5bc..71c5244 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -274,6 +274,7 @@
,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
+ ,{field: 'owner$', align: 'center',title: '璐т富', hide: false}
]
function getQueryVariable(variable)
diff --git a/src/main/webapp/static/js/manLocDetl/manLocDetl.js b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
index 405073b..34f7a28 100644
--- a/src/main/webapp/static/js/manLocDetl/manLocDetl.js
+++ b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
@@ -1,16 +1,16 @@
var pageCurr;
function getCol() {
var cols = [
- {field: 'locNo', align: 'center',title: '搴撲綅鍙�'},
+ {field: 'locNo', align: 'center',title: '搴撲綅鍙�', hide: false},
{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
- ,{field: 'specs', align: 'center',title: '瑙勬牸'}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸', hide: false}
,{field: 'weight', align: 'center',title: '搴撲綅鎬婚噸閲�', hide: true}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿', sort:true}
- ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿', sort:true, hide: false}
+ ,{field: 'anfme', align: 'center',title: '閲嶉噺锛坘g锛�', sort:true, hide: false}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', sort:true, hide: true}
,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
@@ -35,7 +35,8 @@
,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
- ,{field: 'status$', align: 'center',title: '鏄庣粏閿�', hide: false}
+ ,{field: 'status$', align: 'center',title: '鏄庣粏閿�', hide: true}
+ ,{field: 'owner$', align: 'center',title: '璐т富', hide: false}
];
diff --git a/src/main/webapp/views/locDetlStatis/locDetlStatis.html b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
index 22786eb..ee6f979 100644
--- a/src/main/webapp/views/locDetlStatis/locDetlStatis.html
+++ b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
@@ -18,6 +18,9 @@
<div class="layui-input-inline">
<input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
</div>
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="owner" placeholder="璐т富缂栧彿" autocomplete="off">
+ </div>
</div>
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
--
Gitblit v1.9.1