From 16df414db25bf21058077e37ad3bc28bba1cbb10 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期日, 08 八月 2021 15:52:43 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/MatController.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 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 6f05bf6..faf2fb1 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/MatController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/MatController.java
@@ -25,16 +25,35 @@
import javax.servlet.http.HttpServletResponse;
import java.awt.image.BufferedImage;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
public class MatController extends BaseController {
@Autowired
private MatService matService;
+
+ @RequestMapping(value = "/mat/list/pda/auth")
+ @ManagerAuth
+ public R pdaList(@RequestParam(required = true)Long tagId){
+ EntityWrapper<Mat> wrapper = new EntityWrapper<>();
+ wrapper.eq("tag_id", tagId);
+ wrapper.orderBy("create_time", false);
+ List<Mat> mats = matService.selectList(wrapper);
+ 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
@@ -83,6 +102,10 @@
@RequestMapping(value = "/mat/add/auth")
@ManagerAuth
public R add(Mat mat) {
+ mat.setCreateBy(getUserId());
+ mat.setCreateTime(new Date());
+ mat.setUpdateBy(getUserId());
+ mat.setUpdateTime(new Date());
matService.insert(mat);
return R.ok();
}
@@ -93,6 +116,8 @@
if (Cools.isEmpty(mat) || null==mat.getId()){
return R.error();
}
+ mat.setUpdateBy(getUserId());
+ mat.setUpdateTime(new Date());
matService.updateById(mat);
return R.ok();
}
--
Gitblit v1.9.1