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/service/impl/PaymentRegistrationServiceImpl.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
index a32b6f6..55aea8f 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
@@ -127,7 +127,7 @@
// 2. 澶勭悊璐︽埛鏀嚭
AccountExpense accountExpense = new AccountExpense();
accountExpense.setExpenseDate(purchaseLedger.getEntryDate());
- accountExpense.setExpenseType("0");
+ accountExpense.setExpenseType("4");
accountExpense.setSupplierName(purchaseLedger.getSupplierName());
accountExpense.setExpenseMoney(paymentRegistration.getCurrentPaymentAmount());
accountExpense.setExpenseDescribed("浠樻鏀嚭");
@@ -344,7 +344,6 @@
List<Long> supplierIds = suppliers.stream()
.map(SupplierManage::getId) // 鍏堣幏鍙朓nteger绫诲瀷鐨処D
.filter(Objects::nonNull) // 杩囨护鎺夊彲鑳界殑null鍊�
- .map(Integer::longValue) // 灏咺nteger杞崲涓篖ong
.collect(Collectors.toList());
// 鑾峰彇褰撴湀鐨勫紑濮嬪拰缁撴潫鏃ユ湡
--
Gitblit v1.9.3