From 1d915922d8197aa5d5dc3e40e3088d983dd6e141 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 13 三月 2026 17:57:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg
---
src/main/java/com/ruoyi/consumables/controller/ConsumablesUnInventoryController.java | 76 ++++++++++++++++++++++++++++++++++++++
1 files changed, 76 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/consumables/controller/ConsumablesUnInventoryController.java b/src/main/java/com/ruoyi/consumables/controller/ConsumablesUnInventoryController.java
new file mode 100644
index 0000000..3beb689
--- /dev/null
+++ b/src/main/java/com/ruoyi/consumables/controller/ConsumablesUnInventoryController.java
@@ -0,0 +1,76 @@
+package com.ruoyi.consumables.controller;
+
+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.consumables.dto.ConsumablesInventoryDto;
+import com.ruoyi.consumables.dto.ConsumablesUnInventoryDto;
+import com.ruoyi.consumables.service.ConsumablesUnInventoryService;
+import com.ruoyi.framework.web.domain.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * <p>
+ * 鑰楁潗涓嶅悎鏍煎簱瀛樿〃 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-22 10:17:45
+ */
+@Api(tags = "鑰楁潗涓嶅悎鏍�")
+@RestController
+@RequestMapping("/consumablesUnInventory")
+public class ConsumablesUnInventoryController {
+ @Autowired
+ private ConsumablesUnInventoryService consumablesUnInventoryService;
+
+ @GetMapping("/pageConsumablesUnInventory")
+ @ApiOperation("鍒嗛〉鏌ヨ搴撳瓨")
+ public R pageConsumablesUnInventory(Page page, ConsumablesUnInventoryDto consumablesUnInventoryDto) {
+ IPage<ConsumablesUnInventoryDto> ConsumablesUnInventoryDtoIPage = consumablesUnInventoryService.pageConsumablesUnInventory(page, consumablesUnInventoryDto);
+ return R.ok(ConsumablesUnInventoryDtoIPage);
+ }
+
+ @PostMapping("/addConsumablesUnInventory")
+ @ApiOperation("鏂板搴撳瓨")
+ public R addConsumablesUnInventory(@RequestBody ConsumablesUnInventoryDto consumablesUnInventoryDto) {
+ consumablesUnInventoryDto.setRecordType(String.valueOf(StockInUnQualifiedRecordTypeEnum.CUSTOMIZATION_UNSTOCK_IN.getCode()));
+ consumablesUnInventoryDto.setRecordId(0L);
+ return R.ok(consumablesUnInventoryService.addConsumablesUnInventory(consumablesUnInventoryDto));
+ }
+
+
+ @PostMapping("/subtractConsumablesUnInventory")
+ @ApiOperation("鎵ｅ噺搴撳瓨")
+ public R subtractConsumablesUnInventory(@RequestBody ConsumablesUnInventoryDto consumablesUnInventoryDto) {
+ consumablesUnInventoryDto.setRecordType(String.valueOf(StockOutUnQualifiedRecordTypeEnum.CUSTOMIZATION_UNSTOCK_OUT.getCode()));
+ consumablesUnInventoryDto.setRecordId(0L);
+ return R.ok(consumablesUnInventoryService.subtractConsumablesUnInventory(consumablesUnInventoryDto));
+ }
+
+ @PostMapping("/exportConsumablesUnInventory")
+ @ApiOperation("瀵煎嚭搴撳瓨")
+ public void exportConsumablesUnInventory(HttpServletResponse response, ConsumablesUnInventoryDto consumablesUnInventoryDto) {
+ consumablesUnInventoryService.exportConsumablesUnInventory(response,consumablesUnInventoryDto);
+ }
+
+
+ @PostMapping("/frozenConsumables")
+ @ApiOperation("鍐荤粨搴撳瓨")
+ public R frozenConsumables(@RequestBody ConsumablesInventoryDto consumablesUnInventoryDto) {
+ return R.ok(consumablesUnInventoryService.frozenConsumables(consumablesUnInventoryDto));
+ }
+
+ @PostMapping("/thawConsumables")
+ @ApiOperation("瑙ｅ喕搴撳瓨")
+ public R thawConsumables(@RequestBody ConsumablesInventoryDto consumablesUnInventoryDto) {
+ return R.ok(consumablesUnInventoryService.thawConsumables(consumablesUnInventoryDto));
+ }
+
+}
--
Gitblit v1.9.3