From 7153ce9e235102c07830c7160fd36fd8f9e0ca6a Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 31 五月 2024 20:48:07 +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/java/com/zy/asrs/service/MatService.java | 2 +-
5 files changed, 8 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 a7bb3f7..603e82e 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -112,6 +112,7 @@
return R.ok(matService.getPage(new Page<>(curr, limit)
, String.valueOf(tagId)
, param.get("matnr")
+ , param.get("matnr2")
, param.get("maktx")
, param.get("specs")
)
diff --git a/src/main/java/com/zy/asrs/mapper/MatMapper.java b/src/main/java/com/zy/asrs/mapper/MatMapper.java
index 4d20367..5cd0875 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("matnr2") Object matnr2, @Param("maktx") Object maktx, @Param("specs") Object specs);
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 7a00aef..8d616d2 100644
--- a/src/main/java/com/zy/asrs/service/MatService.java
+++ b/src/main/java/com/zy/asrs/service/MatService.java
@@ -6,7 +6,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 matnr2, Object maktx, Object specs);
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 f6c1031..e789661 100644
--- a/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
+++ b/src/main/java/com/zy/asrs/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, 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 matnr2, Object maktx, Object specs) {
+ return page.setRecords(baseMapper.listByPage(page, tagId, matnr, matnr2, maktx, specs));
}
diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index f1734b9..dfcecc6 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -68,6 +68,9 @@
<if test="matnr != null and matnr != ''">
and mm.matnr like concat('%',#{matnr},'%')
</if>
+ <if test="matnr != null and matnr != ''">
+ and mm.matnr2 like concat('%',#{matnr2},'%')
+ </if>
<if test="maktx != null and maktx != ''">
and mm.maktx like concat('%',#{maktx},'%')
</if>
--
Gitblit v1.9.1