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/account/controller/AccountExpenseController.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java b/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java
index 44d1dbd..23e2508 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java
@@ -1,6 +1,7 @@
package com.ruoyi.account.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.dto.ReportDateDto;
import com.ruoyi.account.mapper.AccountIncomeMapper;
import com.ruoyi.account.pojo.AccountExpense;
import com.ruoyi.account.pojo.AccountIncome;
@@ -11,6 +12,8 @@
import com.ruoyi.dto.DateQueryDto;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.domain.AjaxResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -24,6 +27,7 @@
*/
@RestController
@RequestMapping("/account/accountExpense")
+@Api(tags = "璐㈠姟绠＄悊--鏀嚭绠＄悊")
public class AccountExpenseController {
@Resource
@@ -39,6 +43,7 @@
* @return
*/
@PostMapping("/add")
+ @ApiOperation("鏂板")
public AjaxResult add(@RequestBody AccountExpense accountExpense) {
accountExpense.setInputTime(new Date());
LoginUser loginUser = SecurityUtils.getLoginUser();
@@ -52,6 +57,7 @@
* @return
*/
@DeleteMapping("/del")
+ @ApiOperation("鍒犻櫎")
public AjaxResult delQualityInspect(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
@@ -66,6 +72,7 @@
* @return
*/
@PostMapping("/update")
+ @ApiOperation("淇敼")
public AjaxResult update(@RequestBody AccountExpense accountExpense) {
return AjaxResult.success(accountExpenseService.updateById(accountExpense));
}
@@ -77,6 +84,7 @@
* @return
*/
@GetMapping("/listPage")
+ @ApiOperation("鍒嗛〉鏌ヨ")
public AjaxResult accountExpenseListPage(Page page, AccountExpense accountExpense) {
return AjaxResult.success(accountExpenseService.accountExpenseListPage(page, accountExpense));
}
@@ -87,6 +95,7 @@
* @return
*/
@GetMapping("/{id}")
+ @ApiOperation("璇︽儏")
public AjaxResult accountExpenseDetail(@PathVariable("id") Integer id) {
return AjaxResult.success(accountExpenseService.getById(id));
}
@@ -97,6 +106,7 @@
* @param accountExpense
*/
@PostMapping("/export")
+ @ApiOperation("瀵煎嚭")
public void accountExpenseExport(HttpServletResponse response,AccountExpense accountExpense) {
accountExpenseService.accountExpenseExport(response, accountExpense);
}
@@ -107,8 +117,19 @@
* @return
*/
@GetMapping("/report/forms")
+ @ApiOperation("璐㈠姟鎶ヨ〃鍥捐〃鏌ヨ")
public AjaxResult report(DateQueryDto dateQueryDto) {
return AjaxResult.success(accountExpenseService.report(dateQueryDto));
+ }
+
+ /**
+ * 璐㈠姟鎶ヨ〃-璐㈠姟鍒嗘瀽
+ * @return
+ */
+ @GetMapping("/report/analysis")
+ @ApiOperation("璐㈠姟鎶ヨ〃-璐㈠姟鍒嗘瀽")
+ public AjaxResult analysis() {
+ return AjaxResult.success(accountExpenseService.analysis());
}
/**
@@ -117,8 +138,9 @@
* @return
*/
@GetMapping("/report/income")
- public AjaxResult reportIncome() {
- return AjaxResult.success(accountIncomeService.reportIncome());
+ @ApiOperation("璐㈠姟鎶ヨ〃鍥捐〃鏀跺叆骞村害鏌ヨ")
+ public AjaxResult reportIncome(ReportDateDto reportDateDto) {
+ return AjaxResult.success(accountIncomeService.reportIncome(reportDateDto));
}
/**
@@ -127,8 +149,9 @@
* @return
*/
@GetMapping("/report/expense")
- public AjaxResult reportExpense() {
- return AjaxResult.success(accountExpenseService.reportExpense());
+ @ApiOperation("璐㈠姟鎶ヨ〃鍥捐〃鏀嚭骞村害鏌ヨ")
+ public AjaxResult reportExpense(ReportDateDto reportDateDto) {
+ return AjaxResult.success(accountExpenseService.reportExpense(reportDateDto));
}
--
Gitblit v1.9.3