feat(crm): 添加客户权限过滤功能并实现销售订单客户权限控制

云

5 天以前 84ac2b6b12bc3e5de072661fb25e87877c01d0d7

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java

@@ -5,22 +5,31 @@
import cn.hutool.core.util.ObjUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.SetUtils;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockAdjustReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockFreezeReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockListReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockPageReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemTypeDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialstock.MesWmMaterialStockDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.materialstock.MesWmMaterialStockMapper;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemTypeService;
import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
import cn.iocoder.yudao.module.mes.controller.admin.wm.batch.vo.MesWmBatchGenerateReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;

import java.math.BigDecimal;
@@ -42,7 +51,7 @@
    private MesWmMaterialStockMapper materialStockMapper;

    @Resource
    private MesMdItemService itemService;
    private MesMdmItemService mdmItemService;
    @Resource
    private MesMdItemTypeService itemTypeService;
    @Resource
@@ -50,6 +59,12 @@
    @Resource
    @Lazy
    private MesWmWarehouseService warehouseService;
    @Resource
    @Lazy
    private MesWmTransactionService wmTransactionService;
    @Resource
    @Lazy
    private MesWmBatchService batchService;

    @Override
    public MesWmMaterialStockDO getMaterialStock(Long id) {
@@ -156,9 +171,9 @@
        }

        // 2. 不存在则新建
        MesMdItemDO item = itemService.validateItemExists(itemId);
        MesMdmItemDO item = mdmItemService.validateItemExists(itemId);
        MesWmMaterialStockDO newStock = MesWmMaterialStockDO.builder()
                .itemId(itemId).itemTypeId(item.getItemTypeId())
                .itemId(itemId).itemTypeId(item.getCategoryId())
                .warehouseId(warehouseId).locationId(locationId).areaId(areaId)
                .batchId(batchId).batchCode(batchCode).vendorId(vendorId)
                .quantity(BigDecimal.ZERO) // 初始数量为 0，由 updateMaterialStockQuantity 更新
@@ -232,4 +247,157 @@
        return stock;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Long adjustMaterialStockIn(MesWmMaterialStockAdjustReqVO reqVO) {
        return doAdjustMaterialStock(reqVO, true);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Long adjustMaterialStockOut(MesWmMaterialStockAdjustReqVO reqVO) {
        return doAdjustMaterialStock(reqVO, false);
    }

    /**
     * 执行库存调整
     *
     * @param reqVO     调整请求
     * @param isInbound 是否为入库（true=入库，false=出库）
     * @return 库存记录ID
     */
    private Long doAdjustMaterialStock(MesWmMaterialStockAdjustReqVO reqVO, boolean isInbound) {
        // 1. 校验物料存在且启用
        MesMdmItemDO item = mdmItemService.validateItemExistsAndEnable(reqVO.getItemId());

        // 2. 处理批次（仅入库时需要处理批次）
        Long batchId = reqVO.getBatchId();
        String batchCode = reqVO.getBatchCode();
        if (isInbound) {
            MesWmBatchDO batch = resolveBatch(reqVO, item);
            if (batch != null) {
                batchId = batch.getId();
                batchCode = batch.getCode();
            }
        } else {
            // 出库时校验批次存在
            if (batchId != null) {
                batchService.validateBatchExists(batchId, reqVO.getItemId());
            }
        }

        // 3. 校验库位混放规则
        checkAreaMixingRule(reqVO.getAreaId(), reqVO.getItemId(), batchId);

        // 4. 获取或创建库存记录
        MesWmMaterialStockDO stock = getOrCreateMaterialStock(
                reqVO.getItemId(),
                reqVO.getWarehouseId(),
                reqVO.getLocationId(),
                reqVO.getAreaId(),
                batchId,
                batchCode,
                reqVO.getVendorId(),
                LocalDateTime.now()
        );

        // 5. 计算变动数量：入库为正，出库为负
        BigDecimal quantity = isInbound ? reqVO.getQuantity() : reqVO.getQuantity().negate();

        // 6. 创建库存事务流水（内部会更新库存数量）
        int bizType = isInbound ? MesBizTypeConstants.WM_STOCK_ADJUST_IN : MesBizTypeConstants.WM_STOCK_ADJUST_OUT;
        MesWmTransactionSaveReqDTO transaction = new MesWmTransactionSaveReqDTO()
                .setType(isInbound ? MesWmTransactionTypeEnum.IN.getType() : MesWmTransactionTypeEnum.OUT.getType())
                .setBizType(bizType)
                .setBizId(stock.getId())
                .setBizCode("STOCK_ADJUST_" + stock.getId())
                .setBizLineId(stock.getId())
                .setItemId(reqVO.getItemId())
                .setQuantity(quantity)
                .setBatchId(batchId)
                .setBatchCode(batchCode)
                .setWarehouseId(reqVO.getWarehouseId())
                .setLocationId(reqVO.getLocationId())
                .setAreaId(reqVO.getAreaId())
                .setVendorId(reqVO.getVendorId())
                .setReceiptTime(LocalDateTime.now())
                .setCheckFlag(!isInbound);
        wmTransactionService.createTransaction(transaction);

        return stock.getId();
    }

    /**
     * 解析批次
     * <p>
     * 入库时的批次处理逻辑：
     * 1. 物料未启用批次管理：返回 null
     * 2. 传入 batchId：校验并使用已有批次
     * 3. 未传 batchId：根据 batchCode 等参数自动创建批次
     *
     * @param reqVO 入库请求
     * @param item  物料信息
     * @return 批次记录（物料未启用批次管理时返回 null）
     */
    private MesWmBatchDO resolveBatch(MesWmMaterialStockAdjustReqVO reqVO, MesMdmItemDO item) {
        // 1. 物料未启用批次管理，返回 null
        if (Boolean.FALSE.equals(item.getIsBatchManaged())) {
            return null;
        }

        // 2. 传入 batchId，校验并返回已有批次
        if (reqVO.getBatchId() != null) {
            return batchService.validateBatchExists(reqVO.getBatchId(), reqVO.getItemId());
        }

        // 3. 未传 batchId，自动创建批次
        MesWmBatchGenerateReqVO batchReqVO = new MesWmBatchGenerateReqVO()
                .setItemId(reqVO.getItemId())
                .setBatchCode(reqVO.getBatchCode())
                .setVendorId(reqVO.getVendorId())
                .setProduceDate(reqVO.getProduceDate() != null ? reqVO.getProduceDate().atStartOfDay() : null)
                .setExpireDate(reqVO.getExpireDate() != null ? reqVO.getExpireDate().atStartOfDay() : null)
                .setReceiptDate(LocalDateTime.now())
                .setLotNumber(reqVO.getLotNumber())
                .setQualityStatus(parseQualityStatus(reqVO.getQualityStatus()));
        return batchService.getOrGenerateBatchCode(batchReqVO);
    }

    /**
     * 解析质量状态（支持数字或字符串）
     */
    private Integer parseQualityStatus(Object qualityStatus) {
        if (qualityStatus == null) {
            return null;
        }
        if (qualityStatus instanceof Integer) {
            return (Integer) qualityStatus;
        }
        if (qualityStatus instanceof String) {
            String str = (String) qualityStatus;
            // 支持数字字符串
            if (str.matches("\\d+")) {
                return Integer.parseInt(str);
            }
            // 支持常见字符串映射
            switch (str.toUpperCase()) {
                case "PENDING":
                case "待检验":
                case "待检":
                    return 0;
                case "PASS":
                case "QUALIFIED":
                case "合格":
                    return 1;
                case "FAIL":
                case "UNQUALIFIED":
                case "不合格":
                    return 2;
                default:
                    throw new IllegalArgumentException("无效的质量状态: " + str);
            }
        }
        throw new IllegalArgumentException("无效的质量状态类型: " + qualityStatus.getClass().getName());
    }

}