13 小时以前 eccad5a129106377a275be4f7cdc58e99e9b95d4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferServiceImpl.java
@@ -10,6 +10,7 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.transfer.MesWmTransferDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.transfer.MesWmTransferDetailDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.transfer.MesWmTransferLineDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialstock.MesWmMaterialStockDO;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.transfer.MesWmTransferMapper;
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
@@ -189,20 +190,33 @@
        // 2. 遍历行和对应的明细,创建事务
        for (MesWmTransferLineDO line : lines) {
            List<MesWmTransferDetailDO> details = detailMap.getOrDefault(line.getId(), Collections.emptyList());
            // 从 materialStockId 获取源库存信息(包括 vendor_id, batch_id 等)
            Long vendorId = null;
            String batchCode = null;
            if (line.getMaterialStockId() != null) {
                MesWmMaterialStockDO sourceStock = materialStockService.getMaterialStock(line.getMaterialStockId());
                if (sourceStock != null) {
                    vendorId = sourceStock.getVendorId();
                    batchCode = sourceStock.getBatchCode();
                }
            }
            for (MesWmTransferDetailDO detail : details) {
                // 2.1 先执行出库:调拨移出(从源仓库扣减库存),出库数量基于当前明细的数量
                Long outTransactionId = wmTransactionService.createTransaction(new MesWmTransactionSaveReqDTO()
                        .setType(MesWmTransactionTypeEnum.MOVE_OUT.getType()).setItemId(line.getItemId())
                        .setQuantity(detail.getQuantity().negate()) // 库存减少(按 detail 的数量出)
                        .setBatchId(line.getBatchId())
                        .setBatchId(line.getBatchId()).setBatchCode(batchCode)
                        .setVendorId(vendorId)
                        .setMaterialStockId(line.getMaterialStockId())
                        .setWarehouseId(line.getFromWarehouseId()).setLocationId(line.getFromLocationId()).setAreaId(line.getFromAreaId())
                        .setBizType(MesBizTypeConstants.WM_TRANSFER_OUT).setBizId(transfer.getId())
                        .setBizCode(transfer.getCode()).setBizLineId(line.getId()));
                // 2.2 再执行入库:调拨移入(向目标仓库增加库存),入库数量等于相同明细的数量
                // 注意:入库时不传 vendorId,以忽略供应商维度,合并到目标库位已有库存
                wmTransactionService.createTransaction(new MesWmTransactionSaveReqDTO()
                        .setType(MesWmTransactionTypeEnum.MOVE_IN.getType()).setItemId(line.getItemId()) // 物料信息来自 line
                        .setQuantity(detail.getQuantity()) // 库存增加(按 detail 的数量入)
                        .setBatchId(line.getBatchId()) // 批次信息来自 line
                        .setBatchId(line.getBatchId()).setBatchCode(batchCode) // 批次信息来自 line
                        .setWarehouseId(detail.getToWarehouseId()).setLocationId(detail.getToLocationId()).setAreaId(detail.getToAreaId())
                        .setBizType(MesBizTypeConstants.WM_TRANSFER_IN).setBizId(transfer.getId())
                        .setBizCode(transfer.getCode()).setBizLineId(line.getId())