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/ConsumablesOutRecordController.java | 69 ++++++++++++++++++++++++++++++++++
1 files changed, 69 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/consumables/controller/ConsumablesOutRecordController.java b/src/main/java/com/ruoyi/consumables/controller/ConsumablesOutRecordController.java
new file mode 100644
index 0000000..efc98b7
--- /dev/null
+++ b/src/main/java/com/ruoyi/consumables/controller/ConsumablesOutRecordController.java
@@ -0,0 +1,69 @@
+package com.ruoyi.consumables.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.consumables.dto.ConsumablesOutRecordDto;
+import com.ruoyi.consumables.service.ConsumablesOutRecordService;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * <p>
+ * 鑰楁潗鍑哄簱璁板綍琛� 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-21 05:27:04
+ */
+@Api(tags = "鑰楁潗鍑哄簱")
+@RestController
+@RequestMapping("/consumablesOutRecord")
+public class ConsumablesOutRecordController {
+ @Autowired
+ private ConsumablesOutRecordService consumablesUnInventoryDto;
+
+ @GetMapping("/listPage")
+ @Log(title = "鐢熶骇鍑哄簱-鍑哄簱绠＄悊-鍒楄〃", businessType = BusinessType.OTHER)
+ @ApiOperation(value = "鍑哄簱绠＄悊鍒楄〃")
+ public AjaxResult listPage(Page page, ConsumablesOutRecordDto ConsumablesOutRecordDto) {
+ IPage<ConsumablesOutRecordDto> result = consumablesUnInventoryDto.listPage(page, ConsumablesOutRecordDto);
+ return AjaxResult.success(result);
+ }
+
+ @PostMapping("")
+ @Log(title = "鍑哄簱绠＄悊-鏂板鍑哄簱", businessType = BusinessType.INSERT)
+ public AjaxResult add(@RequestBody ConsumablesOutRecordDto ConsumablesOutRecordDto) {
+ return AjaxResult.success(consumablesUnInventoryDto.add(ConsumablesOutRecordDto));
+ }
+
+ @PutMapping("/{id}")
+ @Log(title = "鍑哄簱绠＄悊-鏇存柊鍑哄簱", businessType = BusinessType.UPDATE)
+ public AjaxResult update(@PathVariable("id") Long id, @RequestBody ConsumablesOutRecordDto ConsumablesOutRecordDto) {
+ return AjaxResult.success(consumablesUnInventoryDto.update(id, ConsumablesOutRecordDto));
+ }
+
+ @DeleteMapping("")
+ @Log(title = "鍑哄簱绠＄悊-鍒犻櫎鍑哄簱", businessType = BusinessType.DELETE)
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ if(CollectionUtils.isEmpty(ids)){
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ }
+ return AjaxResult.success(consumablesUnInventoryDto.batchDelete(ids));
+ }
+
+ @PostMapping("/exportConsumablesOutRecord")
+ @ApiOperation("瀵煎嚭鍑哄簱璁板綍")
+ public void exportConsumablesOutRecord(HttpServletResponse response, ConsumablesOutRecordDto ConsumablesOutRecordDto) {
+ consumablesUnInventoryDto.exportConsumablesOutRecord(response,ConsumablesOutRecordDto);
+ }
+
+}
--
Gitblit v1.9.3