From a9d2ef88a2ac9cdc0b07e98e9c3a8ba621cfb1d8 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 09 四月 2026 16:11:31 +0800
Subject: [PATCH] feat: 生产订单根据库存数量判断生产,发货与冻结解冻挂钩
---
src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
index 1cdbebb..97f1105 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
@@ -9,21 +9,25 @@
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.other.service.impl.TempFileServiceImpl;
-import com.ruoyi.procurementrecord.dto.ReturnSaleProductDto;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.sales.dto.SalesLedgerProductDto;
import com.ruoyi.sales.dto.ShippingInfoDto;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.mapper.ShippingInfoMapper;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import com.ruoyi.sales.pojo.SalesLedgerProductFrozen;
import com.ruoyi.sales.pojo.ShippingInfo;
+import com.ruoyi.sales.service.ISalesLedgerProductFrozenService;
import com.ruoyi.sales.service.ShippingInfoService;
+import com.ruoyi.stock.mapper.StockInventoryMapper;
+import com.ruoyi.stock.pojo.StockInventory;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.io.IOException;
+import java.math.BigDecimal;
import java.util.Collections;
import java.util.List;
@@ -46,6 +50,10 @@
private StockUtils stockUtils;
@Autowired
private CommonFileServiceImpl commonFileService;
+ @Autowired
+ private ISalesLedgerProductFrozenService salesLedgerProductFrozenService;
+ @Autowired
+ private StockInventoryMapper stockInventoryMapper;
@Autowired
private ApproveProcessServiceImpl approveProcessService;
@@ -68,6 +76,26 @@
//鎵ｅ噺搴撳瓨
if(!"宸插彂璐�".equals(byId.getStatus())){
SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(byId.getSalesLedgerProductId());
+ // 鍚屾鎵ｅ噺鎴栭噴鏀惧喕缁撶殑搴撳瓨
+ SalesLedgerProductFrozen frozenRecord = salesLedgerProductFrozenService.getOne(new LambdaQueryWrapper<SalesLedgerProductFrozen>()
+ .eq(SalesLedgerProductFrozen::getSalesLedgerProductId, byId.getSalesLedgerProductId())
+ .last("limit 1"));
+ if (frozenRecord != null) {
+ java.math.BigDecimal frozenQty = frozenRecord.getFrozenQuantity();
+ if (frozenQty != null && frozenQty.compareTo(BigDecimal.ZERO) > 0) {
+ StockInventory stockInventory = stockInventoryMapper.selectOne(new LambdaQueryWrapper<StockInventory>()
+ .eq(StockInventory::getProductModelId, frozenRecord.getProductModelId())
+ .last("for update"));
+ if (stockInventory != null) {
+ BigDecimal currentLocked = stockInventory.getLockedQuantity() != null ? stockInventory.getLockedQuantity() : BigDecimal.ZERO;
+ stockInventory.setLockedQuantity(currentLocked.subtract(frozenQty));
+ stockInventoryMapper.updateById(stockInventory);
+ }
+ }
+ salesLedgerProductFrozenService.removeById(frozenRecord.getId());
+ }
+
+ // 鎵ｅ噺搴撳瓨
stockUtils.substractStock(salesLedgerProduct.getProductModelId(), salesLedgerProduct.getQuantity(), StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode(), req.getId());
}
byId.setExpressNumber(req.getExpressNumber());
@@ -112,7 +140,7 @@
@Override
public List<SalesLedgerProductDto> getReturnManagementDtoById(Long shippingId) {
- return shippingInfoMapper.getReturnManagementDtoById(shippingId);
+ return shippingInfoMapper.getReturnManagementDtoById(shippingId );
}
--
Gitblit v1.9.3