From 4cb27cf5432de5883149766852eff15af5f59c75 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 26 五月 2023 14:05:30 +0800
Subject: [PATCH] 入库作业提取商品增加上架区域查询筛选
---
src/main/java/com/zy/asrs/mapper/MatMapper.java | 2 +-
src/main/resources/mapper/MatMapper.xml | 3 +++
src/main/java/com/zy/asrs/controller/MatController.java | 1 +
src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java | 4 ++--
src/main/webapp/views/pakStore/matQuery.html | 10 ++++++++++
src/main/java/com/zy/asrs/service/MatService.java | 2 +-
6 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 96eff45..2d12e18 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -120,6 +120,7 @@
, param.get("matnr")
, param.get("maktx")
, param.get("specs")
+ , param.get("mat_type")
)
);
diff --git a/src/main/java/com/zy/asrs/mapper/MatMapper.java b/src/main/java/com/zy/asrs/mapper/MatMapper.java
index a8a3a04..3f7828a 100644
--- a/src/main/java/com/zy/asrs/mapper/MatMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/MatMapper.java
@@ -13,7 +13,7 @@
@Repository
public interface MatMapper extends BaseMapper<Mat> {
- List<Mat> listByPage(Page page, @Param("tagId") String tagId, @Param("matnr") Object matnr, @Param("maktx") Object maktx, @Param("specs") Object specs);
+ List<Mat> listByPage(Page page, @Param("tagId") String tagId, @Param("matnr") Object matnr, @Param("maktx") Object maktx, @Param("specs") Object specs, @Param("matType") Object matType);
Mat selectByMatnr(@Param("matnr")String matnr);
diff --git a/src/main/java/com/zy/asrs/service/MatService.java b/src/main/java/com/zy/asrs/service/MatService.java
index d17d198..444aacc 100644
--- a/src/main/java/com/zy/asrs/service/MatService.java
+++ b/src/main/java/com/zy/asrs/service/MatService.java
@@ -8,7 +8,7 @@
public interface MatService extends IService<Mat> {
- Page<Mat> getPage(Page page, String tagId, Object matnr, Object maktx, Object specs);
+ Page<Mat> getPage(Page page, String tagId, Object matnr, Object maktx, Object specs, Object matType);
Mat selectByMatnr(String matnr);
diff --git a/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
index f8a5781..e064279 100644
--- a/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
@@ -13,8 +13,8 @@
public class MatServiceImpl extends ServiceImpl<MatMapper, Mat> implements MatService {
@Override
- public Page<Mat> getPage(Page page, String tagId, Object matnr, Object maktx, Object specs) {
- return page.setRecords(baseMapper.listByPage(page, tagId, matnr, maktx, specs));
+ public Page<Mat> getPage(Page page, String tagId, Object matnr, Object maktx, Object specs, Object matType) {
+ return page.setRecords(baseMapper.listByPage(page, tagId, matnr, maktx, specs, matType));
}
diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index f710d44..6e2e8fb 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -76,6 +76,9 @@
<if test="specs != null and specs != ''">
and mm.specs like concat('%',#{specs},'%')
</if>
+ <if test="matType != null and matType != ''">
+ and mm.mat_type = #{matType}
+ </if>
ORDER BY mm.inout_everyday desc, mm.create_time DESC
</select>
diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index 54c50b4..cc96336 100644
--- a/src/main/webapp/views/pakStore/matQuery.html
+++ b/src/main/webapp/views/pakStore/matQuery.html
@@ -46,6 +46,16 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
+ <select name="mat_type">
+ <option value="">閫夋嫨涓婃灦鍖哄煙</option>
+ <option value="1">鍗曞搧鍖�</option>
+ <option value="2">楂橀娣锋斁鍖�</option>
+ <option value="3">浣庨娣锋斁鍖�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
<input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
</div>
</div>
--
Gitblit v1.9.1