From a6367524f0ff7a99052adec769e078468e058d2e Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期二, 15 二月 2022 16:55:15 +0800
Subject: [PATCH] #
---
src/main/webapp/views/locStatis/locStatis.html | 2 +-
src/main/resources/mapper/LocDetlMapper.xml | 8 ++++----
src/main/webapp/static/js/locStatis/locStatis.js | 1 +
src/main/webapp/static/js/common.js | 5 +++++
src/main/webapp/static/js/wrkDetl/wrkDetl.js | 8 ++++++--
5 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index f1e3b26..a23c595 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -90,7 +90,7 @@
where loc_no=#{locNo}
</select>
<select id="getStockStatis" resultMap="BaseResultMap">
- select a.mat_name,a.mat_no,sum(a.qty) qty from
+ select a.mat_name,a.mat_no,a.supplier,sum(a.qty) qty from
(
select
ROW_NUMBER() over (order by c.appe_time,c.mat_no,c.loc_no) as row,
@@ -98,7 +98,7 @@
from asr_loc_detl c
) a where a.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
<include refid="stockOutCondition"></include>
- group by a.mat_no,a.mat_name
+ group by a.mat_no,a.mat_name,a.supplier
</select>
<select id="getStockStatisCount" resultType="integer">
select
@@ -108,11 +108,11 @@
<select id="getStockStatisExcel" resultMap="BaseResultMap">
select
ROW_NUMBER() over (order by a.mat_no, sum(a.qty) desc) as row
- , a.mat_no, a.mat_name
+ , a.mat_no, a.mat_name,a.supplier
, sum(a.qty) as qty
from asr_loc_detl a
where 1=1
- group by a.mat_no,a.mat_name
+ group by a.mat_no,a.mat_name,a.supplier
</select>
<!-- <select id="getStockSum" resultMap="BaseResultMap">-->
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 333bd8d..5e422fd 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -193,5 +193,10 @@
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
// ,{field: 'bname', align: 'center',title: '搴撲綅鍚嶇О'}
,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
+ ,{field: 'weight', align: 'center', title: '姣忕閲嶉噺(KG)'}
+ ,{field: 'str3', align: 'center', title: '瀹㈡埛鍚嶇О'}
+ ,{field: 'str4', align: 'center', title: '椤圭洰淇℃伅'}
+ ,{field: 'str5$', align: 'center', title: '绫诲埆'}
+ ,{field: 'str6', align: 'center', title: '姣忕鏁伴噺(PCS)'}
]
diff --git a/src/main/webapp/static/js/locStatis/locStatis.js b/src/main/webapp/static/js/locStatis/locStatis.js
index b667ef4..3ee0b49 100644
--- a/src/main/webapp/static/js/locStatis/locStatis.js
+++ b/src/main/webapp/static/js/locStatis/locStatis.js
@@ -63,6 +63,7 @@
cols: [[{field: 'qty', align: 'center', title: '鏁伴噺', width: 120}
, {field: 'matNo', align: 'center', title: '浜у搧缂栫爜'}
, {field: 'matName', align: 'center', title: '浜у搧鍚嶇О'}
+ , {field: 'supplier', align: 'center', title: '鎵瑰彿'}
]],
request: {
pageName: 'curr',
diff --git a/src/main/webapp/static/js/wrkDetl/wrkDetl.js b/src/main/webapp/static/js/wrkDetl/wrkDetl.js
index 0776136..28569f7 100644
--- a/src/main/webapp/static/js/wrkDetl/wrkDetl.js
+++ b/src/main/webapp/static/js/wrkDetl/wrkDetl.js
@@ -7,8 +7,12 @@
];
cols.push.apply(cols, detlCols);
cols.push(
- {field: 'billNo', align: 'center',title: '鍗曟嵁缂栧彿'}
- ,{field: 'seqNo', align: 'center',title: '搴忓彿', width:80}
+ {field: 'allQty', align: 'center',title: '鎬绘暟閲�(PCS)'}
+ ,{field: 'allWeight', align: 'center',title: '鎬婚噸閲�(KG)'}
+ ,{field: 'source', align: 'center',title: '鏉ユ簮'}
+ ,{field: 'vendor', align: 'center',title: '渚涘簲鍟�'}
+ ,{field: 'billNo', align: 'center',title: '鍗曟嵁缂栧彿', hide:true}
+ ,{field: 'seqNo', align: 'center',title: '搴忓彿', width:80, hide:true}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true})
return cols;
diff --git a/src/main/webapp/views/locStatis/locStatis.html b/src/main/webapp/views/locStatis/locStatis.html
index a979181..1b56a1d 100644
--- a/src/main/webapp/views/locStatis/locStatis.html
+++ b/src/main/webapp/views/locStatis/locStatis.html
@@ -43,7 +43,7 @@
</div>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
- <button class="layui-btn layui-btn-normal layui-btn-sm" id="refresh-sto" lay-event="syncStok" style="margin-left: 10px">涓婃姤搴撳瓨鍒癊RP</button>
+<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" id="refresh-sto" lay-event="syncStok" style="margin-left: 10px">涓婃姤搴撳瓨鍒癊RP</button>-->
<button class="layui-btn layui-btn-primary layui-btn-sm" lay-event="exportAll" style="float: right">瀵煎嚭</button>
</div>
</script>
--
Gitblit v1.9.1