From 29ccd9919082e0157f57989ae83b303f314bad6b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 08 六月 2026 16:01:55 +0800
Subject: [PATCH] feat(financial): 新增凭证分录科目明细字段
---
src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java
index e0c7eae..c7a80df 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java
@@ -97,6 +97,8 @@
@Override
public R listPage(Page<ApprovalInstanceVo> page, ApprovalInstanceDto approvalInstanceDto) {
+ // 娉ㄥ叆褰撳墠鐢ㄦ埛ID锛岀敤浜庤繃婊ゅ彧鏌ョ湅鐢宠浜哄拰瀹℃牳浜烘槸鑷繁鐨勬暟鎹�
+ approvalInstanceDto.setCurrentUserId(SecurityUtils.getUserId());
IPage<ApprovalInstanceVo> approvalInstanceVoIPage = approvalInstanceMapper.listPage(page, approvalInstanceDto);
List<ApprovalInstanceVo> records = approvalInstanceVoIPage.getRecords();
@@ -253,6 +255,12 @@
ApprovalInstance instance = getPendingApprovalInstance(approvalInstanceDto.getId());
if (instance == null) {
return R.fail("瀹℃壒瀹炰緥涓嶅瓨鍦�");
+ }
+
+ // 濡傛灉鍓嶇浼犻�掍簡浠撳簱淇℃伅锛屾洿鏂板鎵瑰疄渚嬬殑浠撳簱瀛楁
+ if (StringUtils.hasText(approvalInstanceDto.getWarehouse())) {
+ instance.setWarehouse(approvalInstanceDto.getWarehouse());
+ this.updateById(instance);
}
ApprovalInstanceNode currentNode = approveProcessConfigNodeUtils.getCurrentNode(instance.getId());
@@ -647,7 +655,9 @@
salesLedgerProduct.getQuantity(),
StockInQualifiedRecordTypeEnum.PURCHASE_STOCK_IN.getCode(),
purchaseLedger.getId(),
- purchaseLedger.getPurchaseContractNumber() + "-" + salesLedgerProduct.getId()
+ purchaseLedger.getPurchaseContractNumber() + "-" + salesLedgerProduct.getId(),
+ null,
+ instance.getWarehouse()
);
}
}
--
Gitblit v1.9.3