From 31e23deb9ae71263fb59fcd82c26b22c9cdfc3d4 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期六, 14 六月 2025 15:51:14 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zd-after
---
main-business/src/main/java/com/ruoyi/business/controller/PendingInventoryController.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/main-business/src/main/java/com/ruoyi/business/controller/PendingInventoryController.java b/main-business/src/main/java/com/ruoyi/business/controller/PendingInventoryController.java
index 0968c40..16940ff 100644
--- a/main-business/src/main/java/com/ruoyi/business/controller/PendingInventoryController.java
+++ b/main-business/src/main/java/com/ruoyi/business/controller/PendingInventoryController.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.business.dto.PendingInventoryDto;
-import com.ruoyi.business.entity.PendingInventory;
import com.ruoyi.business.service.PendingInventoryService;
import com.ruoyi.common.core.domain.R;
import lombok.AllArgsConstructor;
@@ -23,25 +22,34 @@
@RequestMapping("/pendingInventory")
public class PendingInventoryController {
- private PendingInventoryService pendingInventoryService;
+ private PendingInventoryService pendingInventoryService;
/**
* 寰呭叆搴撹〃鏌ヨ
*/
@GetMapping("/list")
- public R<IPage<PendingInventory>> list(Page page, PendingInventoryDto pendingInventoryDto) {
- IPage<PendingInventory> list = pendingInventoryService.selectPendingInventoryList(page,pendingInventoryDto);
+ public R<IPage<PendingInventoryDto>> list(Page page, PendingInventoryDto pendingInventoryDto) {
+ IPage<PendingInventoryDto> list = pendingInventoryService.selectPendingInventoryList(page, pendingInventoryDto);
return R.ok(list);
}
/**
- * 鏂板淇敼
+ * 寰呭叆搴撴柊澧炰慨鏀�
*/
@PostMapping("/addOrEditPending")
public R addOrEditPending(@RequestBody PendingInventoryDto pendingInventoryDto) {
return R.ok(pendingInventoryService.addOrEditPending(pendingInventoryDto));
}
+
+ /**
+ * 寰呭叆搴撶叅璐ㄦ柟妗堝�间慨鏀逛繚瀛�
+ */
+ @PostMapping("/addOrEditCoalValue")
+ public R addOrEditCoalValue(@RequestBody PendingInventoryDto pendingInventoryDto) {
+ return R.ok(pendingInventoryService.addOrEditCoalValue(pendingInventoryDto));
+ }
+
/**
* 鍒犻櫎
*/
--
Gitblit v1.9.3