From 368b3db6778e5b14105c348d188c322e1aed1a71 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 01 三月 2021 17:06:34 +0800
Subject: [PATCH] #

---
 src/main/java/zy/cloud/wms/manager/controller/MatController.java |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 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 1e65eb3..ea13d5f 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/MatController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/MatController.java
@@ -33,6 +33,12 @@
         return R.ok(matService.selectById(String.valueOf(id)));
     }
 
+    @RequestMapping(value = "/matCode/auth")
+    @ManagerAuth
+    public R find(@RequestParam("matnr") String matnr) {
+        return R.ok(matService.selectOne(new EntityWrapper<Mat>().eq("matnr", matnr)));
+    }
+
     @RequestMapping(value = "/mat/list/auth")
     @ManagerAuth
     public R list(@RequestParam(defaultValue = "1")Integer curr,
@@ -40,11 +46,16 @@
                   @RequestParam(required = false)String orderByField,
                   @RequestParam(required = false)String orderByType,
                   @RequestParam Map<String, Object> param){
-        EntityWrapper<Mat> wrapper = new EntityWrapper<>();
-        excludeTrash(param);
-        convert(param, wrapper);
-        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
-        return R.ok(matService.selectPage(new Page<>(curr, limit), wrapper));
+        Object tagId = param.get("tag_id");
+        if (Cools.isEmpty(tagId)) {
+            tagId = getOriginTag().getId();
+        }
+        return R.ok(matService.getPage(new Page<>(curr, limit)
+                , String.valueOf(tagId)
+                , param.get("matnr")
+                , param.get("maktx"))
+        );
+
     }
 
     private void convert(Map<String, Object> map, EntityWrapper wrapper){

--
Gitblit v1.9.1