From b5512423f08bd4288ba3dec4f0bfd4f8003ec9d2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 27 二月 2021 10:22:52 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/MatController.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 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 5c6f7d8..709ae2e 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,15 +46,25 @@
@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));
+// 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();
}
- Page<Mat> page = matService.selectPage(new Page<>(curr, limit), wrapper);
+ return R.ok(matService.getPage(new Page<>(curr, limit)
+ , String.valueOf(tagId)
+ , param.get("matnr")
+ , param.get("maktx"))
+ );
- return R.ok().add(page);
}
private void convert(Map<String, Object> map, EntityWrapper wrapper){
--
Gitblit v1.9.1