From 92d5f4d657557feb32b7f35a51dd008407da8cbe Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期六, 24 五月 2025 15:22:03 +0800
Subject: [PATCH] #wms网页显示字段修改
---
src/main/webapp/views/locDetl/locDetl.html | 10 +-
src/main/webapp/views/report/viewWorkOut.html | 10 +-
src/main/webapp/static/js/locDetlStatis/locDetlStatis.js | 10 --
src/main/webapp/views/pakStore/locDetlCheckQuery.html | 10 +-
src/main/webapp/static/js/order/out.js | 4
src/main/webapp/views/locDetlStatis/locDetlStatis.html | 22 +++---
src/main/resources/mapper/LocDetlMapper.xml | 72 +++++++++++++++++++----
src/main/webapp/static/js/mat/mat.js | 6 +-
src/main/webapp/views/pakStore/locDetlQuery.html | 10 +-
src/main/webapp/views/report/viewWorkIn.html | 10 +-
src/main/webapp/static/js/common.js | 12 ++--
11 files changed, 107 insertions(+), 69 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index ef51f89..1f38471 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -158,6 +158,40 @@
<include refid="batchSeq"></include>
</update>
+ <sql id="stockOutConditionTwo">
+ <if test="loc_no!=null and loc_no!='' ">
+ AND a.loc_no LIKE '%' + #{loc_no} + '%'
+ </if>
+ <if test="matnr!=null and matnr!='' ">
+ AND a.matnr LIKE '%' + #{matnr} + '%'
+ </if>
+ <if test="model!=null and model!='' ">
+ AND a.model LIKE '%' + #{model} + '%'
+ </if>
+ <if test="specs!=null and specs!='' ">
+ AND a.specs LIKE '%' + #{specs} + '%'
+ </if>
+ <if test="batch!=null and batch!='' ">
+ AND a.batch LIKE '%' + #{batch} + '%'
+ </if>
+ <if test="supp!=null and supp!='' ">
+ AND a.supp LIKE '%' + #{supp} + '%'
+ </if>
+ <if test="outOrderNo!=null and outOrderNo!='' ">
+ AND a.out_order_no LIKE '%' + #{outOrderNo} + '%'
+ </if>
+ <if test="proType!=null and proType!='' ">
+ AND a.pro_type = #{proType}
+ </if>
+ <if test="temp1!=null and temp1!='' ">
+ AND a.temp1 LIKE '%' + #{temp1} + '%'
+ </if>
+ <!-- 浠ヤ笅瀛楁濡備笉鍦⊿ELECT鍜孏ROUP BY涓缓璁垹鍘绘垨鏀逛负HAVING -->
+ <!-- <if test="anfme!=null and anfme!='' ">
+ HAVING SUM(a.anfme) LIKE '%' + #{anfme} + '%'
+ </if> -->
+ </sql>
+
<sql id="stockOutCondition">
<if test="loc_no!=null and loc_no!='' ">
and a.loc_no like '%' + #{loc_no} + '%'
@@ -223,29 +257,39 @@
</select>
<select id="getStockStatis" resultType="com.zy.asrs.entity.LocDetl">
- select * from
- (
- 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 a
- where 1=1
- <include refid="stockOutCondition"></include>
- group by a.matnr, a.batch
- ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+ SELECT * FROM (
+ SELECT
+ ROW_NUMBER() OVER (ORDER BY SUM(a.anfme) DESC) AS row,
+ -- 鍒嗙粍瀛楁
+ a.model,
+ a.pro_type AS proType,
+ a.out_order_no AS outOrderNo,
+ -- 闈炲垎缁勫瓧娈电敤鑱氬悎鍑芥暟鑾峰彇涓�涓唬琛ㄥ�硷紙渚嬪MAX鎴朚IN锛�
+ MAX(a.matnr) AS matnr,
+ MAX(a.specs) AS specs,
+ MAX(a.temp1) AS temp1,
+ -- 鑱氬悎鏁伴噺
+ SUM(a.anfme) AS anfme
+ FROM asr_loc_detl a
+ WHERE 1=1
+ <include refid="stockOutConditionTwo"/>
+ GROUP BY a.model, a.pro_type, a.out_order_no
+ ) t
+ WHERE t.row BETWEEN ((#{pageNumber}-1)*#{pageSize}+1) AND (#{pageNumber}*#{pageSize})
</select>
+
+
+
<select id="getStockStatisCount" parameterType="java.util.Map" resultType="java.lang.Integer">
select count(1) as count from
(
select
- a.matnr
+ a.model
from asr_loc_detl a
where 1=1
<include refid="stockOutCondition"></include>
- group by a.matnr
+ group by a.model
) b
</select>
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index df8f55f..ff83bb2 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -201,8 +201,8 @@
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
- ,{field: 'weight', align: 'center',title: '鎬婚噸閲�', hide: false}
- ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
+ ,{field: 'weight', align: 'center',title: '鎬婚噸閲�', hide: true}
+ ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: false}
,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
@@ -219,9 +219,9 @@
,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳', hide: true}
,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
- ,{field: 'proType', align: 'center',title: '灞炴��', hide: false}
+ ,{field: 'proType', align: 'center',title: '灞炴��', hide: true}
,{field: 'temp1', align: 'center',title: '鍚嶇О鎬荤О', hide: false}
- ,{field: 'outOrderNo', align: 'center',title: '鍚堝悓鍙�', hide: false}
+ ,{field: 'outOrderNo', align: 'center',title: '鍚堝悓鍙�', hide: true}
]
@@ -250,10 +250,10 @@
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
,{field: 'weight', align: 'center',title: '鎬婚噸閲�', hide: false}
- ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
+ ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: false}
,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
- ,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
+ ,{field: 'supp', align: 'center',title: '瀹㈡埛鍚嶇О', hide:false }
,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
,{field: 'deadTime', 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 a769f98..caab684 100644
--- a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
+++ b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
@@ -30,19 +30,13 @@
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {field: 'lkQty', title:'绔嬪簱鏁伴噺', align: 'center', width:150},
- {field: 'erpQty', title:'ERP鏁伴噺', align: 'center', width:150},
+ {field: 'anfme', title:'绔嬪簱鏁伴噺', align: 'center', width:150},
{field: 'matnr', title:'浜у搧缂栫爜', align: 'center'},
{field: 'model', title:'浜у搧浠ｇ爜', align: 'center'},
{field: 'specs', title:'浜у搧瑙勬牸', align: 'center'},
- {field: 'maktx', title:'浜у搧鍚嶇О', align: 'center'},
- {field: 'pgNo', title:'娲惧伐鍗曞彿', align: 'center'},
+ {field: 'temp1', title:'浜у搧鎬荤О', align: 'center'},
{field: 'outOrderNo', title:'鍚堝悓鍙�', align: 'center'},
- {field: 'batch', title:'鎵规', align: 'center'},
{field: 'proType', title:'灞炴��', align: 'center'},
- {field: 'color', title:'棰滆壊', align: 'center'},
- {field: 'luHao', title:'鐐夊彿', align: 'center'},
- {field: 'packing', title:'渚涘簲鍟�', align: 'center'}
]],
request: {
pageName: 'curr',
diff --git a/src/main/webapp/static/js/mat/mat.js b/src/main/webapp/static/js/mat/mat.js
index 2805440..6fa9556 100644
--- a/src/main/webapp/static/js/mat/mat.js
+++ b/src/main/webapp/static/js/mat/mat.js
@@ -5,9 +5,9 @@
var cols = [
{type: 'checkbox'}
,{field: 'tagId$', align: 'center',title: '褰掔被', templet: '#tagTpl'}
- ,{field: 'store_max', align: 'center',title: '搴撳瓨涓婇檺'}
- ,{field: 'store_min', align: 'center',title: '搴撳瓨涓嬮檺'}
- ,{field: 'store_max_date', align: 'center',title: '搴撻緞涓婇檺(澶�)'}
+ ,{field: 'store_max', align: 'center',title: '搴撳瓨涓婇檺',hide:true}
+ ,{field: 'store_min', align: 'center',title: '搴撳瓨涓嬮檺',hide:true}
+ ,{field: 'store_max_date', align: 'center',title: '搴撻緞涓婇檺(澶�)',hide:true}
];
cols.push.apply(cols, matCols);
cols.push(
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index ed92143..5eb388c 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -36,7 +36,7 @@
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'sPgNO', align: 'center',title: '娲惧伐鍗曞彿'}
+ ,{field: 'sPgNO', align: 'center',title: '娲惧伐鍗曞彿',hide:true}
// ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
// ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
,{field: 'enableQty', align: 'center',title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'}
@@ -162,7 +162,7 @@
{field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
{field: 'model', title: '浜у搧缂栧彿', align: 'center'},
{field: 'batch', title: '鎵规', align: 'center'},
- {field: 'sPgNO', title: '娲惧伐鍗曞彿', align: 'center'},
+ {field: 'sPgNO', title: '娲惧伐鍗曞彿', align: 'center',hide:true},
{field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
{field: 'zpallet', align: 'center',title: '鎵樼洏鐮�'},
{field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index 6911130..25a9c19 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -39,11 +39,11 @@
<input class="layui-input" type="text" name="specs" placeholder="瑙勬牸" autocomplete="off">
</div>
</div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="pg_no" placeholder="娲惧伐鍗曞彿" autocomplete="off">
- </div>
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="pg_no" placeholder="娲惧伐鍗曞彿" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline">
<div class="layui-input-inline">
<input class="layui-input" type="text" name="out_order_no" placeholder="鍚堝悓鍙�" autocomplete="off">
diff --git a/src/main/webapp/views/locDetlStatis/locDetlStatis.html b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
index 9b4958d..fccfa22 100644
--- a/src/main/webapp/views/locDetlStatis/locDetlStatis.html
+++ b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
@@ -35,11 +35,11 @@
<input class="layui-input" type="text" name="specs" placeholder="浜у搧瑙勬牸" autocomplete="off">
</div>
</div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="sPgNO" placeholder="娲惧伐鍗曞彿" autocomplete="off">
- </div>
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="outOrderNo" placeholder="娲惧伐鍗曞彿" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline">
<div class="layui-input-inline">
<input class="layui-input" type="text" name="outOrderNo" placeholder="鍚堝悓鍙�" autocomplete="off">
@@ -50,13 +50,13 @@
<!-- <input class="layui-input" type="text" name="zpallet" placeholder="鎵樼洏鏉＄爜" autocomplete="off">-->
<!-- </div>-->
<!-- </div>-->
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input name="different" type="radio" value="0" title="鏄剧ず鍏ㄩ儴" checked>
- <input name="different" type="radio" value="1" title="鏄剧ず宸紓">
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input name="different" type="radio" value="0" title="鏄剧ず鍏ㄩ儴" checked>-->
+<!-- <input name="different" type="radio" value="1" title="鏄剧ず宸紓">-->
- </div>
- </div>
+<!-- </div>-->
+<!-- </div>-->
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储
diff --git a/src/main/webapp/views/pakStore/locDetlCheckQuery.html b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
index 1273217..49afad8 100644
--- a/src/main/webapp/views/pakStore/locDetlCheckQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
@@ -93,11 +93,11 @@
</div>
</div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="sPgNO" placeholder="娲惧伐鍗曞彿" autocomplete="off">
- </div>
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="sPgNO" placeholder="娲惧伐鍗曞彿" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline">
<div class="layui-input-inline">
<input class="layui-input" type="text" name="outOrderNo" placeholder="鍚堝悓鍙�" autocomplete="off">
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index db521c2..a6b7c78 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -77,11 +77,11 @@
<input class="layui-input" type="text" name="maktx" placeholder="鐗╂枡鎻忚堪" autocomplete="off">
</div>
</div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="sPgNO" placeholder="娲惧伐鍗曞彿" autocomplete="off">
- </div>
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="sPgNO" placeholder="娲惧伐鍗曞彿" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline">
<div class="layui-input-inline">
<input class="layui-input" type="text" name="outOrderNo" placeholder="鍚堝悓鍙�" autocomplete="off">
diff --git a/src/main/webapp/views/report/viewWorkIn.html b/src/main/webapp/views/report/viewWorkIn.html
index 4aae5ec..b3036eb 100644
--- a/src/main/webapp/views/report/viewWorkIn.html
+++ b/src/main/webapp/views/report/viewWorkIn.html
@@ -54,11 +54,11 @@
<input class="layui-input layui-laydate-range" name="query_date" type="text" placeholder="鍏ュ簱璧峰鏃堕棿 - 鍏ュ簱缁堟鏃堕棿" autocomplete="off" style="width: 290px">
</div>
</div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="sPgNO" placeholder="娲惧伐鍗曞彿" autocomplete="off">
- </div>
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="sPgNO" placeholder="娲惧伐鍗曞彿" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline">
<div class="layui-input-inline">
<input class="layui-input" type="text" name="outOrderNo" placeholder="鍚堝悓鍙�" autocomplete="off">
diff --git a/src/main/webapp/views/report/viewWorkOut.html b/src/main/webapp/views/report/viewWorkOut.html
index 652c5c5..5754b71 100644
--- a/src/main/webapp/views/report/viewWorkOut.html
+++ b/src/main/webapp/views/report/viewWorkOut.html
@@ -54,11 +54,11 @@
<input class="layui-input layui-laydate-range" name="query_date" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
</div>
</div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="sPgNO" placeholder="娲惧伐鍗曞彿" autocomplete="off">
- </div>
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="sPgNO" placeholder="娲惧伐鍗曞彿" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline">
<div class="layui-input-inline">
<input class="layui-input" type="text" name="outOrderNo" placeholder="鍚堝悓鍙�" autocomplete="off">
--
Gitblit v1.9.1