feat: 生产订单根据库存数量判断生产,发货与冻结解冻挂钩

gongchunyi

11 小时以前 a9d2ef88a2ac9cdc0b07e98e9c3a8ba621cfb1d8

 src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java

@@ -15,14 +15,19 @@
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;

@@ -45,6 +50,10 @@
    private StockUtils stockUtils;
    @Autowired
    private CommonFileServiceImpl commonFileService;
    @Autowired
    private ISalesLedgerProductFrozenService salesLedgerProductFrozenService;
    @Autowired
    private StockInventoryMapper stockInventoryMapper;

    @Autowired
    private ApproveProcessServiceImpl approveProcessService;
@@ -67,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());