合并出库审批时的相同仓库名称

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<Integer> 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<Depository> 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<SimpleTaskP> getUserSimpleTaskP(UserByPort userToken, String userKey, String token) {
         Map<String, Object> paramForTask = new HashMap<>();