feat: 打通销售采购财务闭环并完成累计业务优化

gaoluyang

8 天以前 d39e4f7d839167c16425086dfa2f8747bccfdff9

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java

@@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.mes.dal.mysql.wm.materialstock;

import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockListReqVO;
@@ -19,6 +20,11 @@
@Mapper
public interface MesWmMaterialStockMapper extends BaseMapperX<MesWmMaterialStockDO> {

    default MesWmMaterialStockDO lockById(Long id) {
        return selectOne(new LambdaQueryWrapperX<MesWmMaterialStockDO>()
                .eq(MesWmMaterialStockDO::getId, id).last("FOR UPDATE"));
    }

    default PageResult<MesWmMaterialStockDO> selectPage(MesWmMaterialStockPageReqVO reqVO,
                                                         Collection<Long> itemTypeIds,
                                                         Collection<Long> itemIds,
@@ -26,6 +32,7 @@
        LambdaQueryWrapperX<MesWmMaterialStockDO> wrapper = new LambdaQueryWrapperX<MesWmMaterialStockDO>()
                .inIfPresent(MesWmMaterialStockDO::getItemTypeId, itemTypeIds)
                .inIfPresent(MesWmMaterialStockDO::getItemId, itemIds)
                .eqIfPresent(MesWmMaterialStockDO::getItemId, reqVO.getMdmItemId())
                .likeIfPresent(MesWmMaterialStockDO::getBatchCode, reqVO.getBatchCode())
                .eqIfPresent(MesWmMaterialStockDO::getBatchId, reqVO.getBatchId())
                .eqIfPresent(MesWmMaterialStockDO::getWarehouseId, reqVO.getWarehouseId())
@@ -33,6 +40,14 @@
                .eqIfPresent(MesWmMaterialStockDO::getAreaId, reqVO.getAreaId())
                .eqIfPresent(MesWmMaterialStockDO::getVendorId, reqVO.getVendorId())
                .eqIfPresent(MesWmMaterialStockDO::getFrozen, reqVO.getFrozen());
        if (StrUtil.isNotBlank(reqVO.getItemName())) {
            String keyword = "%" + reqVO.getItemName().trim() + "%";
            wrapper.apply("item_id IN (SELECT id FROM mdm_item WHERE (name LIKE {0} OR code LIKE {0}) AND deleted = 0)", keyword);
        }
        if (StrUtil.isNotBlank(reqVO.getVendorName())) {
            wrapper.apply("vendor_id IN (SELECT id FROM srm_supplier WHERE name LIKE {0} AND deleted = 0)",
                    "%" + reqVO.getVendorName().trim() + "%");
        }
        wrapper.ne(MesWmMaterialStockDO::getQuantity, BigDecimal.ZERO)
                .orderByAsc(MesWmMaterialStockDO::getReceiptTime);
        // 虚拟仓过滤（Service 层已将 virtualFilter 解析为 virtualWarehouseId）
@@ -99,8 +114,7 @@
                .setSql("reserved_quantity = reserved_quantity + " + count);
        if (checkFlag && count.compareTo(BigDecimal.ZERO) > 0) {
            // 校验可用量充足：quantity - frozen_quantity - reserved_quantity >= count
            updateWrapper.setSql("reserved_quantity = reserved_quantity + " + count +
                    " WHERE quantity - IFNULL(frozen_quantity, 0) - IFNULL(reserved_quantity, 0) >= " + count);
            updateWrapper.apply("quantity - IFNULL(frozen_quantity, 0) - IFNULL(reserved_quantity, 0) >= {0}", count);
        }
        return update(null, updateWrapper);
    }
@@ -138,12 +152,35 @@
        } else {
            wrapper.isNull(MesWmMaterialStockDO::getBatchId);
        }
        // vendorId=null 时精确匹配 is null
        // vendorId=null 时不限制，匹配任意供应商的库存
        // （避免因供应商维度拆分，OUT 事务找不到真正有库存的记录而扣错到 vendor_id IS NULL 的记录）
        if (vendorId != null) {
            wrapper.eq(MesWmMaterialStockDO::getVendorId, vendorId);
        } else {
            wrapper.isNull(MesWmMaterialStockDO::getVendorId);
        }
        // 多记录时优先取库存量最多的（避免扣到零库存或负库存的记录）
        wrapper.last("ORDER BY quantity DESC LIMIT 1");
        return selectOne(wrapper);
    }

    /**
     * 按组合键查询库存记录（忽略供应商维度）
     *
     * 用于移库场景：移库时将库存合并到目标库位已有库存，不区分供应商
     */
    default MesWmMaterialStockDO selectByCompositeKeyIgnoreVendor(Long itemId, Long warehouseId, Long locationId,
                                                                    Long areaId, Long batchId) {
        LambdaQueryWrapperX<MesWmMaterialStockDO> wrapper = new LambdaQueryWrapperX<MesWmMaterialStockDO>()
                .eq(MesWmMaterialStockDO::getItemId, itemId)
                .eq(MesWmMaterialStockDO::getWarehouseId, warehouseId)
                .eq(MesWmMaterialStockDO::getLocationId, locationId)
                .eq(MesWmMaterialStockDO::getAreaId, areaId);
        // batchId=null 时精确匹配 is null
        if (batchId != null) {
            wrapper.eq(MesWmMaterialStockDO::getBatchId, batchId);
        } else {
            wrapper.isNull(MesWmMaterialStockDO::getBatchId);
        }
        wrapper.last("LIMIT 1");
        return selectOne(wrapper);
    }

@@ -162,4 +199,16 @@
                .orderByAsc(MesWmMaterialStockDO::getReceiptTime));
    }

    /**
     * 按物料编号批量查询库存记录（用于物料需求库存校验）
     */
    default List<MesWmMaterialStockDO> selectListByItemIds(Collection<Long> itemIds) {
        if (itemIds == null || itemIds.isEmpty()) {
            return java.util.Collections.emptyList();
        }
        return selectList(new LambdaQueryWrapperX<MesWmMaterialStockDO>()
                .in(MesWmMaterialStockDO::getItemId, itemIds)
                .ne(MesWmMaterialStockDO::getQuantity, BigDecimal.ZERO));
    }

}