feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑

云

2026-10-25 d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferServiceImpl.java

@@ -1,15 +1,19 @@
package cn.iocoder.yudao.module.mes.service.wm.transfer;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;

import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.mes.controller.admin.wm.transfer.vo.MesWmTransferImportExcelVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.transfer.vo.MesWmTransferImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.transfer.vo.MesWmTransferPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.transfer.vo.MesWmTransferSaveReqVO;
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;
@@ -23,9 +27,12 @@
import org.springframework.validation.annotation.Validated;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;

import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
@@ -189,20 +196,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())
@@ -322,4 +342,55 @@
        materialStockService.updateMaterialStockFrozen(materialStockIds, frozen);
    }

    @Override
    public void updateStatus(Long id, Integer status) {
        transferMapper.updateById(new MesWmTransferDO().setId(id).setStatus(status));
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public MesWmTransferImportRespVO importTransferList(List<MesWmTransferImportExcelVO> importList, boolean updateSupport) {
        if (CollUtil.isEmpty(importList)) {
            throw exception(WM_TRANSFER_IMPORT_LIST_IS_EMPTY);
        }
        MesWmTransferImportRespVO respVO = MesWmTransferImportRespVO.builder()
                .createCodes(new ArrayList<>()).updateCodes(new ArrayList<>())
                .failureCodes(new LinkedHashMap<>()).build();
        AtomicInteger index = new AtomicInteger(1);
        importList.forEach(importItem -> {
            int currentIndex = index.getAndIncrement();
            String code = importItem.getCode();
            String key = StrUtil.blankToDefault(code, "第 " + currentIndex + " 行");
            if (StrUtil.isBlank(code)) {
                respVO.getFailureCodes().put(key, "单号不能为空");
                return;
            }
            if (StrUtil.isBlank(importItem.getName())) {
                respVO.getFailureCodes().put(key, "名称不能为空");
                return;
            }
            MesWmTransferDO existing = transferMapper.selectByCode(code);
            if (existing != null && updateSupport) {
                if (!MesWmTransferStatusEnum.PREPARE.getStatus().equals(existing.getStatus())) {
                    respVO.getFailureCodes().put(key, "单据非草稿状态，不允许覆盖更新");
                    return;
                }
                MesWmTransferDO updateObj = BeanUtils.toBean(importItem, MesWmTransferDO.class);
                updateObj.setId(existing.getId());
                updateObj.setStatus(existing.getStatus());
                transferMapper.updateById(updateObj);
                respVO.getUpdateCodes().add(code);
            } else if (existing != null) {
                respVO.getFailureCodes().put(key, "单号已存在：" + code);
            } else {
                MesWmTransferDO createObj = BeanUtils.toBean(importItem, MesWmTransferDO.class);
                createObj.setId(null);
                createObj.setStatus(MesWmTransferStatusEnum.PREPARE.getStatus());
                transferMapper.insert(createObj);
                respVO.getCreateCodes().add(code);
            }
        });
        return respVO;
    }

}