From b5512423f08bd4288ba3dec4f0bfd4f8003ec9d2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 27 二月 2021 10:22:52 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/MatController.java | 6 +++++-
src/main/java/zy/cloud/wms/manager/service/MatService.java | 2 +-
src/main/resources/mapper/MatMapper.xml | 6 ++++++
src/main/java/zy/cloud/wms/manager/service/impl/MatServiceImpl.java | 4 ++--
src/main/resources/application.yml | 4 ++--
src/main/java/zy/cloud/wms/manager/mapper/MatMapper.java | 2 +-
6 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/MatController.java b/src/main/java/zy/cloud/wms/manager/controller/MatController.java
index 38a4018..709ae2e 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/MatController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/MatController.java
@@ -59,7 +59,11 @@
if (Cools.isEmpty(tagId)) {
tagId = getOriginTag().getId();
}
- return R.ok(matService.getPage(new Page<>(curr, limit), String.valueOf(tagId)));
+ return R.ok(matService.getPage(new Page<>(curr, limit)
+ , String.valueOf(tagId)
+ , param.get("matnr")
+ , param.get("maktx"))
+ );
}
diff --git a/src/main/java/zy/cloud/wms/manager/mapper/MatMapper.java b/src/main/java/zy/cloud/wms/manager/mapper/MatMapper.java
index 92a17ca..4644b40 100644
--- a/src/main/java/zy/cloud/wms/manager/mapper/MatMapper.java
+++ b/src/main/java/zy/cloud/wms/manager/mapper/MatMapper.java
@@ -13,7 +13,7 @@
@Repository
public interface MatMapper extends BaseMapper<Mat> {
- List<Mat> listByPage(Page page, @Param("tagId") String tagId);
+ List<Mat> listByPage(Page page, @Param("tagId") String tagId, @Param("matnr") Object matnr, @Param("maktx") Object maktx);
Mat selectByMatnr(@Param("matnr")String matnr);
diff --git a/src/main/java/zy/cloud/wms/manager/service/MatService.java b/src/main/java/zy/cloud/wms/manager/service/MatService.java
index 92b289b..5fe8a00 100644
--- a/src/main/java/zy/cloud/wms/manager/service/MatService.java
+++ b/src/main/java/zy/cloud/wms/manager/service/MatService.java
@@ -6,7 +6,7 @@
public interface MatService extends IService<Mat> {
- Page<Mat> getPage(Page page, String tagId);
+ Page<Mat> getPage(Page page, String tagId, Object matnr, Object maktx);
Mat selectByMatnr(String matnr);
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/MatServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/MatServiceImpl.java
index b6cc72d..bc7c050 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/MatServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/MatServiceImpl.java
@@ -11,8 +11,8 @@
public class MatServiceImpl extends ServiceImpl<MatMapper, Mat> implements MatService {
@Override
- public Page<Mat> getPage(Page page, String tagId) {
- return page.setRecords(baseMapper.listByPage(page, tagId));
+ public Page<Mat> getPage(Page page, String tagId, Object matnr, Object maktx) {
+ return page.setRecords(baseMapper.listByPage(page, tagId, matnr, maktx));
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 536b142..9796810 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -33,8 +33,8 @@
mapper-locations: classpath:mapper/*.xml
# global-config:
# field-strategy: 0
-# configuration:
-# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+ configuration:
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
logging:
path: /stock/out/logs
diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index cc667ff..6b93176 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -38,6 +38,12 @@
LEFT JOIN man_tag mt ON mm.tag_id = mt.id
WHERE 1=1
AND (CHARINDEX(#{tagId}, ','+mt.path+',') > 0 OR mt.id = #{tagId})
+ <if test="matnr != null and matnr != ''">
+ and mm.matnr like concat('%',#{matnr},'%')
+ </if>
+ <if test="maktx != null and maktx != ''">
+ and mm.maktx like concat('%',#{maktx},'%')
+ </if>
ORDER BY mm.create_time DESC
</select>
--
Gitblit v1.9.1