Browse Source

修改bug

master
xia 3 years ago
parent
commit
ddf48cf807
  1. 5
      archives/src/main/java/com/storeroom/modules/archives/service/impl/ArchivesCaseServiceImpl.java
  2. 3
      archives/src/main/java/com/storeroom/modules/archives/service/impl/ArrangeServiceImpl.java
  3. 1
      archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesTypeServiceImpl.java

5
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++;
}
}

3
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);

1
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("门类名称不能重复");
}

Loading…
Cancel
Save