fix: 改为补充发货信息才扣减库存、销售订单缺失审批通过状态、审批流程编号重复

gongchunyi

10 小时以前 2cab2f69fe7efff3f1f014022be707a6648754e3

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

@@ -81,97 +81,40 @@
        if (byId == null) {
            throw new RuntimeException("发货信息不存在");
        }
        return deductStockByOrder(byId.getSalesLedgerId(), req);
        //扣减库存
        if(!"已发货".equals(byId.getStatus())){
            SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(byId.getSalesLedgerProductId());
            if (salesLedgerProduct != null) {
                stockUtils.substractStock(salesLedgerProduct.getProductModelId(), salesLedgerProduct.getQuantity(), StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode(), req.getId());
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean deductStockByOrder(Long salesLedgerId, ShippingInfoDto req) throws IOException {
        if (salesLedgerId == null) {
            throw new RuntimeException("关联订单不可为空");
        }
        byId.setExpressNumber(req.getExpressNumber());
        byId.setExpressCompany(req.getExpressCompany());
        byId.setStatus("已发货");
        byId.setShippingCarNumber(req.getShippingCarNumber());
        byId.setShippingDate(req.getShippingDate());
        boolean update = this.updateById(byId);

        SalesLedger salesLedger = salesLedgerMapper.selectById(salesLedgerId);
        if (salesLedger == null) {
            throw new RuntimeException("关联订单不存在");
        }

        // 检查该订单下是否还有未发货的记录
        List<ShippingInfo> unsentShippings = this.list(new LambdaQueryWrapper<ShippingInfo>()
                .eq(ShippingInfo::getSalesLedgerId, salesLedgerId)
        // 更新订单状态为 5-已发货 (如果所有发货记录都已发货)
        SalesLedger salesLedger = salesLedgerMapper.selectById(byId.getSalesLedgerId());
        if (salesLedger != null && !Integer.valueOf(5).equals(salesLedger.getDeliveryStatus())) {
            List<ShippingInfo> unsent = this.list(new LambdaQueryWrapper<ShippingInfo>()
                    .eq(ShippingInfo::getSalesLedgerId, byId.getSalesLedgerId())
                .ne(ShippingInfo::getStatus, "已发货"));

        // 仅在存在未发货记录时执行库存扣减
        if (CollectionUtils.isNotEmpty(unsentShippings)) {
            // 获取该订单下所有的产品信息进行汇总扣减
            List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>()
                    .eq(SalesLedgerProduct::getSalesLedgerId, salesLedgerId));

            if (CollectionUtils.isEmpty(products)) {
                throw new RuntimeException("该订单下无产品信息，无法扣减库存");
            }

            //  汇总需求并校验库存
            Map<Long, BigDecimal> modelQtyMap = new HashMap<>();
            for (SalesLedgerProduct p : products) {
                if (p.getProductModelId() == null) continue;
                modelQtyMap.put(p.getProductModelId(), modelQtyMap.getOrDefault(p.getProductModelId(), BigDecimal.ZERO).add(p.getQuantity()));
            }

            for (Map.Entry<Long, BigDecimal> entry : modelQtyMap.entrySet()) {
                Long modelId = entry.getKey();
                BigDecimal totalNeeded = entry.getValue();

                StockInventory stock = stockInventoryMapper.selectOne(new LambdaQueryWrapper<StockInventory>()
                        .eq(StockInventory::getProductModelId, modelId));

                if (stock == null) {
                    throw new RuntimeException("产品规格ID:" + modelId + " 库存记录不存在");
                }

                BigDecimal locked = stock.getLockedQuantity() == null ? BigDecimal.ZERO : stock.getLockedQuantity();
                BigDecimal available = stock.getQualitity().subtract(locked);

                if (totalNeeded.compareTo(available) > 0) {
                    throw new RuntimeException("产品规格ID:" + modelId + " 总计需求 " + totalNeeded + "，可用库存 " + available + "，库存充足校验未通过");
                }
            }

            //  执行订单下所有产品的库存扣减
            for (SalesLedgerProduct p : products) {
                if (p.getProductModelId() == null) continue;
                // 使用 businessId = salesLedgerId 或当前 req.getId()
                stockUtils.substractStock(p.getProductModelId(), p.getQuantity(), StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode(), salesLedgerId);
            }
        }

        //  更新该订单下所有的发货记录状态为已发货
        LambdaUpdateWrapper<ShippingInfo> updateWrapper = new LambdaUpdateWrapper<>();
        updateWrapper.set(ShippingInfo::getStatus, "已发货")
                .eq(ShippingInfo::getSalesLedgerId, salesLedgerId);
        
        if (req != null) {
            if (req.getExpressNumber() != null) updateWrapper.set(ShippingInfo::getExpressNumber, req.getExpressNumber());
            if (req.getExpressCompany() != null) updateWrapper.set(ShippingInfo::getExpressCompany, req.getExpressCompany());
            if (req.getShippingCarNumber() != null) updateWrapper.set(ShippingInfo::getShippingCarNumber, req.getShippingCarNumber());
            if (req.getShippingDate() != null) updateWrapper.set(ShippingInfo::getShippingDate, req.getShippingDate());
        }
        this.update(updateWrapper);

        //  更新订单状态为 4-已发货
        if (!Integer.valueOf(4).equals(salesLedger.getDeliveryStatus())) {
            salesLedger.setDeliveryStatus(4);
            if (CollectionUtils.isEmpty(unsent)) {
                salesLedger.setDeliveryStatus(5);
            salesLedgerMapper.updateById(salesLedger);
        }
        }

        //  迁移当前记录涉及的文件
        if (req != null && req.getId() != null && CollectionUtils.isNotEmpty(req.getTempFileIds())) {
        // 迁移文件
        if(CollectionUtils.isNotEmpty(req.getTempFileIds())){
            tempFileService.migrateTempFilesToFormal(req.getId(), req.getTempFileIds(), FileNameType.SHIP.getValue());
        }

        return true;
        return update ;
    }


    @Override
    public boolean delete(List<Long> ids) {
        List<ShippingInfo> shippingInfos = shippingInfoMapper.selectList(new LambdaQueryWrapper<ShippingInfo>()