From 7486f6d6a93d98f96f45f0cc4846be9c8a2345df Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 09 六月 2026 15:39:20 +0800
Subject: [PATCH] 增加废品库详情接口

---
 src/main/java/com/ruoyi/stock/controller/StockUninventoryController.java |   46 ++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ruoyi/stock/controller/StockUninventoryController.java b/src/main/java/com/ruoyi/stock/controller/StockUninventoryController.java
index 477a68d..76a90ba 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockUninventoryController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockUninventoryController.java
@@ -2,8 +2,8 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.enums.StockInUnQualifiedRecordTypeEnum;
-import com.ruoyi.common.enums.StockOutUnQualifiedRecordTypeEnum;
+import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
+import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
 import com.ruoyi.framework.web.domain.R;
 import com.ruoyi.stock.dto.StockInventoryDto;
 import com.ruoyi.stock.dto.StockUninventoryDto;
@@ -30,15 +30,33 @@
     @GetMapping("/pagestockUninventory")
     @Operation(summary = "鍒嗛〉鏌ヨ搴撳瓨")
     public R pagestockUninventory(Page page, StockUninventoryDto stockUninventoryDto) {
+        stockUninventoryDto.setType("unqualified");
         IPage<StockUninventoryDto> stockUninventoryDtoIPage = stockUninventoryService.pageStockUninventory(page, stockUninventoryDto);
+        return R.ok(stockUninventoryDtoIPage);
+    }
+
+    @GetMapping("/pageWasteQuery")
+    @Operation(summary = "搴熷搧鏌ヨ椤甸潰鍒嗛〉鏌ヨ")
+    public R pageWasteQuery(Page page, StockUninventoryDto stockUninventoryDto) {
+        IPage<StockUninventoryDto> stockUninventoryDtoIPage = stockUninventoryService.pageWasteQuery(page, stockUninventoryDto);
+        return R.ok(stockUninventoryDtoIPage);
+    }
+
+    @GetMapping("/getWasteBatchNoQty")
+    @Operation(summary = "鏌ヨ搴熷搧搴撳瓨瀵瑰簲鎵瑰彿鍜屾暟閲�")
+    public R getWasteBatchNoQty(Page page, StockInventoryDto stockInventoryDto) {
+        IPage<StockUninventoryDto> stockUninventoryDtoIPage = stockUninventoryService.getWasteBatchNoQty(page, stockInventoryDto);
         return R.ok(stockUninventoryDtoIPage);
     }
 
     @PostMapping("/addstockUninventory")
     @Operation(summary = "鏂板搴撳瓨")
     public R addstockUninventory(@RequestBody StockUninventoryDto stockUninventoryDto) {
-        stockUninventoryDto.setRecordType(String.valueOf(StockInUnQualifiedRecordTypeEnum.CUSTOMIZATION_UNSTOCK_IN.getCode()));
+        stockUninventoryDto.setRecordType(String.valueOf(StockInQualifiedRecordTypeEnum.CUSTOMIZATION_UNSTOCK_IN.getCode()));
         stockUninventoryDto.setRecordId(0L);
+        if (stockUninventoryDto.getType() == null || stockUninventoryDto.getType().trim().isEmpty()) {
+            stockUninventoryDto.setType("unqualified");
+        }
         return R.ok(stockUninventoryService.addStockUninventory(stockUninventoryDto));
     }
 
@@ -46,33 +64,49 @@
     @PostMapping("/subtractstockUninventory")
     @Operation(summary = "鎵ｅ噺搴撳瓨")
     public R subtractstockUninventory(@RequestBody StockUninventoryDto stockUninventoryDto) {
-        stockUninventoryDto.setRecordType(String.valueOf(StockOutUnQualifiedRecordTypeEnum.CUSTOMIZATION_UNSTOCK_OUT.getCode()));
+        stockUninventoryDto.setRecordType(String.valueOf(StockOutQualifiedRecordTypeEnum.CUSTOMIZATION_UNSTOCK_OUT.getCode()));
         stockUninventoryDto.setRecordId(0L);
+        if (stockUninventoryDto.getType() == null || stockUninventoryDto.getType().trim().isEmpty()) {
+            stockUninventoryDto.setType("unqualified");
+        }
         return R.ok(stockUninventoryService.subtractStockUninventory(stockUninventoryDto));
     }
 
     @PostMapping("/addStockInRecordOnly")
     @Operation(summary = "鏂板鍏ュ簱璁板綍锛堜粎鍒涘缓璁板綍锛屼笉璋冩暣搴撳瓨锛�")
     public R addStockInRecordOnly(@RequestBody StockUninventoryDto stockUninventoryDto) {
-        stockUninventoryDto.setRecordType(String.valueOf(StockInUnQualifiedRecordTypeEnum.CUSTOMIZATION_UNSTOCK_IN.getCode()));
+        stockUninventoryDto.setRecordType(String.valueOf(StockInQualifiedRecordTypeEnum.CUSTOMIZATION_UNSTOCK_IN.getCode()));
         stockUninventoryDto.setRecordId(0L);
+        if (stockUninventoryDto.getType() == null || stockUninventoryDto.getType().trim().isEmpty()) {
+            stockUninventoryDto.setType("unqualified");
+        }
         return R.ok(stockUninventoryService.addStockInRecordOnly(stockUninventoryDto));
     }
 
     @PostMapping("/addStockOutRecordOnly")
     @Operation(summary = "鏂板鍑哄簱璁板綍锛堜粎鍒涘缓璁板綍锛屼笉璋冩暣搴撳瓨锛�")
     public R addStockOutRecordOnly(@RequestBody StockUninventoryDto stockUninventoryDto) {
-        stockUninventoryDto.setRecordType(String.valueOf(StockOutUnQualifiedRecordTypeEnum.CUSTOMIZATION_UNSTOCK_OUT.getCode()));
+        stockUninventoryDto.setRecordType(String.valueOf(StockOutQualifiedRecordTypeEnum.CUSTOMIZATION_UNSTOCK_OUT.getCode()));
         stockUninventoryDto.setRecordId(0L);
+        if (stockUninventoryDto.getType() == null || stockUninventoryDto.getType().trim().isEmpty()) {
+            stockUninventoryDto.setType("unqualified");
+        }
         return R.ok(stockUninventoryService.addStockOutRecordOnly(stockUninventoryDto));
     }
 
     @PostMapping("/exportStockUninventory")
     @Operation(summary = "瀵煎嚭搴撳瓨")
     public void exportStockUninventory(HttpServletResponse response, StockUninventoryDto stockUninventoryDto) {
+        stockUninventoryDto.setType("unqualified");
         stockUninventoryService.exportStockUninventory(response,stockUninventoryDto);
     }
 
+    @PostMapping("/exportWasteQuery")
+    @Operation(summary = "瀵煎嚭搴熷搧鏌ヨ椤甸潰鏁版嵁")
+    public void exportWasteQuery(HttpServletResponse response, StockUninventoryDto stockUninventoryDto) {
+        stockUninventoryService.exportWasteQuery(response, stockUninventoryDto);
+    }
+
 
     @PostMapping("/frozenStock")
     @Operation(summary = "鍐荤粨搴撳瓨")

--
Gitblit v1.9.3