feat(mes): 实现库存移库功能

云

18 小时以前 eccad5a129106377a275be4f7cdc58e99e9b95d4

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

@@ -8,7 +8,9 @@
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.MesWmMaterialStockMoveReqVO;
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;
@@ -17,6 +19,7 @@
import cn.iocoder.yudao.module.mes.dal.mysql.wm.materialstock.MesWmMaterialStockMapper;
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
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;
@@ -52,6 +55,8 @@

    @Resource
    private MesMdmItemService mdmItemService;
    @Resource
    private MesMdItemService mdItemService;
    @Resource
    private MesMdItemTypeService itemTypeService;
    @Resource
@@ -94,10 +99,13 @@
            List<MesMdItemTypeDO> children = itemTypeService.getItemTypeChildrenList(pageReqVO.getItemTypeId());
            itemTypeIds.addAll(convertSet(children, MesMdItemTypeDO::getId));
        }
        // 1.2 解析 itemId
        // 1.2 解析 itemId：前端传的是 mes_md_item.id，库存表存的是 mdm_item_id，需要转换
        Set<Long> itemIds = null;
        if (pageReqVO.getItemId() != null) {
            itemIds = SetUtils.asSet(pageReqVO.getItemId());
            MesMdItemDO item = mdItemService.getItem(pageReqVO.getItemId());
            if (item != null && item.getMdmItemId() != null) {
                itemIds = SetUtils.asSet(item.getMdmItemId());
            }
        }
        // 1.3 解析 virtualFilter：转换为虚拟仓 warehouseId
        Long virtualWarehouseId = null;
@@ -181,7 +189,15 @@
                .frozen(false)
                .build();
        materialStockMapper.insert(newStock);
        return newStock;
        // 3. 重新查询，确保拿到数据库生成的完整记录（id、createTime 等）
        MesWmMaterialStockDO inserted = materialStockMapper.selectById(newStock.getId());
        return inserted != null ? inserted : newStock;
    }

    @Override
    public MesWmMaterialStockDO getMaterialStockByCompositeKey(Long itemId, Long warehouseId, Long locationId, Long areaId,
                                                                Long batchId, Long vendorId) {
        return materialStockMapper.selectByCompositeKey(itemId, warehouseId, locationId, areaId, batchId, vendorId);
    }

    @Override
@@ -400,4 +416,82 @@
        throw new IllegalArgumentException("无效的质量状态类型: " + qualityStatus.getClass().getName());
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void moveMaterialStock(MesWmMaterialStockMoveReqVO reqVO) {
        // 1. 查询原库存记录
        MesWmMaterialStockDO sourceStock = validateMaterialStockExists(reqVO.getMaterialStockId());

        // 2. 校验库存数量充足（可用量 = 在库数量 - 冻结数量 - 占用量）
        BigDecimal availableQty = sourceStock.getQuantity() != null ? sourceStock.getQuantity() : BigDecimal.ZERO;
        if (sourceStock.getFrozenQuantity() != null) {
            availableQty = availableQty.subtract(sourceStock.getFrozenQuantity());
        }
        if (sourceStock.getReservedQuantity() != null) {
            availableQty = availableQty.subtract(sourceStock.getReservedQuantity());
        }
        if (availableQty.compareTo(reqVO.getQuantity()) < 0) {
            throw exception(WM_MATERIAL_STOCK_INSUFFICIENT);
        }

        // 3. 校验库存未冻结
        if (Boolean.TRUE.equals(sourceStock.getFrozen())) {
            throw exception(WM_MATERIAL_STOCK_FROZEN);
        }

        // 4. 校验目标库位混放规则
        checkAreaMixingRule(reqVO.getToAreaId(), sourceStock.getItemId(), sourceStock.getBatchId());

        // 5. 生成移库单号
        String moveCode = "MOVE_" + System.currentTimeMillis();

        // 6. 创建调拨移出事务（负数）
        MesWmTransactionSaveReqDTO outTransaction = new MesWmTransactionSaveReqDTO()
                .setType(MesWmTransactionTypeEnum.MOVE_OUT.getType())
                .setBizType(MesBizTypeConstants.WM_TRANSFER_OUT)
                .setBizId(sourceStock.getId())
                .setBizCode(moveCode)
                .setBizLineId(sourceStock.getId())
                .setItemId(sourceStock.getItemId())
                .setQuantity(reqVO.getQuantity().negate())
                .setBatchId(sourceStock.getBatchId())
                .setBatchCode(sourceStock.getBatchCode())
                .setWarehouseId(sourceStock.getWarehouseId())
                .setLocationId(sourceStock.getLocationId())
                .setAreaId(sourceStock.getAreaId())
                .setVendorId(sourceStock.getVendorId())
                .setMaterialStockId(sourceStock.getId())
                .setCheckFlag(true);
        Long outTransactionId = wmTransactionService.createTransaction(outTransaction);

        // 7. 查找目标库位的库存记录（忽略供应商），用于合并库存
        MesWmMaterialStockDO targetStock = materialStockMapper.selectByCompositeKeyIgnoreVendor(
                sourceStock.getItemId(),
                reqVO.getToWarehouseId(),
                reqVO.getToLocationId(),
                reqVO.getToAreaId(),
                sourceStock.getBatchId()
        );

        // 8. 创建调拨移入事务（正数），关联出库事务
        // 使用目标库位已有库存记录的 vendorId（如果有），否则不传
        MesWmTransactionSaveReqDTO inTransaction = new MesWmTransactionSaveReqDTO()
                .setType(MesWmTransactionTypeEnum.MOVE_IN.getType())
                .setBizType(MesBizTypeConstants.WM_TRANSFER_IN)
                .setBizId(sourceStock.getId())
                .setBizCode(moveCode)
                .setBizLineId(sourceStock.getId())
                .setItemId(sourceStock.getItemId())
                .setQuantity(reqVO.getQuantity())
                .setBatchId(sourceStock.getBatchId())
                .setBatchCode(sourceStock.getBatchCode())
                .setWarehouseId(reqVO.getToWarehouseId())
                .setLocationId(reqVO.getToLocationId())
                .setAreaId(reqVO.getToAreaId())
                .setVendorId(targetStock != null ? targetStock.getVendorId() : null)
                .setRelatedTransactionId(outTransactionId)
                .setCheckFlag(false);
        wmTransactionService.createTransaction(inTransaction);
    }

}