From dcae969ee04f67b6dc46f3ca061116f44558307a Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 24 六月 2025 08:27:36 +0800
Subject: [PATCH] #订单导入去重

---
 src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java |   26 ++++++++++++++++++++++++--
 1 files changed, 24 insertions(+), 2 deletions(-)

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 8abf584..2bb6c66 100644
--- a/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
@@ -7,12 +7,18 @@
 import com.zy.asrs.mapper.MatMapper;
 import com.zy.asrs.service.MatService;
 
+import java.util.List;
+
 @Service("matService")
 public class MatServiceImpl extends ServiceImpl<MatMapper, Mat> implements MatService {
 
     @Override
-    public Page<Mat> getPage(Page page, String tagId, Object matnr, Object maktx) {
-        return page.setRecords(baseMapper.listByPage(page, tagId, matnr, maktx));
+    public Page<Mat> getPage(Page page, String tagId, Object matnr, Object memo) {
+        return page.setRecords(baseMapper.listByPage(page, tagId, matnr, memo));
+    }
+    @Override
+    public Page<Mat> getPage2(Page page, String tagId, Object matnr, Object maktx, Object specs) {
+        return page.setRecords(baseMapper.listByPage2(page, tagId, matnr, maktx, specs));
     }
 
 
@@ -21,5 +27,21 @@
         return this.baseMapper.selectByMatnr(matnr);
     }
 
+    @Override
+    public List<Mat> selectByMatnrLink(String matnr) {
+        return this.baseMapper.selectByMatnrLink(matnr);
+    }
+
+    @Override
+    public Page<Mat> getMatTurnPage(Page<Mat> page){
+        page.setRecords(baseMapper.getMatTurnPage(page.getCondition()));
+//        page.setTotal(baseMapper.getStockOutPageCount(page.getCondition()));
+        page.setTotal(16);
+        return page;
+    };
+
+
+
+
 
 }

--
Gitblit v1.9.1