From 47768d890fbfc1a5f3e93ca26137847361415e9e Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期二, 28 十月 2025 10:54:16 +0800
Subject: [PATCH] Merge branch 'master' into pim_meet

---
 src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java |   77 ++++++++++++++++++++++++++++++--------
 1 files changed, 60 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java
index 24d20dd..fdf07fd 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java
@@ -10,7 +10,9 @@
 import com.ruoyi.framework.web.domain.AjaxResult;
 
 import com.ruoyi.warehouse.mapper.DocumentationBorrowManagementMapper;
+import com.ruoyi.warehouse.mapper.DocumentationReturnManagementMapper;
 import com.ruoyi.warehouse.pojo.DocumentationBorrowManagement;
+import com.ruoyi.warehouse.pojo.DocumentationReturnManagement;
 import com.ruoyi.warehouse.pojo.Warehouse;
 import com.ruoyi.warehouse.service.DocumentationBorrowManagementService;
 import com.ruoyi.warehouse.service.WarehouseService;
@@ -21,6 +23,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @RestController
@@ -31,40 +34,80 @@
     private DocumentationBorrowManagementService documentationBorrowManagementService;
     @Autowired
     private DocumentationBorrowManagementMapper documentationBorrowManagementMapper;
+    @Autowired
+    private DocumentationReturnManagementMapper documentationReturnManagementMapper;
     @GetMapping("/listPage")
-    @ApiOperation("鏂囨。鍊熼槄绠＄悊-鍒嗛〉鏌ヨ")
-    @Log(title = "鏂囨。鍊熼槄绠＄悊-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
+    @ApiOperation("鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒嗛〉鏌ヨ")
+    @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")
+    @ApiOperation("鏂囨。鍊熼槄绠＄悊-鍊熼槄鏌ヨ")
+    @Log(title = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鏌ヨ", businessType = BusinessType.OTHER)
+    public AjaxResult list() {
+        return AjaxResult.success(documentationBorrowManagementService.listAll());
+    }
+    @GetMapping("/listPageReturn")
+    @ApiOperation("鏂囨。鍊熼槄绠＄悊-褰掕繕鍒嗛〉鏌ヨ")
+    @Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
+    public AjaxResult listPageReturn(Page page, DocumentationReturnManagement documentationReturnManagement) {
+        return AjaxResult.success(documentationReturnManagementMapper.listPage(page, documentationReturnManagement));
+    }
+    @GetMapping("/getByDocumentationId/{id}")
+    @ApiOperation("鏍规嵁涔︾睄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)
+    @ApiOperation("鏂囨。鍊熼槄绠＄悊-鍊熼槄")
+    @Log(title = "鏂囨。鍊熼槄绠＄悊-鍊熼槄", businessType = BusinessType.INSERT)
     public AjaxResult add(@RequestBody DocumentationBorrowManagement documentationBorrowManagement) {
         return AjaxResult.success(documentationBorrowManagementService.add(documentationBorrowManagement));
     }
-    @PostMapping("/update")
+    @PutMapping("/revent")
+    @ApiOperation("鏂囨。鍊熼槄绠＄悊-褰掕繕")
+    @Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕", businessType = BusinessType.UPDATE)
+    public AjaxResult revent(@RequestBody DocumentationReturnManagement documentationReturnManagement) {
+        return AjaxResult.success(documentationBorrowManagementService.reventdbm(documentationReturnManagement));
+    }
+    @PutMapping("/update")
     @ApiOperation("鏂囨。鍊熼槄绠＄悊-鏇存柊")
     @Log(title = "鏂囨。鍊熼槄绠＄悊-鏇存柊", businessType = BusinessType.UPDATE)
     public AjaxResult update(@RequestBody DocumentationBorrowManagement documentationBorrowManagement) {
-//        documentationBorrowManagementService.updateById(documentationBorrowManagement);
         return AjaxResult.success(documentationBorrowManagementService.updateById(documentationBorrowManagement));
     }
-    @PostMapping("/delete")
-    @ApiOperation("鏂囨。鍊熼槄绠＄悊-鍒犻櫎")
-    @Log(title = "鏂囨。鍊熼槄绠＄悊-鍒犻櫎", businessType = BusinessType.DELETE)
+    @PutMapping("/reventUpdate")
+    @ApiOperation("鏂囨。鍊熼槄绠＄悊-褰掕繕鏇存柊")
+    @Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕鏇存柊", businessType = BusinessType.UPDATE)
+    public AjaxResult reventupdate(@RequestBody DocumentationReturnManagement documentationReturnManagement) {
+        return AjaxResult.success(documentationReturnManagementMapper.updateById(documentationReturnManagement));
+    }
+    @DeleteMapping ("/delete")
+    @ApiOperation("鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒犻櫎")
+    @Log(title = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒犻櫎", businessType = BusinessType.DELETE)
     public AjaxResult delete(@RequestBody List<Long> ids) {
         if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
         return AjaxResult.success(documentationBorrowManagementService.deleteByIds(ids));
     }
+    @DeleteMapping ("/reventDelete")
+    @ApiOperation("鏂囨。鍊熼槄绠＄悊-褰掕繕鍒犻櫎")
+    @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)
+    @ApiOperation("鏂囨。鍊熼槄绠＄悊-鍊熼槄瀵煎嚭")
+    @Log(title = "鏂囨。鍊熼槄绠＄悊-鍊熼槄瀵煎嚭", businessType = BusinessType.EXPORT)
     public void export(HttpServletResponse response,DocumentationBorrowManagement documentationBorrowManagement) {
-        String borrowStatus = documentationBorrowManagement.getBorrowStatus();
-        List<DocumentationBorrowManagement> documentationBorrowManagements = documentationBorrowManagementMapper.selectList(new LambdaQueryWrapper<DocumentationBorrowManagement>().eq(DocumentationBorrowManagement::getBorrowStatus, borrowStatus));
-        ExcelUtil<DocumentationBorrowManagement> util = new ExcelUtil<>(DocumentationBorrowManagement.class);
-        util.exportExcel(response, documentationBorrowManagements, "鏂囨。鍊熼槄-褰掕繕璁板綍");
+        documentationBorrowManagementService.export(response,documentationBorrowManagement);
+    }
+    @PostMapping("/exportrevent")
+    @ApiOperation("鏂囨。鍊熼槄绠＄悊-褰掕繕瀵煎嚭")
+    @Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕瀵煎嚭", businessType = BusinessType.EXPORT)
+    public void exportrevent(HttpServletResponse response, DocumentationReturnManagement documentationReturnManagement) {
+        documentationBorrowManagementService.exportrevent(response,documentationReturnManagement);
     }
 }

--
Gitblit v1.9.3