From b421f805b88a71b29c44d803e7661c2b8d486a18 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 24 六月 2020 09:03:19 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/LocDetlMapper.xml      |    3 +++
 src/main/webapp/views/pakStore/locDetlQuery.html |    2 ++
 2 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 021f266..89e1c85 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -39,6 +39,9 @@
         <if test="altme!=null and altme!='' ">
             and a.altme like '%' + #{altme} + '%'
         </if>
+        <if test="startTime!=null and endTime!=null">
+            and a.modi_time between #{startTime} and #{endTime}
+        </if>
     </sql>
 
     <select id="getStockOutPage" resultMap="BaseResultMap">
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index 8c01684..da5a837 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -124,6 +124,8 @@
                 ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜'}
                 // ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
                 // ,{field: 'memo', align: 'center',title: '澶囨敞'}
+                ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
+                ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
 
             ]],
             request: {

--
Gitblit v1.9.1