bug3， 调整库存报错 locId为空

chen.lin

2 天以前 e74b573ca564027c78406354dd3797bb3e36de35

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/ReviseLogServiceImpl.java

@@ -8,6 +8,7 @@
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.CommonExceStatus;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.manager.mapper.ReviseLogMapper;
import com.vincent.rsf.server.manager.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -19,6 +20,7 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;

@Service("reviseLogService")
@@ -35,11 +37,13 @@

    @Autowired
    private LocService locService;

    @Autowired
    private ReviseLogItemService reviseLogItemService;

    /**
     * 库存调整单明细添加
     *
     * @param revise
     * @param loginUserId
     * @return
@@ -62,11 +66,29 @@
                    .setReviseId(locRevise.getId())
                    .setCreateBy(loginUserId)
                    .setUpdateBy(loginUserId)
                    .setReviseCode(locRevise.getCode()) ;
                    .setReviseCode(locRevise.getCode());
            if (!reviseLogService.save(reviseLog)) {
                throw new CoolException("调整单明细保存失败！！");
            }

            List<LocItem> locItems = locItemService.list(new LambdaQueryWrapper<LocItem>()
                    .eq(LocItem::getLocCode, item.getLocCode()));
            if (!locItems.isEmpty()) {
                locItems.forEach(ote -> {
                    ReviseLogItem logItem = new ReviseLogItem();
                    BeanUtils.copyProperties(ote, logItem);
                    logItem.setReviseLogId(reviseLog.getId());
                    if (!reviseLogItemService.save(logItem)) {
                        throw new CoolException("明细保存失败！！");
                    }
                });
            }

            Double sum = locItems.stream().mapToDouble(LocItem::getAnfme).sum();

            locRevise.setAnfme(Math.round((sum + locRevise.getAnfme()) * 1000000) / 1000000.0);
        });

        locRevise.setExceStatus(CommonExceStatus.COMMON_EXCE_STATUS_UN_EXCE.val);

        if (!locReviseService.updateById(locRevise)) {
@@ -91,45 +113,67 @@
        if (!revise.getExceStatus().equals(CommonExceStatus.COMMON_EXCE_STATUS_EXCE_ING.val)) {
            throw new CoolException("单据状态未执行或已完成，无法执行完成操作！！");
        }
        ReviseLog logs = reviseLogService.getOne(new LambdaQueryWrapper<ReviseLog>().eq(ReviseLog::getReviseId, revise.getId()));
        if (Objects.isNull(logs)) {
        List<ReviseLog> logs = reviseLogService.list(new LambdaQueryWrapper<ReviseLog>().eq(ReviseLog::getReviseId, revise.getId()));
        if (logs.isEmpty()) {
            throw new CoolException("库存日志不存在！！");
        }
        List<ReviseLogItem> logItems = reviseLogItemService.list(new LambdaQueryWrapper<ReviseLogItem>().eq(ReviseLogItem::getReviseLogId, logs.getId()));
        Map<Long, List<ReviseLogItem>> listMap = logItems.stream().collect(Collectors.groupingBy(ReviseLogItem::getLocId));
        listMap.keySet().forEach(items -> {
            Loc loc = locService.getById(items);
            if (Objects.isNull(loc)) {
                throw new CoolException("库位不存在！！");
        Set<Long> longs = logs.stream().map(ReviseLog::getId).collect(Collectors.toSet());
        List<ReviseLogItem> logItems = reviseLogItemService.list(new LambdaQueryWrapper<ReviseLogItem>().in(ReviseLogItem::getReviseLogId, longs));
        if (logItems.isEmpty()) {
            throw new CoolException("调整明细为空!!");
        }
        // 按库位ID分组，如果locId为null则按locCode分组
        Map<String, List<ReviseLogItem>> listMap = logItems.stream()
                .filter(item -> item.getLocCode() != null && !item.getLocCode().isEmpty())
                .collect(Collectors.groupingBy(item -> {
                    // 优先使用locId，如果为null则使用locCode作为key
                    return item.getLocId() != null ? String.valueOf(item.getLocId()) : item.getLocCode();
                }));
        
        listMap.keySet().forEach(key -> {
            List<ReviseLogItem> reviseItems = listMap.get(key);
            if (Objects.isNull(reviseItems) || reviseItems.isEmpty()) {
                throw new CoolException("调整明细为空！！");
            }
            listMap.get(items).forEach(logItem -> {
                LocItem one = locItemService.getOne(new LambdaQueryWrapper<LocItem>()
                        .eq(LocItem::getMatnrId, logItem.getMatnrId())
                        .eq(StringUtils.isNotBlank(logItem.getBatch()), LocItem::getBatch, logItem.getBatch())
                        .eq(StringUtils.isNotBlank(logItem.getFieldsIndex()), LocItem::getFieldsIndex, logItem.getFieldsIndex())
                        .eq(LocItem::getLocCode, logItem.getLocCode()));
                if (Objects.isNull(one)) {
                    LocItem locDetl = new LocItem();
                    BeanUtils.copyProperties(logItem, locDetl);
                    locDetl.setLocId(loc.getId())
                            .setType(OrderType.ORDER_REVISE.type)
                            .setLocCode(loc.getCode())
                            .setAnfme(logItem.getReviseQty())
                            .setUpdateBy(loginUserId)
                            .setId(null)
                            .setCreateBy(loginUserId);
                    if (!locItemService.save(locDetl)) {
                        throw new CoolException("库存明细保存失败！！");
                    }
                } else {
                    one.setAnfme(logItem.getReviseQty());
                    if (!locItemService.updateById(one)) {
                        throw new CoolException("库存明细修改失败！！");
                    }
            
            // 获取第一个明细的库位信息
            ReviseLogItem firstItem = reviseItems.get(0);
            String locCode = firstItem.getLocCode();
            Long locId = firstItem.getLocId();
            
            // 查询库位：优先使用locId，如果为null则使用locCode
            Loc loc = null;
            if (locId != null) {
                loc = locService.getById(locId);
            }
            if (loc == null && locCode != null && !locCode.isEmpty()) {
                loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, locCode).eq(Loc::getDeleted, 0));
            }
            
            if (Objects.isNull(loc)) {
                throw new CoolException("库位不存在！库位编码:" + locCode + ", 库位ID:" + locId);
            }
            
            // 删除原库位的库存明细（如果存在）
            locItemService.remove(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocId, loc.getId()));

            Loc finalLoc = loc;
            reviseItems.forEach(logItem -> {
                LocItem locDetl = new LocItem();
                BeanUtils.copyProperties(logItem, locDetl);
                locDetl.setLocId(finalLoc.getId())
                        .setType(OrderType.ORDER_REVISE.type)
                        .setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_STOCK_REVISE.type))
                        .setLocCode(finalLoc.getCode())
                        .setAnfme(logItem.getReviseQty())
                        .setUpdateBy(loginUserId)
                        .setId(null)
                        .setCreateBy(loginUserId);
                if (!locItemService.save(locDetl)) {
                    throw new CoolException("库存明细保存失败！！");
                }
            });
        });

        revise.setExceStatus(CommonExceStatus.COMMON_EXCE_STATUS_TASK_DONE.val);
        if (!locReviseService.updateById(revise)) {
            throw new CoolException("调整单修改失败！！");