From a7dd93b840bdce4bd0011bc948157f440514a207 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 28 四月 2026 16:36:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java | 103 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 72 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java
index 652794f..2a1c966 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java
@@ -1,63 +1,104 @@
package com.ruoyi.warehouse.controller;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
-
+import com.ruoyi.warehouse.mapper.DocumentationReturnManagementMapper;
import com.ruoyi.warehouse.pojo.DocumentationBorrowManagement;
-import com.ruoyi.warehouse.pojo.Warehouse;
+import com.ruoyi.warehouse.pojo.DocumentationReturnManagement;
import com.ruoyi.warehouse.service.DocumentationBorrowManagementService;
-import com.ruoyi.warehouse.service.WarehouseService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
import java.util.List;
@RestController
-@Api(tags = "鏂囨。鍊熼槄绠＄悊")
+@Tag(name = "鏂囨。鍊熼槄绠＄悊")
@RequestMapping("/documentationBorrowManagement")
+@AllArgsConstructor
public class DocumentationBorrowManagementController extends BaseController {
- @Autowired
+
private DocumentationBorrowManagementService documentationBorrowManagementService;
+ private DocumentationReturnManagementMapper documentationReturnManagementMapper;
+
@GetMapping("/listPage")
- @ApiOperation("鏂囨。鍊熼槄绠＄悊-鍒嗛〉鏌ヨ")
- @Log(title = "鏂囨。鍊熼槄绠＄悊-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
+ @Operation(summary = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒嗛〉鏌ヨ")
+ @Log(title = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
public AjaxResult listPage(Page page, DocumentationBorrowManagement documentationBorrowManagement) {
- IPage<DocumentationBorrowManagement> listPage = documentationBorrowManagementService.listPage(page, documentationBorrowManagement);
- return AjaxResult.success(listPage);
+ return AjaxResult.success(documentationBorrowManagementService.listPage(page, documentationBorrowManagement));
+ }
+ @GetMapping("/list")
+ @Operation(summary = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鏌ヨ")
+ @Log(title = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鏌ヨ", businessType = BusinessType.OTHER)
+ public AjaxResult list() {
+ return AjaxResult.success(documentationBorrowManagementService.listAll());
+ }
+ @GetMapping("/listPageReturn")
+ @Operation(summary = "鏂囨。鍊熼槄绠＄悊-褰掕繕鍒嗛〉鏌ヨ")
+ @Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
+ public AjaxResult listPageReturn(Page page, DocumentationReturnManagement documentationReturnManagement) {
+ return AjaxResult.success(documentationReturnManagementMapper.listPage(page, documentationReturnManagement));
+ }
+ @GetMapping("/getByDocumentationId/{id}")
+ @Operation(summary = "鏍规嵁涔︾睄id鏌ヨ鍊熼槄璁板綍")
+ @Log(title = "鏍规嵁涔︾睄id鏌ヨ鍊熼槄璁板綍", businessType = BusinessType.OTHER)
+ public AjaxResult getByDocumentationId(@PathVariable Long id) {
+ return AjaxResult.success(documentationBorrowManagementService.selectByDocumentationId(id));
}
@PostMapping("/add")
- @ApiOperation("鏂囨。鍊熼槄绠＄悊-娣诲姞")
- @Log(title = "鏂囨。鍊熼槄绠＄悊-娣诲姞", businessType = BusinessType.INSERT)
+ @Operation(summary = "鏂囨。鍊熼槄绠＄悊-鍊熼槄")
+ @Log(title = "鏂囨。鍊熼槄绠＄悊-鍊熼槄", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody DocumentationBorrowManagement documentationBorrowManagement) {
- documentationBorrowManagementService.save(documentationBorrowManagement);
- return AjaxResult.success();
+ return AjaxResult.success(documentationBorrowManagementService.add(documentationBorrowManagement));
}
- @PostMapping("/update")
- @ApiOperation("鏂囨。鍊熼槄绠＄悊-鏇存柊")
+ @PutMapping("/revent")
+ @Operation(summary = "鏂囨。鍊熼槄绠＄悊-褰掕繕")
+ @Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕", businessType = BusinessType.UPDATE)
+ public AjaxResult revent(@RequestBody DocumentationReturnManagement documentationReturnManagement) {
+ return AjaxResult.success(documentationBorrowManagementService.reventdbm(documentationReturnManagement));
+ }
+ @PutMapping("/update")
+ @Operation(summary = "鏂囨。鍊熼槄绠＄悊-鏇存柊")
@Log(title = "鏂囨。鍊熼槄绠＄悊-鏇存柊", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody DocumentationBorrowManagement documentationBorrowManagement) {
- documentationBorrowManagementService.updateById(documentationBorrowManagement);
- return AjaxResult.success();
+ return AjaxResult.success(documentationBorrowManagementService.updateById(documentationBorrowManagement));
}
- @PostMapping("/delete")
- @ApiOperation("鏂囨。鍊熼槄绠＄悊-鍒犻櫎")
- @Log(title = "鏂囨。鍊熼槄绠＄悊-鍒犻櫎", businessType = BusinessType.DELETE)
+ @PutMapping("/reventUpdate")
+ @Operation(summary = "鏂囨。鍊熼槄绠＄悊-褰掕繕鏇存柊")
+ @Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕鏇存柊", businessType = BusinessType.UPDATE)
+ public AjaxResult reventupdate(@RequestBody DocumentationReturnManagement documentationReturnManagement) {
+ return AjaxResult.success(documentationReturnManagementMapper.updateById(documentationReturnManagement));
+ }
+ @DeleteMapping ("/delete")
+ @Operation(summary = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒犻櫎")
+ @Log(title = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
- documentationBorrowManagementService.removeByIds(ids);
- return AjaxResult.success();
+ if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.success(documentationBorrowManagementService.deleteByIds(ids));
+ }
+ @DeleteMapping ("/reventDelete")
+ @Operation(summary = "鏂囨。鍊熼槄绠＄悊-褰掕繕鍒犻櫎")
+ @Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕鍒犻櫎", businessType = BusinessType.DELETE)
+ public AjaxResult reventdelete(@RequestBody List<Long> ids) {
+ if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.success(documentationBorrowManagementService.reventDeleteByIds(ids));
}
@PostMapping("/export")
- @ApiOperation("鏂囨。淇℃伅琛�-瀵煎嚭")
- @Log(title = "鏂囨。淇℃伅琛�-瀵煎嚭", businessType = BusinessType.EXPORT)
- public void export(HttpServletResponse response) {
- documentationBorrowManagementService.export(response);
+ @Operation(summary = "鏂囨。鍊熼槄绠＄悊-鍊熼槄瀵煎嚭")
+ @Log(title = "鏂囨。鍊熼槄绠＄悊-鍊熼槄瀵煎嚭", businessType = BusinessType.EXPORT)
+ public void export(HttpServletResponse response,DocumentationBorrowManagement documentationBorrowManagement) {
+ documentationBorrowManagementService.export(response,documentationBorrowManagement);
+ }
+ @PostMapping("/exportrevent")
+ @Operation(summary = "鏂囨。鍊熼槄绠＄悊-褰掕繕瀵煎嚭")
+ @Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕瀵煎嚭", businessType = BusinessType.EXPORT)
+ public void exportrevent(HttpServletResponse response, DocumentationReturnManagement documentationReturnManagement) {
+ documentationBorrowManagementService.exportrevent(response,documentationReturnManagement);
}
}
--
Gitblit v1.9.3