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/warehouse/controller/WarehouseGoodsShelvesController.java | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
index f373b88..bed5510 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
@@ -8,6 +8,7 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.warehouse.dto.WarehouseGoodsShelvesDto;
import com.ruoyi.warehouse.pojo.WarehouseGoodsShelves;
import com.ruoyi.warehouse.service.WarehouseGoodsShelvesService;
import io.swagger.annotations.Api;
@@ -23,20 +24,12 @@
public class WarehouseGoodsShelvesController extends BaseController {
@Autowired
private WarehouseGoodsShelvesService warehouseGoodsShelvesService;
- @GetMapping("/listPage")
- @ApiOperation("鍟嗗搧璐ф灦-鍒嗛〉鏌ヨ")
- @Log(title = "鍟嗗搧璐ф灦-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPage(Page page, WarehouseGoodsShelves warehouseGoodsShelves) {
- IPage<WarehouseGoodsShelves> listPage = warehouseGoodsShelvesService.listPage(page, warehouseGoodsShelves);
- return AjaxResult.success(listPage);
- }
@GetMapping("/listById")
@ApiOperation("鍟嗗搧璐ф灦-鏌ヨ")
@Log(title = "鍟嗗搧璐ф灦-鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listById(Long warehouseId) {
- List<WarehouseGoodsShelves> list = warehouseGoodsShelvesService.list(new QueryWrapper<WarehouseGoodsShelves>().lambda()
- .eq(WarehouseGoodsShelves::getWarehouseId, warehouseId));
+ public AjaxResult listById(WarehouseGoodsShelves warehouseGoodsShelves) {
+ List<WarehouseGoodsShelvesDto> list = warehouseGoodsShelvesService.findList(warehouseGoodsShelves);
return AjaxResult.success(list);
}
@PostMapping("/add")
@@ -45,7 +38,7 @@
public AjaxResult add(@RequestBody WarehouseGoodsShelves warehouseGoodsShelves) {
return AjaxResult.success(warehouseGoodsShelvesService.add(warehouseGoodsShelves));
}
- @PostMapping("/update")
+ @PutMapping("/update")
@ApiOperation("鍟嗗搧璐ф灦-鏇存柊")
@Log(title = "鍟嗗搧璐ф灦-鏇存柊", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody WarehouseGoodsShelves warehouseGoodsShelves) {
--
Gitblit v1.9.3