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/PaymentRegistrationController.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java b/src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java
index 71f1b5d..e895ea6 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java
@@ -14,6 +14,7 @@
import com.ruoyi.purchase.pojo.PaymentRegistration;
import com.ruoyi.purchase.service.IPaymentRegistrationService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -69,7 +70,8 @@
*/
@Log(title = "浠樻鐧昏", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody PaymentRegistration paymentRegistration) {
+ @Transactional(rollbackFor = Exception.class)
+ public AjaxResult add(@RequestBody List<PaymentRegistration> paymentRegistration) {
return toAjax(paymentRegistrationService.insertPaymentRegistration(paymentRegistration));
}
@@ -78,6 +80,7 @@
*/
@Log(title = "浠樻鐧昏", businessType = BusinessType.UPDATE)
@PutMapping
+ @Transactional(rollbackFor = Exception.class)
public AjaxResult edit(@RequestBody PaymentRegistration paymentRegistration) {
return toAjax(paymentRegistrationService.updatePaymentRegistration(paymentRegistration));
}
@@ -120,6 +123,22 @@
}
/**
+ * 渚涘簲鍟嗗線鏉ュ垎椤垫帴鍙�
+ */
+ @GetMapping("/supplierNameListPage")
+ public AjaxResult supplierNameListPage(PaymentLedgerDto paymentLedgerDto, Page page){
+ return success(paymentRegistrationService.supplierNameListPage(page,paymentLedgerDto));
+ }
+
+ /**
+ * 渚涘簲鍟嗗線鏉ュ垎椤垫帴鍙�
+ */
+ @GetMapping("/supplierNameListPageDetails")
+ public AjaxResult supplierNameListPageDetails(PaymentLedgerDto paymentLedgerDto){
+ return success(paymentRegistrationService.supplierNameListPageDetails(paymentLedgerDto));
+ }
+
+ /**
* 鑾峰彇鏈湀搴斾粯淇℃伅
*/
@GetMapping(value = "/paymentMonthList")
--
Gitblit v1.9.3