From 712b1df6fdee09bd92388a60a9f5d890d711387b Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 19 三月 2026 17:34:24 +0800
Subject: [PATCH] fix:1.入库管理和耗材导出优化 2.仓储物流和耗材物流导出修改 3.首页统计仓储物流和耗材物料两边的数据

---
 src/main/java/com/ruoyi/consumables/controller/ConsumablesInventoryController.java |   40 ++++++++++++++++++++--------------------
 1 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/ruoyi/consumables/controller/ConsumablesInventoryController.java b/src/main/java/com/ruoyi/consumables/controller/ConsumablesInventoryController.java
index 8687fa2..fbede68 100644
--- a/src/main/java/com/ruoyi/consumables/controller/ConsumablesInventoryController.java
+++ b/src/main/java/com/ruoyi/consumables/controller/ConsumablesInventoryController.java
@@ -35,37 +35,37 @@
 public class ConsumablesInventoryController {
 
     @Autowired
-    private ConsumablesInventoryService ConsumablesInventoryService;
+    private ConsumablesInventoryService consumablesInventoryService;
 
     @GetMapping("/pageConsumablesInventory")
     @ApiOperation("鍒嗛〉鏌ヨ搴撳瓨")
-    public R pageConsumablesInventory(Page page, ConsumablesInventoryDto ConsumablesInventoryDto) {
-        IPage<ConsumablesInventoryDto> ConsumablesInventoryDtoIPage = ConsumablesInventoryService.pageConsumablesInventory(page, ConsumablesInventoryDto);
+    public R pageConsumablesInventory(Page page, ConsumablesInventoryDto consumablesInventoryDto) {
+        IPage<ConsumablesInventoryDto> ConsumablesInventoryDtoIPage = consumablesInventoryService.pageConsumablesInventory(page, consumablesInventoryDto);
         return R.ok(ConsumablesInventoryDtoIPage);
     }
 
     @PostMapping("/addConsumablesInventory")
     @ApiOperation("鏂板搴撳瓨")
-    public R addConsumablesInventory(@RequestBody ConsumablesInventoryDto ConsumablesInventoryDto) {
-        ConsumablesInventoryDto.setRecordType(String.valueOf(StockInQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_IN.getCode()));
-        ConsumablesInventoryDto.setRecordId(0L);
-        return R.ok(ConsumablesInventoryService.addConsumablesInventory(ConsumablesInventoryDto));
+    public R addConsumablesInventory(@RequestBody ConsumablesInventoryDto consumablesInventoryDto) {
+        consumablesInventoryDto.setRecordType(String.valueOf(StockInQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_IN.getCode()));
+        consumablesInventoryDto.setRecordId(0L);
+        return R.ok(consumablesInventoryService.addConsumablesInventory(consumablesInventoryDto));
     }
 
 
     @PostMapping("/subtractConsumablesInventory")
     @ApiOperation("鎵ｅ噺搴撳瓨")
-    public R subtractConsumablesInventory(@RequestBody ConsumablesInventoryDto ConsumablesInventoryDto) {
-        ConsumablesInventoryDto.setRecordType(String.valueOf(StockOutQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_OUT.getCode()));
-        ConsumablesInventoryDto.setRecordId(0L);
-        return R.ok(ConsumablesInventoryService.subtractConsumablesInventory(ConsumablesInventoryDto));
+    public R subtractConsumablesInventory(@RequestBody ConsumablesInventoryDto consumablesInventoryDto) {
+        consumablesInventoryDto.setRecordType(String.valueOf(StockOutQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_OUT.getCode()));
+        consumablesInventoryDto.setRecordId(0L);
+        return R.ok(consumablesInventoryService.subtractConsumablesInventory(consumablesInventoryDto));
     }
 
 
     @PostMapping("importConsumablesInventory")
     @ApiOperation("瀵煎叆搴撳瓨")
     public R importConsumablesInventory(MultipartFile file) {
-        return ConsumablesInventoryService.importConsumablesInventory(file);
+        return consumablesInventoryService.importConsumablesInventory(file);
     }
 
     @Log(title = "涓嬭浇搴撳瓨瀵煎叆妯℃澘", businessType = BusinessType.EXPORT)
@@ -78,31 +78,31 @@
 
     @PostMapping("/exportConsumablesInventory")
     @ApiOperation("瀵煎嚭搴撳瓨")
-    public void exportConsumablesInventory(HttpServletResponse response, ConsumablesInventoryDto ConsumablesInventoryDto) {
-        ConsumablesInventoryService.exportConsumablesInventory(response, ConsumablesInventoryDto);
+    public void exportConsumablesInventory(HttpServletResponse response, ConsumablesInventoryDto consumablesInventoryDto) {
+        consumablesInventoryService.exportConsumablesInventory(response, consumablesInventoryDto);
     }
 
     @GetMapping("ConsumablesInventoryPage")
     @ApiOperation("搴撳瓨鎶ヨ〃鏌ヨ")
     public R ConsumablesInventoryPage(Page page, ConsumablesInventoryDto consumablesInventoryDto) {
-        return R.ok(ConsumablesInventoryService.consumablesInventoryPage(consumablesInventoryDto,page));
+        return R.ok(consumablesInventoryService.consumablesInventoryPage(consumablesInventoryDto,page));
     }
 
     @GetMapping("ConsumablesInAndOutRecord")
     @ApiOperation("缁熻鍚勪釜浜у搧鐨勫叆搴撳拰鍑哄簱璁板綍")
     public R ConsumablesInAndOutRecord(ConsumablesInventoryDto consumablesInventoryDto, Page page) {
-        return R.ok(ConsumablesInventoryService.consumablesInAndOutRecord(consumablesInventoryDto,page));
+        return R.ok(consumablesInventoryService.consumablesInAndOutRecord(consumablesInventoryDto,page));
     }
 
     @PostMapping("/frozenConsumables")
     @ApiOperation("鍐荤粨搴撳瓨")
-    public R frozenConsumables(@RequestBody ConsumablesInventoryDto ConsumablesInventoryDto) {
-        return R.ok(ConsumablesInventoryService.frozenConsumables(ConsumablesInventoryDto));
+    public R frozenConsumables(@RequestBody ConsumablesInventoryDto consumablesInventoryDto) {
+        return R.ok(consumablesInventoryService.frozenConsumables(consumablesInventoryDto));
     }
 
     @PostMapping("/thawConsumables")
     @ApiOperation("瑙ｅ喕搴撳瓨")
-    public R thawConsumables(@RequestBody ConsumablesInventoryDto ConsumablesInventoryDto) {
-        return R.ok(ConsumablesInventoryService.thawConsumables(ConsumablesInventoryDto));
+    public R thawConsumables(@RequestBody ConsumablesInventoryDto consumablesInventoryDto) {
+        return R.ok(consumablesInventoryService.thawConsumables(consumablesInventoryDto));
     }
 }

--
Gitblit v1.9.3