From 4a868400b87fa0d1ebfb83a530d786fd7b2f6459 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 07 四月 2021 09:58:17 +0800
Subject: [PATCH] #

---
 src/main/java/zy/cloud/wms/manager/controller/MatController.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 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 4bc7cef..faf2fb1 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/MatController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/MatController.java
@@ -35,9 +35,7 @@
 
     @RequestMapping(value = "/mat/list/pda/auth")
     @ManagerAuth
-    public R pdaList(@RequestParam(defaultValue = "1")Integer curr,
-                     @RequestParam(defaultValue = "10")Integer limit,
-                     @RequestParam(required = true)Long tagId){
+    public R pdaList(@RequestParam(required = true)Long tagId){
         EntityWrapper<Mat> wrapper = new EntityWrapper<>();
         wrapper.eq("tag_id", tagId);
         wrapper.orderBy("create_time", false);
@@ -45,6 +43,18 @@
         return R.ok().add(mats);
     }
 
+    @RequestMapping(value = "/mat/search/pda/auth")
+    @ManagerAuth
+    public R pdaSearch(@RequestParam(required = false)String condition){
+        EntityWrapper<Mat> wrapper = new EntityWrapper<>();
+        if (!Cools.isEmpty(condition)) {
+            wrapper.like("matnr", condition).or().like("maktx", condition);
+        }
+        wrapper.orderBy("create_time", false);
+        List<Mat> mats = matService.selectList(wrapper);
+        return R.ok().add(mats);
+    }
+
     @RequestMapping(value = "/mat/{id}/auth")
     @ManagerAuth
     public R get(@PathVariable("id") String id) {

--
Gitblit v1.9.1