From b1327a853810a229ea491d6327347a31dbf9353d Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期六, 22 八月 2020 15:34:57 +0800 Subject: [PATCH] # --- src/main/webapp/views/pakStore/stockOut.html | 2 +- src/main/webapp/views/pda/stockOut.html | 2 +- src/main/java/com/zy/asrs/controller/WorkController.java | 22 +++++++++++++++++++++- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java index 70f9050..6627272 100644 --- a/src/main/java/com/zy/asrs/controller/WorkController.java +++ b/src/main/java/com/zy/asrs/controller/WorkController.java @@ -15,6 +15,11 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * 宸ヤ綔娴佹帴鍙f帶鍒跺櫒 * Created by vincent on 2020/6/10 @@ -42,7 +47,22 @@ @RequestMapping("/available/take/site") @ManagerAuth(memo = "鑾峰彇鍑哄簱绔欑偣") public R availableTakeSite(){ - return R.ok().add(basDevpService.getAvailableOutSite(101)); + List<Map<String, Object>> result = new ArrayList<>(); + List<Integer> outSite = basDevpService.getAvailableOutSite(101); + for (Integer siteId : outSite) { + Map<String, Object> map = new HashMap<>(); + map.put("siteId", siteId); + map.put("desc", siteId + "锛堝叏鏉垮嚭搴撳彛锛�"); + result.add(map); + } + List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103); + for (Integer siteId : pickOutSite) { + Map<String, Object> map = new HashMap<>(); + map.put("siteId", siteId); + map.put("desc", siteId + "锛堟嫞鏂欏嚭搴撳彛锛�"); + result.add(map); + } + return R.ok().add(result); } @RequestMapping("/available/take/check/site") diff --git a/src/main/webapp/views/pakStore/stockOut.html b/src/main/webapp/views/pakStore/stockOut.html index d2873f4..da6cb79 100644 --- a/src/main/webapp/views/pakStore/stockOut.html +++ b/src/main/webapp/views/pakStore/stockOut.html @@ -121,7 +121,7 @@ <script type="text/template" id="takeSiteSelectTemplate"> {{#each data}} - <option value="{{this}}">{{this}}</option> + <option value="{{siteId}}">{{desc}}</option> {{/each}} </script> </body> diff --git a/src/main/webapp/views/pda/stockOut.html b/src/main/webapp/views/pda/stockOut.html index 0882979..87a39e0 100644 --- a/src/main/webapp/views/pda/stockOut.html +++ b/src/main/webapp/views/pda/stockOut.html @@ -282,7 +282,7 @@ </script> <script type="text/template" id="takeSiteSelectTemplate"> {{#each data}} - <option value="{{this}}">{{this}}</option> + <option value="{{siteId}}">{{desc}}</option> {{/each}} </script> </html> \ No newline at end of file -- Gitblit v1.9.1