From 9571956561915d24ebfc0915117e7df24ea3058d Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 03 四月 2026 10:52:05 +0800
Subject: [PATCH] fix： 发货审批通过库存不扣减
---
src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java | 65 +++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
index 00a53f5..cee9249 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
@@ -27,11 +27,14 @@
import com.ruoyi.purchase.service.impl.PurchaseLedgerServiceImpl;
import com.ruoyi.sales.mapper.*;
import com.ruoyi.sales.pojo.CommonFile;
+import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.pojo.SalesQuotation;
import com.ruoyi.sales.pojo.ShippingInfo;
+import com.ruoyi.sales.service.ShippingInfoService;
import com.ruoyi.sales.service.impl.CommonFileServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -81,6 +84,13 @@
@Autowired
private PurchaseLedgerServiceImpl purchaseLedgerServiceImpl;
+
+ @Autowired
+ private SalesLedgerMapper salesLedgerMapper;
+
+ @Autowired
+ @Lazy
+ private ShippingInfoService shippingInfoService;
public ApproveProcess getApproveById(String id) {
@@ -232,24 +242,34 @@
}
salesQuotationMapper.updateById(salesQuote);
}
- // 鍑哄簱瀹℃壒淇敼
+ // 鍑哄簱瀹℃壒淇敼 (璁㈠崟绾у埆)
if(approveProcess.getApproveType().equals(7)){
String[] split = approveProcess.getApproveReason().split(":");
- ShippingInfo shippingInfo = shippingInfoMapper.selectOne(new LambdaQueryWrapper<ShippingInfo>()
- .eq(ShippingInfo::getShippingNo, split[1])
- .orderByDesc(ShippingInfo::getCreateTime)
- .last("limit 1"));
- if(shippingInfo != null){
- if(status.equals(2)){
- shippingInfo.setStatus("瀹℃牳閫氳繃");
- }else if(status.equals(3)){
- shippingInfo.setStatus("瀹℃牳鎷掔粷");
- }else if(status.equals(1)){
- shippingInfo.setStatus("瀹℃牳涓�");
+ if (split.length > 1) {
+ String identifier = split[1];
+ // 鏌ユ壘閿�鍞彴璐�
+ SalesLedger salesLedger = salesLedgerMapper.selectOne(new LambdaQueryWrapper<SalesLedger>()
+ .eq(SalesLedger::getSalesContractNo, identifier)
+ .last("limit 1"));
+
+ if (salesLedger != null) {
+ if(status.equals(2)){
+ // 瀹℃壒瀹屾垚 -> 鑷姩鎵ｉ櫎搴撳瓨
+ try {
+ shippingInfoService.deductStockByOrder(salesLedger.getId(), null);
+ } catch (IOException e) {
+ throw new RuntimeException("鑷姩鎵ｉ櫎搴撳瓨澶辫触: " + e.getMessage());
+ }
+ } else if(status.equals(3)){
+ updateSalesLedgerDeliveryStatus(salesLedger.getId(), 3);
+ // 鏇存柊鍏宠仈鐨勫彂璐ц褰曚负瀹℃牳鎷掔粷
+ updateShippingInfoStatusByOrder(salesLedger.getId(), "瀹℃牳鎷掔粷");
+ } else if(status.equals(1)){
+ updateSalesLedgerDeliveryStatus(salesLedger.getId(), 2);
+ updateShippingInfoStatusByOrder(salesLedger.getId(), "瀹℃牳涓�");
+ }
}
- shippingInfoMapper.updateById(shippingInfo);
}
-
}
// 缁戝畾闄勪欢
if(!CollectionUtils.isEmpty(approveNode.getTempFileIds()) && approveNode.getApproveNodeStatus() == 1){
@@ -257,6 +277,23 @@
}
}
+ private void updateShippingInfoStatusByOrder(Long salesLedgerId, String statusText) {
+ if (salesLedgerId == null) return;
+ shippingInfoMapper.update(null, new UpdateWrapper<ShippingInfo>()
+ .lambda()
+ .set(ShippingInfo::getStatus, statusText)
+ .eq(ShippingInfo::getSalesLedgerId, salesLedgerId));
+ }
+
+ private void updateSalesLedgerDeliveryStatus(Long salesLedgerId, Integer status) {
+ if (salesLedgerId == null) return;
+ SalesLedger salesLedger = salesLedgerMapper.selectById(salesLedgerId);
+ if (salesLedger != null) {
+ salesLedger.setDeliveryStatus(status);
+ salesLedgerMapper.updateById(salesLedger);
+ }
+ }
+
@Override
public void updateApproveNode(ApproveNode approveNode) throws IOException {
// 瀹℃壒鑺傜偣鐘舵��:1鍚屾剰锛�2鎷掔粷锛�0灏氭湭瀹℃牳
--
Gitblit v1.9.3