From a76e1d17d67641993dea6335cb8e1465a94df58d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 21 五月 2026 15:39:05 +0800
Subject: [PATCH] feat(stock): 优化库存管理和成品树结构功能 1- 为ApproveProcessMapper.xml和ProductBomMapper.xml添加排序功能 2- 在ProductionProductMainDto中新增bomInputQty字段用于产品结构投入数量 3- 修改ProductionProductMainServiceImpl中投入数量计算逻辑，使用前端传入的bomInputQty值 4- 在ProductWorkOrderDto中添加bomInputQty字段并在服务实现中计算标准投入数量 5- 更新SalesLedgerMapper.xml查询逻辑，从product_summary获取电压信息 6- 为SalesLedgerProduct添加stockId字段并修改库存扣减逻辑使用具体库存ID 7- 重构StockInventoryController中的成品库存树查询接口和导入导出功能 8- 新增成品和非成品库存导入导出的数据模型和Excel工具类 9- 优化StockInventoryServiceImpl中的库存扣减逻辑，支持按特定库存ID操作 10- 更新库存导入导出功能，区分成品和非成品类型并提供相应模板
---
src/main/java/com/ruoyi/collaborativeApproval/controller/MeetingController.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/MeetingController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/MeetingController.java
index dcc42ff..956c8bc 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/MeetingController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/MeetingController.java
@@ -1,5 +1,8 @@
package com.ruoyi.collaborativeApproval.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.approve.pojo.ApproveProcess;
+import com.ruoyi.collaborativeApproval.mapper.MeetDraftMapper;
import com.ruoyi.collaborativeApproval.pojo.MeetApplication;
import com.ruoyi.collaborativeApproval.pojo.MeetDraft;
import com.ruoyi.collaborativeApproval.pojo.MeetingMinutes;
@@ -9,9 +12,15 @@
import com.ruoyi.collaborativeApproval.vo.SearchMeetingDraftVo;
import com.ruoyi.collaborativeApproval.vo.SearchMeetingRoomVo;
import com.ruoyi.collaborativeApproval.vo.SearchMeetingUseVo;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
/**
* 鍏充簬浼氳controller
@@ -23,6 +32,7 @@
@RestController
@RequestMapping("/meeting")
@RequiredArgsConstructor
+@Api(tags = "浼氳")
public class MeetingController {
private final MeetingService meetingService;
@@ -73,8 +83,7 @@
@PostMapping("/saveMeetingApplication")
public R saveMeetApplication(@RequestBody MeetApplication meetApplication) {
- meetingService.saveMeetApplication(meetApplication);
- return R.ok();
+ return meetingService.saveMeetApplication(meetApplication);
}
@PostMapping("/applicationList")
@@ -117,4 +126,22 @@
return R.ok(meetingService.getMeetSummaryItems());
}
+ @ApiOperation(value = "浼氳瀹よ缃鍑�")
+ @PostMapping("/export")
+ public void export(HttpServletResponse response) {
+ List<MeetingRoom> accountExpenses = meetingService.list();
+ ExcelUtil<MeetingRoom> util = new ExcelUtil<MeetingRoom>(MeetingRoom.class);
+ util.exportExcel(response, accountExpenses, "浼氳瀹よ缃鍑�");
+ }
+
+ private final MeetDraftMapper meetDraftMapper;
+
+ @ApiOperation(value = "浼氳鑽夌瀵煎嚭")
+ @PostMapping("/exportOne")
+ public void exportOne(HttpServletResponse response) {
+ List<MeetDraft> accountExpenses = meetDraftMapper.selectList(new LambdaQueryWrapper<MeetDraft>());
+ ExcelUtil<MeetDraft> util = new ExcelUtil<MeetDraft>(MeetDraft.class);
+ util.exportExcel(response, accountExpenses, "浼氳鑽夌瀵煎嚭");
+ }
+
}
--
Gitblit v1.9.3