blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
liyong
9 天以前 1ab2b329a40decba8ff7eefbeb158ff259aceb6d 
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java


@@ -5,22 +5,28 @@


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.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 +48,7 @@


    private MesWmMaterialStockMapper materialStockMapper;




    @Resource


    private MesMdItemService itemService;


    private MesMdmItemService mdmItemService;


    @Resource


    private MesMdItemTypeService itemTypeService;


    @Resource


@@ -50,6 +56,9 @@


    @Resource


    @Lazy


    private MesWmWarehouseService warehouseService;


    @Resource


    @Lazy


    private MesWmTransactionService wmTransactionService;




    @Override


    public MesWmMaterialStockDO getMaterialStock(Long id) {


@@ -148,17 +157,17 @@


    @Override


    public MesWmMaterialStockDO getOrCreateMaterialStock(Long itemId, Long warehouseId, Long locationId, Long areaId,


                                                         Long batchId, String batchCode, Long vendorId, LocalDateTime receiptTime) {


        // 1. 查找已有库存记录


        // 1. 查找已有库存记录（vendorId 参与唯一键）


        MesWmMaterialStockDO stock = materialStockMapper.selectByCompositeKey(


                itemId, warehouseId, locationId, areaId, batchId);


                itemId, warehouseId, locationId, areaId, batchId, vendorId);


        if (stock != null) {


            return stock;


        }




        // 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 +241,71 @@


        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. 校验库位混放规则


        checkAreaMixingRule(reqVO.getAreaId(), reqVO.getItemId(), reqVO.getBatchId());




        // 3. 获取或创建库存记录


        MesWmMaterialStockDO stock = getOrCreateMaterialStock(


                reqVO.getItemId(),


                reqVO.getWarehouseId(),


                reqVO.getLocationId(),


                reqVO.getAreaId(),


                reqVO.getBatchId(),


                reqVO.getBatchCode(),


                reqVO.getVendorId(),


                LocalDateTime.now()


        );




        // 4. 计算变动数量：入库为正，出库为负


        BigDecimal quantity = isInbound ? reqVO.getQuantity() : reqVO.getQuantity().negate();




        // 5. 更新库存数量（出库时校验库存充足）


        updateMaterialStockQuantity(stock.getId(), quantity, !isInbound);




        // 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(reqVO.getBatchId())


                .setBatchCode(reqVO.getBatchCode())


                .setWarehouseId(reqVO.getWarehouseId())


                .setLocationId(reqVO.getLocationId())


                .setAreaId(reqVO.getAreaId())


                .setVendorId(reqVO.getVendorId())


                .setReceiptTime(LocalDateTime.now())


                .setCheckFlag(!isInbound);


        wmTransactionService.createTransaction(transaction);




        return stock.getId();


    }




}