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/AccountIncomeController.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/controller/AccountIncomeController.java b/src/main/java/com/ruoyi/account/controller/AccountIncomeController.java
index 68e50f7..c6a24d7 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountIncomeController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountIncomeController.java
@@ -14,6 +14,8 @@
import com.ruoyi.quality.service.IQualityInspectFileService;
import com.ruoyi.quality.service.IQualityInspectParamService;
import com.ruoyi.quality.service.IQualityInspectService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -27,6 +29,7 @@
*/
@RestController
@RequestMapping("/account/accountIncome")
+@Api(tags = "璐㈠姟绠＄悊--鏀跺叆绠＄悊")
public class AccountIncomeController {
@Resource
@@ -39,6 +42,7 @@
* @return
*/
@PostMapping("/add")
+ @ApiOperation("鏂板")
public AjaxResult add(@RequestBody AccountIncome accountIncome) {
accountIncome.setInputTime(new Date());
LoginUser loginUser = SecurityUtils.getLoginUser();
@@ -52,6 +56,7 @@
* @return
*/
@DeleteMapping("/del")
+ @ApiOperation("鍒犻櫎")
public AjaxResult delQualityInspect(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
@@ -66,6 +71,7 @@
* @return
*/
@PostMapping("/update")
+ @ApiOperation("淇敼")
public AjaxResult update(@RequestBody AccountIncome accountIncome) {
return AjaxResult.success(accountIncomeService.updateById(accountIncome));
}
@@ -77,6 +83,7 @@
* @return
*/
@GetMapping("/listPage")
+ @ApiOperation("鍒嗛〉鏌ヨ")
public AjaxResult accountIncomeListPage(Page page, AccountIncome accountIncome) {
return AjaxResult.success(accountIncomeService.accountIncomeListPage(page, accountIncome));
}
@@ -87,6 +94,7 @@
* @return
*/
@GetMapping("/{id}")
+ @ApiOperation("璇︽儏")
public AjaxResult accountIncomeDetail(@PathVariable("id") Integer id) {
return AjaxResult.success(accountIncomeService.getById(id));
}
@@ -97,6 +105,7 @@
* @param accountIncome
*/
@PostMapping("/export")
+ @ApiOperation("瀵煎嚭")
public void accountIncomeExport(HttpServletResponse response,AccountIncome accountIncome) {
accountIncomeService.accountIncomeExport(response, accountIncome);
}
--
Gitblit v1.9.3