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/stock/controller/StockInRecordController.java | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java b/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java
index e5bdef2..2b036e5 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java
@@ -5,6 +5,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.stock.dto.StockInRecordDto;
import com.ruoyi.stock.service.StockInRecordService;
import io.swagger.annotations.Api;
@@ -13,10 +14,11 @@
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
@RestController
-@Api(tags = "閲囪喘鍏ュ簱")
+@Api(tags = "鍏ュ簱")
@RequestMapping("/stockInRecord")
public class StockInRecordController {
@Autowired
@@ -30,25 +32,40 @@
return AjaxResult.success(result);
}
- @PostMapping("")
- @Log(title = "鍏ュ簱绠＄悊-鏂板鍏ュ簱", businessType = BusinessType.INSERT)
- public AjaxResult add(@RequestBody StockInRecordDto stockInRecordDto) {
- return AjaxResult.success(stockInRecordService.add(stockInRecordDto));
+
+ @GetMapping("/getById")
+ @ApiOperation(value = "鏍规嵁ID鏌ヨ鍏ュ簱璁板綍")
+ public AjaxResult getById(@RequestParam("id") Long id) {
+ if (id == null || id <= 0) {
+ return AjaxResult.error("鍙傛暟id涓嶈兘涓虹┖");
+ }
+ StockInRecordDto stockInRecordDto = stockInRecordService.selectByRecord(id);
+ if (stockInRecordDto == null) {
+ return AjaxResult.error("璁板綍涓嶅瓨鍦�");
+ }
+ return AjaxResult.success(stockInRecordDto);
}
- @PutMapping("/{id}")
- @Log(title = "鍏ュ簱绠＄悊-鏇存柊鍏ュ簱", businessType = BusinessType.UPDATE)
- public AjaxResult update(@PathVariable("id") Long id, @RequestBody StockInRecordDto stockInRecordDto) {
- return AjaxResult.success(stockInRecordService.update(id, stockInRecordDto));
+ @PostMapping("/updateStockInRecord")
+ @ApiOperation("鍏ュ簱璁板綍瀹℃牳")
+ public R updateStockInRecord(@RequestBody StockInRecordDto stockInRecordDto) {
+ return R.ok(stockInRecordService.updateStockInRecord(stockInRecordDto));
}
+
@DeleteMapping("")
@Log(title = "鍏ュ簱绠＄悊-鍒犻櫎鍏ュ簱", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
- if(CollectionUtils.isEmpty(ids)){
+ if (CollectionUtils.isEmpty(ids)) {
return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
return AjaxResult.success(stockInRecordService.batchDelete(ids));
}
+ @PostMapping("/exportStockInRecord")
+ @ApiOperation("瀵煎嚭鍏ュ簱璁板綍")
+ public void exportStockInRecord(HttpServletResponse response, StockInRecordDto stockInRecordDto) {
+ stockInRecordService.exportStockInRecord(response, stockInRecordDto);
+ }
+
}
--
Gitblit v1.9.3