From 16daa2a44e5fa705e671f5ff18631eb26ad70d40 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期日, 18 二月 2024 14:24:34 +0800
Subject: [PATCH] 库区管理bug修复
---
src/main/java/com/zy/asrs/controller/PlaController.java | 59 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 33 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PlaController.java b/src/main/java/com/zy/asrs/controller/PlaController.java
index 982f65a..3f43b43 100644
--- a/src/main/java/com/zy/asrs/controller/PlaController.java
+++ b/src/main/java/com/zy/asrs/controller/PlaController.java
@@ -14,6 +14,7 @@
import com.zy.asrs.service.*;
import com.zy.asrs.utils.PlaExcelListener;
import com.zy.asrs.utils.SaasUtils;
+import com.zy.common.CodeRes;
import com.zy.common.entity.PlaExcel;
import com.zy.common.web.BaseController;
import lombok.Synchronized;
@@ -26,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 {
@@ -46,6 +44,8 @@
private OrderDetlService orderDetlService;
@Autowired
private PlaLogService plaLogService;
+ @Autowired
+ private MatService matService;
@RequestMapping(value = "/pla/list/auth")
@ManagerAuth
@@ -247,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瀵煎叆妯℃澘涓嬭浇
*/
@@ -277,28 +293,19 @@
return R.ok("鎴愬姛鍚屾"+listener.getTotal()+"鏉la鐗╂枡鏁版嵁");
}
-// // 鎵撳嵃
-// @RequestMapping(value = "/pla/print/auth")
-// @ManagerAuth(memo = "pla缂栫爜鎵撳嵃")
-// public R matCodePrint(@RequestParam(value = "param[]") String[] param) {
-// if(Cools.isEmpty(param)) {
-// return R.parse(CodeRes.EMPTY);
-// }
-// List<MatPrint> res = new ArrayList<>();
-// for (String matnr : param){
-// Mat mat = matService.selectByMatnr(matnr);
-// // 鎵撳嵃鏁版嵁娉ㄥ叆
-// MatPrint print = new MatPrint();
-// print.setMatnr(mat.getMatnr());
-// print.setBarcode(mat.getBarcode());
-// print.setMaktx(mat.getMaktx());
-// print.setSpecs(mat.getSpecs());
-// print.setUnit(mat.getUnit());
-// print.setMemo(mat.getMemo());
-// res.add(print);
-// }
-// return R.ok().add(res);
-// }
+ // 鎵撳嵃
+ @RequestMapping(value = "/pla/print/auth")
+ @ManagerAuth(memo = "pla缂栫爜鎵撳嵃")
+ public R matCodePrint(@RequestBody List<Pla> plas) {
+ if(Cools.isEmpty(plas)) {
+ return R.parse(CodeRes.EMPTY);
+ }
+ List<Pla> res = new ArrayList<>();
+ for (Pla pla : plas){
+ res.add(pla);
+ }
+ return R.ok().add(res);
+ }
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
--
Gitblit v1.9.1