From 57ae0c8f7a909327ed6058c0e78e8f808f91be4a Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 01 二月 2024 15:56:20 +0800
Subject: [PATCH] 1.导入自动解析主体、车间以及产线 2.增加搜索字段
---
src/main/java/com/zy/asrs/controller/PlaController.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PlaController.java b/src/main/java/com/zy/asrs/controller/PlaController.java
index 7e0f478..3f43b43 100644
--- a/src/main/java/com/zy/asrs/controller/PlaController.java
+++ b/src/main/java/com/zy/asrs/controller/PlaController.java
@@ -27,10 +27,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
public class PlaController extends BaseController {
@@ -47,6 +44,8 @@
private OrderDetlService orderDetlService;
@Autowired
private PlaLogService plaLogService;
+ @Autowired
+ private MatService matService;
@RequestMapping(value = "/pla/list/auth")
@ManagerAuth
@@ -248,6 +247,22 @@
return R.ok("瑙ｉ櫎鍐荤粨鎴愬姛");
}
+ @RequestMapping(value = "/matMaktxQuery/auth")
+ @ManagerAuth
+ public R queryMat(String condition) {
+ EntityWrapper<Mat> wrapper = new EntityWrapper<>();
+ wrapper.like("maktx", condition);
+ Page<Mat> page = matService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (Mat mat : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", mat.getMaktx());
+ map.put("value", mat.getMaktx());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
/**
* excel瀵煎叆妯℃澘涓嬭浇
*/
--
Gitblit v1.9.1