From 384a05c7bbd003f2485e374fd7c5b1189257ef0b Mon Sep 17 00:00:00 2001 From: ytfl <ytfl@qq.com> Date: 星期二, 15 七月 2025 09:56:21 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/OutController.java | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java index 7ea79d4..1a0c62f 100644 --- a/src/main/java/com/zy/asrs/controller/OutController.java +++ b/src/main/java/com/zy/asrs/controller/OutController.java @@ -197,7 +197,46 @@ locDtos.add(locDto); } } + + // 閲嶆柊璁$畻鍑哄簱绔欑偣锛屽彲鑳藉瓨鍦ㄤ竴涓墭鐩樺鏉℃槑缁嗭紝澶氭潯鏄庣粏缁熻涓嬫潵鍙叏鏉垮嚭搴擄紝浣嗗疄闄呯粰鍑虹殑绔欑偣鍙兘鎷i�夊嚭搴� + HashMap<String, Double> locAnfmeMap = new HashMap<>(); + for (LocDto locDto : locDtos) { + if(locAnfmeMap.containsKey(locDto.getLocNo())) { + Double anfme = locAnfmeMap.get(locDto.getLocNo()); + BigDecimal decimal = BigDecimal.valueOf(locDto.getAnfme()).add(BigDecimal.valueOf(anfme)); + locAnfmeMap.put(locDto.getLocNo(), decimal.doubleValue()); + }else { + locAnfmeMap.put(locDto.getLocNo(), locDto.getAnfme()); + } + } + + HashMap<String, List<Integer>> locStaNosMap = new HashMap<>(); + for (Map.Entry<String, Double> entry : locAnfmeMap.entrySet()) { + String locNo = entry.getKey(); + Double realAnfme = entry.getValue(); + + double stockAnfme = 0D; + List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo)); + for (LocDetl locDetl : locDetls) { + BigDecimal decimal = BigDecimal.valueOf(stockAnfme).add(BigDecimal.valueOf(locDetl.getAnfme())); + stockAnfme = decimal.doubleValue(); + } + + int ioType = 103; + if(stockAnfme == realAnfme) { + ioType = 101; + } + + List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locNo, ioType); + locStaNosMap.put(locNo, staNos); + } + + for (LocDto locDto : locDtos) { + List<Integer> staNos = locStaNosMap.get(locDto.getLocNo()); + locDto.setStaNos(staNos); + } } + return R.ok().add(locDtos); } -- Gitblit v1.9.1