From 3e5e22f5358156ff7430ee117546123ffe042611 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 20 九月 2026 20:23:52 +0800
Subject: [PATCH] feat(stock): 实现出品出库绑定销售台账功能

---
 src/main/java/com/ruoyi/stock/controller/StockInventoryController.java |   62 +++++++++++++++++++++++++++---
 1 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
index 02a25fd..c504265 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
@@ -9,6 +9,7 @@
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.domain.R;
 import com.ruoyi.stock.dto.StockInventoryDto;
+import com.ruoyi.stock.dto.StockOutRecordDto;
 import com.ruoyi.stock.execl.StockInventoryExportData;
 import com.ruoyi.stock.service.StockInventoryService;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -18,8 +19,6 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * <p>
@@ -44,10 +43,30 @@
         return R.ok(stockInventoryDtoIPage);
     }
 
+    @GetMapping("/pageScrapStock")
+    @Operation(summary = "鎶ュ簾鍝侀�夋枡鍒嗛〉锛堝彧璇伙紝甯︽壒鍙凤級")
+    public R pageScrapStock(Page page, StockInventoryDto stockInventoryDto) {
+        IPage<StockInventoryDto> result = stockInventoryService.pageScrapStock(page, stockInventoryDto);
+        return R.ok(result);
+    }
+
     @GetMapping("/pageListCombinedStockInventory")
     @Operation(summary = "鍒嗛〉鏌ヨ鑱斿悎搴撳瓨鍒楄〃")
     public R pageListCombinedStockInventory(Page page, StockInventoryDto stockInventoryDto) {
         IPage<StockInventoryDto> stockInventoryDtoIPage = stockInventoryService.pageListCombinedStockInventory(page, stockInventoryDto);
+        return R.ok(stockInventoryDtoIPage);
+    }
+
+    /**
+     * 鏌ヨ瀵瑰簲鎵瑰彿鍜屾暟閲�
+     * @param page
+     * @param stockInventoryDto
+     * @return
+     */
+    @GetMapping("/getBatchNoQty")
+    @Operation(summary = "鏌ヨ瀵瑰簲鎵瑰彿鍜屾暟閲�")
+    public R getBatchNoQty(Page page, StockInventoryDto stockInventoryDto) {
+        IPage<StockInventoryDto> stockInventoryDtoIPage = stockInventoryService.getBatchNoQty(page, stockInventoryDto);
         return R.ok(stockInventoryDtoIPage);
     }
 
@@ -68,8 +87,32 @@
         return R.ok(stockInventoryService.subtractStockInventory(stockInventoryDto));
     }
 
+    @PostMapping("/addStockInRecordOnly")
+    @Operation(summary = "鏂板鍏ュ簱璁板綍锛堜粎鍒涘缓璁板綍锛屼笉璋冩暣搴撳瓨锛�")
+    public R addStockInRecordOnly(@RequestBody StockInventoryDto stockInventoryDto) {
+        stockInventoryDto.setRecordType(String.valueOf(StockInQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_IN.getCode()));
+        stockInventoryDto.setRecordId(0L);
+        return R.ok(stockInventoryService.addStockInRecordOnly(stockInventoryDto));
+    }
 
-    @PostMapping("importStockInventory")
+    @PostMapping("/addStockOutRecordOnly")
+    @Operation(summary = "鏂板鍑哄簱璁板綍锛堜粎鍒涘缓璁板綍锛屼笉璋冩暣搴撳瓨锛�")
+    public R addStockOutRecordOnly(@RequestBody StockInventoryDto stockInventoryDto) {
+        stockInventoryDto.setRecordType(String.valueOf(StockOutQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_OUT.getCode()));
+        stockInventoryDto.setRecordId(0L);
+        return R.ok(stockInventoryService.addStockOutRecordOnly(stockInventoryDto));
+    }
+
+    @PostMapping("/addOilOutRecordOnly")
+    @Operation(summary = "鏂板娌瑰搧鍑哄簱璁板綍锛堜粎鍒涘缓璁板綍锛屼笉璋冩暣搴撳瓨锛�")
+    public R addOilOutRecordOnly(@RequestBody StockOutRecordDto stockOutRecordDto) {
+        stockOutRecordDto.setRecordType(String.valueOf(StockOutQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_OUT.getCode()));
+        stockOutRecordDto.setRecordId(0L);
+        return R.ok(stockInventoryService.addOilOutRecordOnly(stockOutRecordDto));
+    }
+
+
+    @PostMapping("/importStockInventory")
     @Operation(summary = "瀵煎叆搴撳瓨")
     public R importStockInventory(MultipartFile file) {
         return stockInventoryService.importStockInventory(file);
@@ -78,9 +121,8 @@
     @Log(title = "涓嬭浇搴撳瓨瀵煎叆妯℃澘", businessType = BusinessType.EXPORT)
     @PostMapping("/downloadStockInventory")
     public void downloadStockInventory(HttpServletResponse response) {
-        List<StockInventoryExportData> list = new ArrayList<>();
         ExcelUtil<StockInventoryExportData> util = new ExcelUtil<>(StockInventoryExportData.class);
-        util.exportExcel(response, list, "搴撳瓨妯℃澘");
+        util.importTemplateExcel(response, "搴撳瓨妯℃澘");
     }
 
     @PostMapping("/exportStockInventory")
@@ -89,13 +131,13 @@
         stockInventoryService.exportStockInventory(response, stockInventoryDto);
     }
 
-    @GetMapping("stockInventoryPage")
+    @GetMapping("/stockInventoryPage")
     @Operation(summary = "搴撳瓨鎶ヨ〃鏌ヨ")
     public R stockInventoryPage(Page page, StockInventoryDto stockInventoryDto) {
         return R.ok(stockInventoryService.stockInventoryPage(stockInventoryDto,page));
     }
 
-    @GetMapping("stockInAndOutRecord")
+    @GetMapping("/stockInAndOutRecord")
     @Operation(summary = "缁熻鍚勪釜浜у搧鐨勫叆搴撳拰鍑哄簱璁板綍")
     public R stockInAndOutRecord(StockInventoryDto stockInventoryDto,Page page) {
         return R.ok(stockInventoryService.stockInAndOutRecord(stockInventoryDto,page));
@@ -112,4 +154,10 @@
     public R thawStock(@RequestBody StockInventoryDto stockInventoryDto) {
         return R.ok(stockInventoryService.thawStock(stockInventoryDto));
     }
+
+    @GetMapping("/getByModelId")
+    @Operation(summary = "鏍规嵁浜у搧瑙勬牸ID鑾峰彇鍏ュ簱璁板綍")
+    public R getByModelId(Long productModelId) {
+        return R.ok(stockInventoryService.getByModelId(productModelId));
+    }
 }

--
Gitblit v1.9.3