From cac5b314ea4f370235f9c40210ce792eb838c7ff Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期一, 04 八月 2025 08:12:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-2' into tzskasrs-2
---
src/main/java/com/zy/asrs/mapper/MatMapper.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/MatMapper.java b/src/main/java/com/zy/asrs/mapper/MatMapper.java
index d37ee63..5cd0875 100644
--- a/src/main/java/com/zy/asrs/mapper/MatMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/MatMapper.java
@@ -13,8 +13,10 @@
@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);
+ Mat selectByBarcode(@Param("barcode")String barcode);
+
}
--
Gitblit v1.9.1