From 0005d49a697ce934c6fc2a61ecb75d881b9a76f2 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 11:48:31 +0800
Subject: [PATCH] feat(production): 完善生产订单管理功能

---
 src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java |   56 ++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java
index 0575729..f02118a 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java
@@ -1,42 +1,55 @@
 package com.ruoyi.warehouse.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.utils.poi.ExcelUtil;
 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.DocumentationBorrowManagementMapper;
+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 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.time.LocalDateTime;
 import java.util.List;
 
 @RestController
 @Api(tags = "鏂囨。鍊熼槄绠＄悊")
 @RequestMapping("/documentationBorrowManagement")
+@AllArgsConstructor
 public class DocumentationBorrowManagementController extends BaseController {
-    @Autowired
+
     private DocumentationBorrowManagementService documentationBorrowManagementService;
-    @Autowired
-    private DocumentationBorrowManagementMapper documentationBorrowManagementMapper;
+    private DocumentationReturnManagementMapper documentationReturnManagementMapper;
+
     @GetMapping("/listPage")
     @ApiOperation("鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒嗛〉鏌ヨ")
     @Log(title = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
     public AjaxResult listPage(Page page, DocumentationBorrowManagement documentationBorrowManagement) {
         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("鏂囨。鍊熼槄绠＄悊-鍊熼槄")
@@ -47,14 +60,20 @@
     @PutMapping("/revent")
     @ApiOperation("鏂囨。鍊熼槄绠＄悊-褰掕繕")
     @Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕", businessType = BusinessType.UPDATE)
-    public AjaxResult reventdbm(@RequestBody DocumentationBorrowManagement documentationBorrowManagement) {
-        return AjaxResult.success(documentationBorrowManagementService.reventdbm(documentationBorrowManagement));
+    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) {
         return AjaxResult.success(documentationBorrowManagementService.updateById(documentationBorrowManagement));
+    }
+    @PutMapping("/reventUpdate")
+    @ApiOperation("鏂囨。鍊熼槄绠＄悊-褰掕繕鏇存柊")
+    @Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕鏇存柊", businessType = BusinessType.UPDATE)
+    public AjaxResult reventupdate(@RequestBody DocumentationReturnManagement documentationReturnManagement) {
+        return AjaxResult.success(documentationReturnManagementMapper.updateById(documentationReturnManagement));
     }
     @DeleteMapping ("/delete")
     @ApiOperation("鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒犻櫎")
@@ -79,10 +98,7 @@
     @PostMapping("/exportrevent")
     @ApiOperation("鏂囨。鍊熼槄绠＄悊-褰掕繕瀵煎嚭")
     @Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕瀵煎嚭", businessType = BusinessType.EXPORT)
-    public void exportrevent(HttpServletResponse response,DocumentationBorrowManagement documentationBorrowManagement) {
-        documentationBorrowManagementService.exportrevent(response,documentationBorrowManagement);
-//        List<DocumentationBorrowManagement> documentationBorrowManagements = documentationBorrowManagementMapper.selectList(new LambdaQueryWrapper<DocumentationBorrowManagement>().eq(DocumentationBorrowManagement::getBorrowStatus, "褰掕繕"));
-//        ExcelUtil<DocumentationBorrowManagement> util = new ExcelUtil<>(DocumentationBorrowManagement.class);
-//        util.exportExcel(response, documentationBorrowManagements, "鏂囨。鍊熼槄-褰掕繕璁板綍");
+    public void exportrevent(HttpServletResponse response, DocumentationReturnManagement documentationReturnManagement) {
+        documentationBorrowManagementService.exportrevent(response,documentationReturnManagement);
     }
 }

--
Gitblit v1.9.3