From 1cf91e355038837f30f2d727507b2229263d7de7 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 27 一月 2026 17:49:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

---
 src/main/java/com/ruoyi/stock/controller/StockInventoryController.java |   69 ++++++++++++++++++++++++++++++----
 1 files changed, 60 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
index 4806638..f4bd009 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
@@ -2,17 +2,23 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.enums.StockQualifiedRecordTypeEnum;
+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.domain.R;
 import com.ruoyi.stock.dto.StockInventoryDto;
-import com.ruoyi.stock.pojo.StockInventory;
+import com.ruoyi.stock.execl.StockInventoryExportData;
 import com.ruoyi.stock.service.StockInventoryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
@@ -39,8 +45,8 @@
 
     @PostMapping("/addstockInventory")
     @ApiOperation("鏂板搴撳瓨")
-    public R addstockInventory(StockInventoryDto stockInventoryDto) {
-        stockInventoryDto.setRecordType("鍚堟牸鑷畾涔夊叆搴�");
+    public R addstockInventory(@RequestBody StockInventoryDto stockInventoryDto) {
+        stockInventoryDto.setRecordType(String.valueOf(StockQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_IN.getCode()));
         stockInventoryDto.setRecordId(0L);
         return R.ok(stockInventoryService.addstockInventory(stockInventoryDto));
     }
@@ -48,9 +54,54 @@
 
     @PostMapping("/subtractStockInventory")
     @ApiOperation("鎵ｅ噺搴撳瓨")
-    public R subtractStockInventory(StockInventoryDto stockInventoryDto) {
-        stockInventoryDto.setRecordType("鍚堟牸鑷畾涔夊嚭搴撳簱");
+    public R subtractStockInventory(@RequestBody StockInventoryDto stockInventoryDto) {
+        stockInventoryDto.setRecordType(String.valueOf(StockQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_OUT.getCode()));
         stockInventoryDto.setRecordId(0L);
         return R.ok(stockInventoryService.subtractStockInventory(stockInventoryDto));
     }
+
+
+    @PostMapping("importStockInventory")
+    @ApiOperation("瀵煎叆搴撳瓨")
+    public R importStockInventory(MultipartFile file) {
+        return stockInventoryService.importStockInventory(file);
+    }
+
+    @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, "搴撳瓨妯℃澘");
+    }
+
+    @PostMapping("/exportStockInventory")
+    @ApiOperation("瀵煎嚭搴撳瓨")
+    public void exportStockInventory(HttpServletResponse response, StockInventoryDto stockInventoryDto) {
+        stockInventoryService.exportStockInventory(response, stockInventoryDto);
+    }
+
+    @GetMapping("stockInventoryPage")
+    @ApiOperation("搴撳瓨鎶ヨ〃鏌ヨ")
+    public R stockInventoryPage(Page page, StockInventoryDto stockInventoryDto) {
+        return R.ok(stockInventoryService.stockInventoryPage(stockInventoryDto,page));
+    }
+
+    @GetMapping("stockInAndOutRecord")
+    @ApiOperation("缁熻鍚勪釜浜у搧鐨勫叆搴撳拰鍑哄簱璁板綍")
+    public R stockInAndOutRecord(StockInventoryDto stockInventoryDto,Page page) {
+        return R.ok(stockInventoryService.stockInAndOutRecord(stockInventoryDto,page));
+    }
+
+    @PostMapping("/frozenStock")
+    @ApiOperation("鍐荤粨搴撳瓨")
+    public R frozenStock(@RequestBody StockInventoryDto stockInventoryDto) {
+        return R.ok(stockInventoryService.frozenStock(stockInventoryDto));
+    }
+
+    @PostMapping("/thawStock")
+    @ApiOperation("瑙ｅ喕搴撳瓨")
+    public R thawStock(@RequestBody StockInventoryDto stockInventoryDto) {
+        return R.ok(stockInventoryService.thawStock(stockInventoryDto));
+    }
 }

--
Gitblit v1.9.3