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/other/controller/TempFileController.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/other/controller/TempFileController.java b/src/main/java/com/ruoyi/other/controller/TempFileController.java
index 6834d13..1175eb0 100644
--- a/src/main/java/com/ruoyi/other/controller/TempFileController.java
+++ b/src/main/java/com/ruoyi/other/controller/TempFileController.java
@@ -3,8 +3,13 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.other.service.TempFileService;
+import com.ruoyi.purchase.dto.ProductRecordDto;
+import com.ruoyi.purchase.dto.TicketRegistrationDto;
+import com.ruoyi.purchase.service.ITicketRegistrationService;
+import com.ruoyi.purchase.service.impl.TicketRegistrationServiceImpl;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
@@ -17,13 +22,36 @@
private TempFileService tempFileService;
+ private TicketRegistrationServiceImpl ticketRegistrationServiceImpl;
+
@PostMapping("/upload")
- public AjaxResult uploadFile(MultipartFile file) {
+ public AjaxResult uploadFile(MultipartFile file, Integer type) {
try {
- return AjaxResult.success(tempFileService.uploadFile(file));
- }catch (Exception e) {
+ return AjaxResult.success(tempFileService.uploadFile(file, type));
+ } catch (Exception e) {
return AjaxResult.error(e.getMessage());
}
}
+ @PostMapping("/uploadByCommon")
+ public AjaxResult uploadByCommon(MultipartFile file, Integer type, Long id) {
+ try {
+ return AjaxResult.success(tempFileService.uploadByCommon(file, type,id));
+ } catch (Exception e) {
+ return AjaxResult.error(e.getMessage());
+ }
+ }
+
+ @PostMapping("uploadFile")
+ public AjaxResult uploadFile(@RequestBody ProductRecordDto productRecordDto) {
+ try {
+ if (!productRecordDto.getTempFileIds().isEmpty()&&productRecordDto.getTicketRegistrationId() != null) {
+ ticketRegistrationServiceImpl.migrateTempFilesToFormal(productRecordDto.getTicketRegistrationId(), productRecordDto.getTempFileIds());
+ }
+ } catch (Exception e) {
+ return AjaxResult.error(e.getMessage());
+ }
+ return AjaxResult.success();
+ }
+
}
--
Gitblit v1.9.3