From a120f5a232d162d8e3891e5551c9e97fd1820422 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 02 三月 2021 15:33:27 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/MatController.java | 15 +++++----------
1 files changed, 5 insertions(+), 10 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 38a4018..ea13d5f 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/MatController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/MatController.java
@@ -46,20 +46,15 @@
@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));
-// }
-// Page<Mat> page = matService.selectPage(new Page<>(curr, limit), wrapper);
-//
-// return R.ok().add(page);
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)));
+ return R.ok(matService.getPage(new Page<>(curr, limit)
+ , String.valueOf(tagId)
+ , param.get("matnr")
+ , param.get("maktx"))
+ );
}
--
Gitblit v1.9.1