From ee625339d9ecbebf72940a6544fead56a3eb72c2 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Fri, 19 May 2023 08:22:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=87=BA=E5=BA=93=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E6=97=B6=E7=9A=84=E7=9B=B8=E5=90=8C=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PageController.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index 7db1258c..c9edb199 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -1949,12 +1949,16 @@ public class PageController { double sumPrice = 0.0; // 计量单位 StringBuilder sumUnit = new StringBuilder(); + List depositoryIdList = new ArrayList<>(); for (ApplicationOutRecordMinP applicationOutRecordMin : applicationOutRecordMinByParent) { // 获取子订单信息 // 获取出库物料信息 Inventory inventoryById = materialService.findInventoryById(applicationOutRecordMin.getMid()); // 获取出库物料仓库信息 - Depository depository = depositoryService.findDepositoryById(applicationOutRecordMin.getDepositoryId()); + Integer depositoryId = applicationOutRecordMin.getDepositoryId(); + if(!depositoryIdList.contains(depositoryId)){ + depositoryIdList.add(depositoryId); + } // 获取出库库位 Place placeById = placeService.findPlaceById(applicationOutRecordMin.getPlaceId()); if (placeById != null) { @@ -1965,7 +1969,6 @@ public class PageController { } } applicationOutRecordMin.setMname(inventoryById.getMname()); - depositoryName.append(depository.getDname()).append(","); sumQuantity += applicationOutRecordMin.getQuantity(); String unit = applicationOutRecordMin.getUnit(); @@ -2024,6 +2027,11 @@ public class PageController { depositoryManager.add(user); depositoryManagerNames.append(user.getName()).append(","); } + List depositoryByIds = depositoryService.findDepositoryByIds(depositoryIdList); + for (Depository depository:depositoryByIds + ) { + depositoryName.append(depository.getDname()).append(","); + } recordP.setPCode(placeCode.toString()); recordP.setApplicantTime(DateUtil.TimeStampToDateTime(Long.valueOf(recordP.getApplicantTime()))); recordP.setDepartmentheadTime(DateUtil.TimeStampToDateTime(Long.valueOf(recordP.getDepartmentheadTime()))); @@ -3611,7 +3619,7 @@ public class PageController { * 用于获取当前用户的任务列表 * * @param userToken 当前用户 - * @return + * @returnapplication_review */ public List getUserSimpleTaskP(UserByPort userToken, String userKey, String token) { Map paramForTask = new HashMap<>();