From f5c89a9b01b0cae70a7e0ccd878fb75121743929 Mon Sep 17 00:00:00 2001
From: zzgtfwq <zzgtfwq>
Date: 星期三, 10 十二月 2025 13:18:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatController.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 533c8a4..90cc015 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -58,16 +58,23 @@
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.like("matnr", condition).or().like("specs", condition);
+// }
+// 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.like("matnr", condition).or().like("specs", condition);
- }
- wrapper.orderBy("create_time", false);
- List<Mat> mats = matService.selectList(wrapper);
+ List<Mat> mats = matService.selectByMatnrLink10(condition);
return R.ok().add(mats);
}
@@ -276,6 +283,8 @@
print.setBarcode(mat.getBarcode());
print.setMaktx(mat.getMaktx());
print.setSpecs(mat.getSpecs());
+ print.setSupp(mat.getSupp());
+ print.setSku(mat.getSku());
print.setUnit(mat.getUnit());
print.setMemo(mat.getMemo());
res.add(print);
--
Gitblit v1.9.1