From d5aea757321140614637b6bdfbe6c28c510c85ea Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 16 六月 2020 15:34:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 5 +++--
src/main/webapp/views/pakStore/stockOut.html | 2 +-
src/main/resources/mapper/LocDetlMapper.xml | 3 +++
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 6 ++++--
4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 5679941..2e5c024 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -12,7 +12,8 @@
@Repository
public interface LocDetlMapper extends BaseMapper<LocDetl> {
- List<LocDetl> getStockOutPage(@Param("pageNumber")int pageNumber, @Param("pageSize")int pageSize, @Param("loc_no") Object loc_no);
+ List<LocDetl> getStockOutPage(@Param("pageNumber")int pageNumber, @Param("pageSize")int pageSize, @Param("loc_no") Object loc_no, @Param("matnr") Object matnr);
- Integer getStockOutPageCount(@Param("loc_no") Object loc_no);
+ Integer getStockOutPageCount(@Param("loc_no") Object loc_no, @Param("matnr") Object matnr);
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 10972fc..1d44447 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -12,8 +12,10 @@
@Override
public Page<LocDetl> getStockOut(Page<LocDetl> page) {
- page.setRecords(baseMapper.getStockOutPage(page.getCurrent(), page.getSize(), page.getCondition().get("loc_no")));
- page.setTotal(baseMapper.getStockOutPageCount(page.getCondition().get("loc_no")));
+ page.setRecords(baseMapper.getStockOutPage(page.getCurrent(), page.getSize()
+ , page.getCondition().get("loc_no"), page.getCondition().get("matnr")));
+ page.setTotal(baseMapper.getStockOutPageCount(page.getCondition().get("loc_no"), page.getCondition().get("matnr")));
return page;
}
+
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 045399a..d2eac54 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -27,6 +27,9 @@
<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>
</sql>
<select id="getStockOutPage" resultMap="BaseResultMap">
diff --git a/src/main/webapp/views/pakStore/stockOut.html b/src/main/webapp/views/pakStore/stockOut.html
index e1b47cb..959defd 100644
--- a/src/main/webapp/views/pakStore/stockOut.html
+++ b/src/main/webapp/views/pakStore/stockOut.html
@@ -81,7 +81,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="mat_no" placeholder="绠卞彿/鎵瑰彿" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="绠卞彿/鎵瑰彿" autocomplete="off">
</div>
</div>
<div class="layui-inline">
--
Gitblit v1.9.1