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 | 28 +++++-----------------------
1 files changed, 5 insertions(+), 23 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..6886fc9 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java
@@ -420,20 +420,8 @@
instance.setStatus("REJECTED");
instance.setFinishTime(now);
this.updateById(instance);
- // 椹冲洖瀵瑰簲鐨勪紒涓氭柊闂伙紝 宸梾鎶ラ攢
- if (instance.getBusinessType().equals(TypeEnums.ENTERPRISE_NEWS_APPROVAL.getCode())) {
- enterpriseNewsMapper.update(
- new LambdaUpdateWrapper<EnterpriseNews>()
- .eq(EnterpriseNews::getId, instance.getBusinessId())
- .set(EnterpriseNews::getStatus, "REJECTED")
- );
- }else if (instance.getBusinessType().equals(TypeEnums.TRAVEL_REIMBURSEMENT_APPROVAL.getCode())||instance.getBusinessType().equals(TypeEnums.EXPENSE_APPROVAL.getCode())) {
- finReimbursementMapper.update(
- new LambdaUpdateWrapper<FinReimbursement>()
- .eq(FinReimbursement::getId, instance.getBusinessId())
- .set(FinReimbursement::getBillStatus, "REJECTED")
- );
- }
+ // 缁熶竴澶勭悊涓氬姟鐘舵�佹洿鏂�
+ handleBusinessAfterApprovalFinished(instance);
return R.ok("瀹℃壒宸查┏鍥�");
}
@@ -640,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());
@@ -682,7 +664,7 @@
private void handleShippingApprovalFinished(ApprovalInstance instance, String status) {
ShippingInfo shippingInfo = shippingInfoMapper.selectOne(
new LambdaQueryWrapper<ShippingInfo>()
- .eq(ShippingInfo::getId, instance.getTitle())
+ .eq(ShippingInfo::getShippingNo, instance.getTitle())
.orderByDesc(ShippingInfo::getCreateTime)
.last("limit 1")
);
--
Gitblit v1.9.3