From d382ffad92c48f6a96bb7d5e1fd733b90c9ca137 Mon Sep 17 00:00:00 2001 From: LSH Date: 星期六, 03 六月 2023 09:50:38 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/MapController.java | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/MapController.java b/src/main/java/com/zy/asrs/controller/MapController.java index d51dd3e..26e9f08 100644 --- a/src/main/java/com/zy/asrs/controller/MapController.java +++ b/src/main/java/com/zy/asrs/controller/MapController.java @@ -117,7 +117,7 @@ @RequestParam("matnr") String matnr, @RequestParam("maktx") String maktx ) { - List<LocDetl> locDetls = locDetlService.searchByLike(orderNo, matnr, maktx, specs, locNo); + List<LocDetl> locDetls = locDetlService.searchByLike(orderNo, matnr, maktx, specs, ""); ArrayList<LocDetl> lists = new ArrayList<>(); for (LocDetl locDetl : locDetls) {//杩囨护鎺変笉鏄綋鍓嶆ゼ灞傜殑鏁版嵁 int lev1 = Utils.getLev(locDetl.getLocNo()); @@ -125,6 +125,14 @@ lists.add(locDetl); } } + + //鎼滅储鎸囧畾搴撲綅鍙凤紝鍗充娇搴撲綅涓虹┖锛屼篃鍙互杩斿洖鏁版嵁 + LocMast locMast = locMastService.selectById(locNo); + if (locMast != null) { + LocDetl locDetl = new LocDetl(); + locDetl.setLocNo(locMast.getLocNo()); + lists.add(locDetl); + } return R.ok().add(lists); } -- Gitblit v1.9.1