From cf6b1cf6fa8f7784c6d7c64b7326d4662bc3d4b3 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 14 十月 2025 17:39:06 +0800
Subject: [PATCH] yys 1.智能排产 2.物料看板 3.报表分析
---
main-business/src/main/java/com/ruoyi/business/controller/OfficialInventoryController.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 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 4dca675..45c9060 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
@@ -3,11 +3,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.business.dto.OfficialInventoryDto;
+import com.ruoyi.business.dto.SalesRecordDto;
import com.ruoyi.business.entity.OfficialInventory;
import com.ruoyi.business.service.OfficialInventoryService;
import com.ruoyi.business.vo.OfficialInventoryVo;
import com.ruoyi.common.core.domain.R;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -23,6 +26,7 @@
@RestController
@AllArgsConstructor
+@Slf4j
@RequestMapping("/officialInventory")
public class OfficialInventoryController {
@@ -32,7 +36,7 @@
* 姝ｅ紡搴撳簱琛ㄦ煡璇�
*/
@GetMapping("/list")
- public R<IPage<OfficialInventoryDto>> list(Page page, OfficialInventoryDto officialInventoryDto) {
+ public R<IPage<OfficialInventoryDto>> list(Page<OfficialInventory> page, OfficialInventoryDto officialInventoryDto) {
IPage<OfficialInventoryDto> list = officialInventoryService.selectOfficialInventoryList(page, officialInventoryDto);
return R.ok(list);
}
@@ -61,6 +65,7 @@
return R.ok(officialInventoryService.editOfficial(officialInventoryDto));
}
+
/**
* 鍚堝苟
*/
@@ -69,4 +74,19 @@
return R.ok(officialInventoryService.mergeAll(officialInventoryDto));
}
+ /**
+ * 閰嶇叅璁＄畻鍣ㄩ�夋嫨list
+ */
+ @GetMapping("/coalBlendingList")
+ public R<List<OfficialInventoryDto>> coalBlendingList() {
+ return R.ok(officialInventoryService.coalBlendingList());
+ }
+
+ /**
+ * 姝ｅ紡搴撹褰曡〃瀵煎嚭
+ */
+ @PostMapping("/export")
+ public void officialInventoryExport(HttpServletResponse response, OfficialInventoryDto officialInventoryDto) {
+ officialInventoryService.officialInventoryExport(response, officialInventoryDto);
+ }
}
--
Gitblit v1.9.3