From b3f4cc9eddb07921fec539317c1a9064699fc711 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 01 六月 2026 14:58:01 +0800
Subject: [PATCH] 采购审批增加仓库
---
src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java | 10 +++++++++-
1 files changed, 9 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 5da3984..5ef52dd 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java
@@ -255,6 +255,12 @@
return R.fail("瀹℃壒瀹炰緥涓嶅瓨鍦�");
}
+ // 濡傛灉鍓嶇浼犻�掍簡浠撳簱淇℃伅锛屾洿鏂板鎵瑰疄渚嬬殑浠撳簱瀛楁
+ if (StringUtils.hasText(approvalInstanceDto.getWarehouse())) {
+ instance.setWarehouse(approvalInstanceDto.getWarehouse());
+ this.updateById(instance);
+ }
+
ApprovalInstanceNode currentNode = approveProcessConfigNodeUtils.getCurrentNode(instance.getId());
if (currentNode == null) {
return R.fail("褰撳墠娌℃湁寰呭鐞嗙殑瀹℃壒鑺傜偣");
@@ -647,7 +653,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