From 9d5128803ebebb5788f13924a5775ac16494dfef Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 18 八月 2025 10:05:05 +0800
Subject: [PATCH] 仓库，树，文档，借出修改
---
src/main/java/com/ruoyi/warehouse/service/impl/DocumentationBorrowManagementServiceImpl.java | 125 ++++++++++++++++++++++-------------------
1 files changed, 68 insertions(+), 57 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationBorrowManagementServiceImpl.java b/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationBorrowManagementServiceImpl.java
index 176060c..05a075e 100644
--- a/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationBorrowManagementServiceImpl.java
+++ b/src/main/java/com/ruoyi/warehouse/service/impl/DocumentationBorrowManagementServiceImpl.java
@@ -6,7 +6,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto;
+import com.ruoyi.warehouse.dto.DocumentationBorrowManagementDto;
+import com.ruoyi.warehouse.dto.ReturnExportDto;
import com.ruoyi.warehouse.pojo.Documentation;
import com.ruoyi.warehouse.pojo.DocumentationBorrowManagement;
import com.ruoyi.warehouse.service.DocumentationBorrowManagementService;
@@ -17,6 +18,7 @@
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
import java.util.List;
import java.util.stream.Collectors;
@@ -42,68 +44,75 @@
@Override
public boolean add(DocumentationBorrowManagement documentationBorrowManagement) {
- Long documentationId = documentationBorrowManagement.getDocumentationId();
- String borrowStatus = documentationBorrowManagement.getBorrowStatus();
- Documentation documentation = documentationService.getById(documentationId);
- if (documentation==null){
- System.out.println("鏂囨。涓嶅瓨鍦�");
- return false;
- }
- if ("鍊熷嚭".equals(documentation.getDocStatus())){
- if ("褰掕繕".equals(borrowStatus)){
- documentation.setDocStatus("姝ｅ父");
- documentationService.updateById(documentation);
- documentationBorrowManagementMapper.insert(documentationBorrowManagement);
- return true;
- }else{
- System.out.println("鏂囨。宸插�熷嚭锛屼笉鑳介噸澶嶅�熷嚭");
- return false;
- }
- }else if("姝ｅ父".equals(documentation.getDocStatus())){
- if ("褰掕繕".equals(borrowStatus)){
- System.out.println("鏂囨。宸插綊杩橈紝涓嶈兘閲嶅褰掕繕");
- return false;
- }else if("鍊熷嚭".equals(borrowStatus)){
- documentation.setDocStatus("鍊熷嚭");
- documentationService.updateById(documentation);
- documentationBorrowManagementMapper.insert(documentationBorrowManagement);
- return true;
- }
- }else{
- System.out.println("鏂囨。鐘舵�佸紓甯�");
- return false;
- }
- return false;
+ documentationBorrowManagementMapper.insert(documentationBorrowManagement);
+ Documentation documentation = documentationService.getById(documentationBorrowManagement.getDocumentationId());
+ documentation.setDocStatus("鍊熷嚭");
+ documentationService.updateById(documentation);
+ return true;
}
-// @Override
-// public boolean updateDBMById(DocumentationBorrowManagement documentationBorrowManagement) {
-// Long id = documentationBorrowManagement.getId();
-//// Long documentationId = documentationBorrowManagement.getDocumentationId();
-// //鏌ヨ鏂囨。鏄惁宸插綊杩�
-// DocumentationBorrowManagement dbm = documentationBorrowManagementMapper.selectById(id);
-//// Long documentationId = dbm.getDocumentationId();
-// if ("褰掕繕".equals(dbm.getBorrowStatus())){
-// System.out.println("鏂囨。宸插綊杩橈紝涓嶈兘鏇存柊");
-// return false;
-// }
-// //鏌ヨ鏂囨。
-// Documentation documentation = documentationService.getById(dbm.getDocumentationId());
-// String docStatus = documentation.getDocStatus();
-// if ("姝ｅ父".equals(docStatus)){
-// System.out.println("鏂囨。宸插綊杩橈紝涓嶈兘鏇存柊");
-// return false;
-// }
-// return false;
-// }
+ @Override
+ public boolean reventdbm(DocumentationBorrowManagement documentationBorrowManagement) {
+ DocumentationBorrowManagement documentationBorrowManagement1 = new DocumentationBorrowManagement();
+ // 鏇存柊鍊熼槄璁板綍鐘舵�佷负褰掕繕
+ documentationBorrowManagement1.setBorrowStatus("褰掕繕");
+ documentationBorrowManagement1.setReturnDate(LocalDateTime.now());
+ documentationBorrowManagementMapper.updateById(documentationBorrowManagement1);
+ documentationBorrowManagementMapper.update(documentationBorrowManagement1,new LambdaQueryWrapper<DocumentationBorrowManagement>().eq(DocumentationBorrowManagement::getId,documentationBorrowManagement.getId()));
+
+ // 鏇存柊鏂囨。鐘舵�佷负姝ｅ父
+ Documentation documentation = documentationService.getById(documentationBorrowManagement.getDocumentationId());
+ documentation.setDocStatus("姝ｅ父");
+ documentationService.updateById(documentation);
+ return true;
+ }
+
+ @Override
+ public boolean reventDeleteByIds(List<Long> ids) {
+ QueryWrapper<DocumentationBorrowManagement> queryWrapper = new QueryWrapper<>();
+ queryWrapper.in("id", ids);
+ queryWrapper.eq("borrow_status", "褰掕繕");
+ List<DocumentationBorrowManagement> list = documentationBorrowManagementMapper.selectList(queryWrapper);
+ for (DocumentationBorrowManagement documentationBorrowManagement : list) {
+ try {
+ documentationBorrowManagement.setBorrowStatus("鍊熼槄");
+ documentationBorrowManagement.setReturnDate(null);
+ documentationBorrowManagementMapper.updateById(documentationBorrowManagement);
+
+ Documentation documentation = documentationService.getById(documentationBorrowManagement.getDocumentationId());
+ if (documentation != null) {
+ documentation.setDocStatus("鍊熷嚭");
+ documentationService.updateById(documentation);
+ }
+ } catch (Exception e) {
+ throw new RuntimeException("鏇存柊鍊熼槄璁板綍鍜屾枃妗ｇ姸鎬佹椂鍑洪敊", e);
+ }
+ }
+ return true;
+ }
+
+ @Override
+ public void export(HttpServletResponse response, DocumentationBorrowManagement documentationBorrowManagement) {
+ List<DocumentationBorrowManagementDto> documentationBorrowManagements = documentationBorrowManagementMapper.export(documentationBorrowManagement);
+ ExcelUtil<DocumentationBorrowManagementDto> util = new ExcelUtil<>(DocumentationBorrowManagementDto.class);
+ util.exportExcel(response, documentationBorrowManagements, "鏂囨。鍊熼槄-鍊熼槄璁板綍");
+ }
+
+ @Override
+ public void exportrevent(HttpServletResponse response, DocumentationBorrowManagement documentationBorrowManagement) {
+ List<ReturnExportDto> documentationBorrowManagements = documentationBorrowManagementMapper.exportrevent(documentationBorrowManagement);
+ ExcelUtil<ReturnExportDto> util = new ExcelUtil<>(ReturnExportDto.class);
+ util.exportExcel(response, documentationBorrowManagements, "鏂囨。鍊熼槄-褰掕繕璁板綍");
+ }
@Override
public boolean deleteByIds(List<Long> ids) {
List<DocumentationBorrowManagement> list = documentationBorrowManagementMapper.selectList(new LambdaQueryWrapper<DocumentationBorrowManagement>().in(DocumentationBorrowManagement::getId, ids));
for (DocumentationBorrowManagement documentationBorrowManagement : list) {
- String borrowStatus = documentationBorrowManagement.getBorrowStatus();
- if ("鍊熼槄".equals(borrowStatus)){
- System.out.println("鏂囨。宸插�熷嚭锛屼笉鑳藉垹闄�");
- return false;
+ Documentation documentation = documentationService.getById(documentationBorrowManagement.getDocumentationId());
+ documentation.setDocStatus("姝ｅ父");
+ boolean b = documentationService.updateById(documentation);
+ if (!b){
+ throw new RuntimeException("鏇存柊鏂囨。鐘舵�佸け璐�");
}
}
documentationBorrowManagementMapper.deleteBatchIds(ids);
@@ -111,6 +120,8 @@
}
+
+
}
--
Gitblit v1.9.3