From 815a94a56d6c0fe940349de1bcf1a61850d0eddc Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期四, 26 十二月 2024 13:49:27 +0800 Subject: [PATCH] #空板出库口替换 --- src/main/webapp/views/pakStore/emptyOut.html | 2 +- src/main/java/com/zy/asrs/controller/WorkController.java | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java index a51f4b5..7231322 100644 --- a/src/main/java/com/zy/asrs/controller/WorkController.java +++ b/src/main/java/com/zy/asrs/controller/WorkController.java @@ -167,13 +167,19 @@ @RequestMapping("/available/empty/take/site") @ManagerAuth() public R availableEmptyTakeSite(){ + List<Map<String, Object>> result = new ArrayList<>(); EntityWrapper<StaDesc> wrapper = new EntityWrapper<>(); wrapper.eq("type_no",110); // 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭� - RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper); +// RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper); List<StaDesc> staDescs = staDescService.selectList(wrapper); - List<Integer> collect = staDescs.stream().map(StaDesc::getStnNo).distinct().collect(Collectors.toList()); - return R.ok().add(collect); + for (StaDesc staDesc : staDescs) { + Map<String, Object> map = new HashMap<>(); + map.put("siteId", staDesc.getStnNo()); + map.put("desc","["+ Utils.getStaName(staDesc.getStnNo())+"]"); + result.add(map); + } + return R.ok().add(result); // return R.ok().add(basDevpService.getAvailableEmptyOutSite()); } diff --git a/src/main/webapp/views/pakStore/emptyOut.html b/src/main/webapp/views/pakStore/emptyOut.html index 234d821..21a8e72 100644 --- a/src/main/webapp/views/pakStore/emptyOut.html +++ b/src/main/webapp/views/pakStore/emptyOut.html @@ -138,7 +138,7 @@ <script type="text/template" id="takeSiteSelectTemplate"> {{#each data}} - <option value="{{this}}">{{this}}</option> + <option value="{{siteId}}">{{desc}}</option> {{/each}} </script> </body> -- Gitblit v1.9.1