From 18d292f1091b8b86ad29ba76e3cbe8ffaf2c222e Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 11 六月 2025 17:45:39 +0800
Subject: [PATCH] 1.正式库合并以及优化 2.销售模块
---
main-business/src/main/java/com/ruoyi/business/controller/OfficialInventoryController.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/main-business/src/main/java/com/ruoyi/business/controller/OfficialInventoryController.java b/main-business/src/main/java/com/ruoyi/business/controller/OfficialInventoryController.java
index 9dedce7..196e7ad 100644
--- a/main-business/src/main/java/com/ruoyi/business/controller/OfficialInventoryController.java
+++ b/main-business/src/main/java/com/ruoyi/business/controller/OfficialInventoryController.java
@@ -4,11 +4,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.business.dto.OfficialInventoryDto;
import com.ruoyi.business.service.OfficialInventoryService;
+import com.ruoyi.business.vo.OfficialInventoryVo;
import com.ruoyi.common.core.domain.R;
import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* <p>
@@ -31,8 +32,32 @@
*/
@GetMapping("/list")
public R<IPage<OfficialInventoryDto>> list(Page page, OfficialInventoryDto officialInventoryDto) {
- IPage<OfficialInventoryDto> list = officialInventoryService.selectOfficialInventoryList(page,officialInventoryDto);
+ IPage<OfficialInventoryDto> list = officialInventoryService.selectOfficialInventoryList(page, officialInventoryDto);
return R.ok(list);
}
+ /**
+ * 姝ｅ紡搴撶叅绉嶉儴鍒嗕俊鎭痩ist
+ */
+ @GetMapping("/OfficialList")
+ public R<List<OfficialInventoryVo>> officialList(OfficialInventoryVo officialInventoryVo) {
+ return R.ok(officialInventoryService.selectOfficialList(officialInventoryVo));
+ }
+
+ /**
+ * 姝ｅ紡搴撲慨鏀�
+ */
+ @PostMapping("/editOfficial")
+ public R editOfficial(@RequestBody OfficialInventoryDto officialInventoryDto) {
+ return R.ok(officialInventoryService.editOfficial(officialInventoryDto));
+ }
+
+ /**
+ * 鍚堝苟
+ */
+ @PostMapping("/merge")
+ public R merge(@RequestBody OfficialInventoryDto officialInventoryDto) {
+ return R.ok(officialInventoryService.mergeAll(officialInventoryDto));
+ }
+
}
--
Gitblit v1.9.3