From 1a77bac582e942b91c03567772039a40fe63c78a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 17 二月 2025 13:56:42 +0800
Subject: [PATCH] 增加退货搜索框
---
src/main/webapp/views/pla/plaDetl.html | 9 ++++++++-
src/main/webapp/static/js/pla/plaDetl.js | 4 +++-
src/main/webapp/views/locDetlStatis/locDetlStatis.html | 8 ++++++++
src/main/java/com/zy/asrs/mapper/PlaMapper.java | 2 +-
src/main/resources/mapper/PlaMapper.xml | 3 +++
5 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/PlaMapper.java b/src/main/java/com/zy/asrs/mapper/PlaMapper.java
index 04c1a1f..f6c4c13 100644
--- a/src/main/java/com/zy/asrs/mapper/PlaMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/PlaMapper.java
@@ -20,7 +20,7 @@
// @Select("select brand, matnr,workshop , sum(weight_anfme) as weight from asr_pla_detl GROUP BY brand,matnr,workshop ORDER BY matnr,workshop desc")
List<Pla> getStockStatisAll(@Param("brand") String brand,@Param("status") String status,@Param("stime") Date stime, @Param("etime") Date etime,
- @Param("type") String type,@Param("workshop") String workshop);
+ @Param("type") String type,@Param("workshop") String workshop,@Param("transfer") String transfer);
Integer getStockStatisCountAll(Map<String, Object> map);
diff --git a/src/main/resources/mapper/PlaMapper.xml b/src/main/resources/mapper/PlaMapper.xml
index 25f26c3..ea2d216 100644
--- a/src/main/resources/mapper/PlaMapper.xml
+++ b/src/main/resources/mapper/PlaMapper.xml
@@ -37,6 +37,9 @@
<if test="workshop != null and workshop != ''">
and workshop = #{workshop}
</if>
+ <if test="transfer != null and transfer != ''">
+ and transfer = #{transfer}
+ </if>
</where>
GROUP BY brand,matnr,workshop HAVING SUM(weight_anfme) > 0 ORDER BY matnr,workshop
</select>
diff --git a/src/main/webapp/static/js/pla/plaDetl.js b/src/main/webapp/static/js/pla/plaDetl.js
index 0b322a1..b6ddf4e 100644
--- a/src/main/webapp/static/js/pla/plaDetl.js
+++ b/src/main/webapp/static/js/pla/plaDetl.js
@@ -67,7 +67,9 @@
// ,{field: 'pakoutTime', align: 'center',title: '鍑哄簱鏃堕棿', hide:true}
// ,{field: 'orderWeight', align: 'center',title: '閲嶉噺', hide:true}
// ,{field: 'handlerBy', align: 'center',title: '缁忓姙浜�', hide:true}
- // ,{field: 'transfer', align: 'center',title: '娴佽浆褰㈠紡', hide:true}
+ ,{field: 'transfer', align: 'center',title: '閫�璐ф爣璇�', hide:true}
+ ,{field: 'modifyUser', align: 'center',title: '閫�璐т汉', hide:true}
+ ,{field: 'createUser', align: 'center',title: '閫�璐у娉�', hide:true}
// ,{field: 'customer', align: 'center',title: '瀹㈡埛鍚嶇О', hide:true}
// ,{field: 'allocate', align: 'center',title: '璋冩嫧鍒�', hide:true}
// ,{field: 'memo', align: 'center',title: '澶囨敞', hide:true}
diff --git a/src/main/webapp/views/locDetlStatis/locDetlStatis.html b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
index b363ec5..0a427b9 100644
--- a/src/main/webapp/views/locDetlStatis/locDetlStatis.html
+++ b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
@@ -48,6 +48,14 @@
<input class="layui-input" type="text" name="workshop" placeholder="杞﹂棿" autocomplete="off">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select name="transfer">
+ <option value="">鏄惁閫�璐�</option>
+ <option value="閫�璐�">鏄�</option>
+ </select>
+ </div>
+ </div>
<div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
<input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="鍏ュ簱璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
diff --git a/src/main/webapp/views/pla/plaDetl.html b/src/main/webapp/views/pla/plaDetl.html
index b0d88bd..4cef15e 100644
--- a/src/main/webapp/views/pla/plaDetl.html
+++ b/src/main/webapp/views/pla/plaDetl.html
@@ -312,7 +312,14 @@
<input class="layui-input" type="text" name="stash" placeholder="浠撳簱" autocomplete="off">
</div>
</div>
-
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select name="transfer">
+ <option value="">鏄惁閫�璐�</option>
+ <option value="閫�璐�">鏄�</option>
+ </select>
+ </div>
+ </div>
</div>
</div>
--
Gitblit v1.9.1