From 450f6c49d3591c2e152e9ee81acab9acc830d7fe Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期二, 02 三月 2021 15:48:34 +0800 Subject: [PATCH] # --- src/main/java/zy/cloud/wms/manager/controller/MatController.java | 4 ++-- 1 files changed, 2 insertions(+), 2 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 ea13d5f..c6f0655 100644 --- a/src/main/java/zy/cloud/wms/manager/controller/MatController.java +++ b/src/main/java/zy/cloud/wms/manager/controller/MatController.java @@ -116,13 +116,13 @@ @ManagerAuth public R query(String condition) { EntityWrapper<Mat> wrapper = new EntityWrapper<>(); - wrapper.like("id", condition); + wrapper.like("matnr", condition).or().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.getId()); - map.put("value", mat.getId()); + map.put("value", mat.getMatnr() + "(" + mat.getMaktx() + ")"); result.add(map); } return R.ok(result); -- Gitblit v1.9.1