From 2c2605a1297882bf88c3c86313ee37797854689b Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 08 六月 2026 10:28:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_宁夏_万通新型
---
src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java | 10 ++--------
1 files changed, 2 insertions(+), 8 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 8d7477b..6886fc9 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java
@@ -628,16 +628,10 @@
);
for (SalesLedgerProduct salesLedgerProduct : salesLedgerProducts) {
if (salesLedgerProduct.getIsChecked()) {
+ // 闇�瑕佽川妫�鐨勪骇鍝� -> 鐢熸垚璐ㄦ鍗�
qualityInspectHelper.addQualityInspect(purchaseLedger, salesLedgerProduct);
- } else {
- stockUtils.addStockWithBatchNo(
- salesLedgerProduct.getProductModelId(),
- salesLedgerProduct.getQuantity(),
- StockInQualifiedRecordTypeEnum.PURCHASE_STOCK_IN.getCode(),
- purchaseLedger.getId(),
- purchaseLedger.getPurchaseContractNumber() + "-" + salesLedgerProduct.getId()
- );
}
+ // 涓嶉渶瑕佽川妫�鐨勪骇鍝侊細涓嶅啀鑷姩鍏ュ簱锛屾敼涓烘墜鍔ㄥ叆搴撴寜閽Е鍙�
}
} else if ("REJECTED".equals(status)) {
purchaseLedger.setApprovalStatus(ApprovalStatusEnum.REJECTED.getCode());
--
Gitblit v1.9.3