From ddf48cf807c6ca086e6729d2db3eb251e3be1204 Mon Sep 17 00:00:00 2001 From: xia Date: Sat, 17 Sep 2022 15:48:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../archives/service/impl/ArchivesCaseServiceImpl.java | 5 +++-- .../modules/archives/service/impl/ArrangeServiceImpl.java | 3 +++ .../dictionary/service/impl/ArchivesTypeServiceImpl.java | 1 - 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesCaseServiceImpl.java b/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesCaseServiceImpl.java index 4edbeb4..aa3d183 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesCaseServiceImpl.java +++ b/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesCaseServiceImpl.java @@ -574,7 +574,8 @@ public class ArchivesCaseServiceImpl implements ArchivesCaseService { ArchivesCase archivesCase = caseRepository.findCaseById(dto.getCaseId()); archivesCase.setShelfId(dto.getShelfId()); archivesCase.setFolderLocation(tag.getPosition()); - archivesCase.setFolderLocationDetails(caseRepository.findLocationDetailsByCaseId(dto.getCaseId())); + archivesCase.setFolderLocationDetails(caseRepository.findLocationDetailsBySheId(dto.getShelfId())); + archivesCase.setStorageType(2); cases.add(archivesCase); @@ -593,7 +594,7 @@ public class ArchivesCaseServiceImpl implements ArchivesCaseService { DeviceArchivesTag tag1 = optional1.get(); newShelfId += tag1.getId() + ","; newLocation += tag1.getPosition() + ","; - newLocationName += caseRepository.findLocationDetailsByCaseId(dto1.getCaseId())+","; + newLocationName += caseRepository.findLocationDetailsBySheId(tag1.getId())+","; resultOk++; } } diff --git a/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArrangeServiceImpl.java b/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArrangeServiceImpl.java index c0e868a..99670af 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArrangeServiceImpl.java +++ b/archives/src/main/java/com/storeroom/modules/archives/service/impl/ArrangeServiceImpl.java @@ -1,6 +1,7 @@ package com.storeroom.modules.archives.service.impl; import cn.hutool.json.JSONObject; +import com.storeroom.exception.BaseException; import com.storeroom.modules.archives.domain.ArchivesCheckBill; import com.storeroom.modules.archives.domain.ArchivesCheckBillData; import com.storeroom.modules.archives.domain.ArchivesCheckBillDetails; @@ -108,6 +109,8 @@ public class ArrangeServiceImpl implements ArrangeService { details.setCreateTime(checkDetaills.get(i).getCreateTime()); saveDetaills.add(details); } + if(saveDetaills.size()==0) + throw new BaseException("清单内档案为空"); saveDetaills = archivesCheckBillDetailsRepository.saveAll(saveDetaills); bill.setBorrowed(archivesCheckBillDetailsRepository.findResultCountByOrderId(bill.getId(),4)); bill = archivesCheckBillRepository.saveAndFlush(bill); diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesTypeServiceImpl.java b/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesTypeServiceImpl.java index 752d841..571555e 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesTypeServiceImpl.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesTypeServiceImpl.java @@ -52,7 +52,6 @@ public class ArchivesTypeServiceImpl implements ArchivesTypeService { archivesType.setEnName(tableName); archivesType = archivesTypeRepository.save(archivesType); dynamicTableService.DynamicCreate(archivesType.getIsType(), archivesType.getId(), tableName); - } else { throw new BaseException("门类名称不能重复"); }