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/purchase/controller/TicketRegistrationController.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
index ab38808..baefa12 100644
--- a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
@@ -26,6 +26,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.parameters.P;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -87,7 +88,8 @@
@ApiOperation("鍒犻櫎浠樻娴佹按")
@DeleteMapping("/delPaymentRegistration")
- public AjaxResult delPaymentRegistration(@RequestBody Long id) {
+ @Transactional(rollbackFor = Exception.class)
+ public AjaxResult delPaymentRegistration(@RequestBody List<Long> id) {
return toAjax(paymentRegistrationService.delPaymentRegistration(id));
}
@@ -103,6 +105,18 @@
}
/**
+ * 浠樻鐧昏瀵煎嚭
+ */
+ @Log(title = "浠樻鐧昏瀵煎嚭", businessType = BusinessType.EXPORT)
+ @PostMapping("/exportOne")
+ public void exportOne(HttpServletResponse response, TicketRegistration ticketRegistration) {
+ Page page = new Page<>(-1, -1);
+ IPage<TicketRegistration> ticketRegistrationIPage = listPage(page, ticketRegistration);
+ ExcelUtil<TicketRegistration> util = new ExcelUtil<TicketRegistration>(TicketRegistration.class);
+ util.exportExcel(response, ticketRegistrationIPage.getRecords(), "浠樻鐧昏瀵煎嚭");
+ }
+
+ /**
* 鏌ヨ鏉ョエ鐧昏鍜屼骇鍝佺埗瀛愬垪琛�
*/
@GetMapping("/getRegistrationById")
@@ -115,17 +129,22 @@
*/
@Log(title = "鏉ョエ鐧昏", businessType = BusinessType.INSERT)
@PostMapping("/addOrUpdateRegistration")
- public AjaxResult addOrUpdateRegistration(@RequestBody TicketRegistrationDto ticketRegistrationDto) throws IOException {
- return toAjax(ticketRegistrationService.addOrUpdateRegistration(ticketRegistrationDto));
+ @Transactional(rollbackFor = Exception.class)
+ public AjaxResult addOrUpdateRegistration(@RequestBody List<TicketRegistrationDto> ticketRegistrationDto) throws IOException {
+ if(CollectionUtils.isEmpty(ticketRegistrationDto)) return AjaxResult.error("璇烽�夋嫨瑕佷繚瀛樼殑璁板綍");
+ for (TicketRegistrationDto ticketRegistrationDto1 : ticketRegistrationDto) {
+ ticketRegistrationService.addOrUpdateRegistration(ticketRegistrationDto1);
+ }
+ return toAjax(1);
}
- @GetMapping("/getProductRecordById")
- public AjaxResult getProductRecordById(Long id) {
- if (id == null) {
+ @PostMapping("/getProductRecordById")
+ public AjaxResult getProductRecordById(@RequestBody ProductRecordDto productRecordDto) {
+ if (productRecordDto.getId() == null) {
return AjaxResult.error("鍙傛暟閿欒");
}
- return AjaxResult.success(productRecordService.getProductRecordById(id));
+ return AjaxResult.success(productRecordService.getProductRecordById(productRecordDto));
}
@ApiModelProperty("淇敼鏉ョエ鐧昏")
--
Gitblit v1.9.3