视图兼容

cl

2026-04-17 5936c125b47d34ed1bb85bd0ddba4cb4052c865f

视图兼容

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java

@@ -136,6 +136,8 @@
    private OutStockService outStockService;
    @Autowired
    private BasContainerService basContainerService;
    @Autowired
    private CusItemSyncViewQueryService cusItemSyncViewQueryService;

    /**
     * @return
@@ -600,10 +602,11 @@
            logger.info("=== 从物料信息表查询物料信息（不查询收货区） ===");
            logger.info("查询参数 - matnrCode: {}", matnrCode);
            
            Matnr matnr = matnrMapper.selectOne(new LambdaQueryWrapper<Matnr>()
                    .eq(Matnr::getCode, matnrCode)
                    .eq(Matnr::getDeleted, 0)
                    .last("LIMIT 1"));
            // Matnr matnr = matnrMapper.selectOne(new LambdaQueryWrapper<Matnr>()
            //         .eq(Matnr::getCode, matnrCode)
            //         .eq(Matnr::getDeleted, 0)
            //         .last("LIMIT 1"));
            Matnr matnr = getMatnrByCodePreferView(matnrCode);
            
            if (matnr == null) {
                logger.warn("物料信息表中未找到物料编码: {}", matnrCode);
@@ -831,10 +834,11 @@
            if (!matnrCodes.isEmpty()) {
                Map<String, Matnr> matnrMap = new HashMap<>();
                for (String matCode : matnrCodes) {
                    Matnr matnr = matnrMapper.selectOne(new LambdaQueryWrapper<Matnr>()
                            .eq(Matnr::getCode, matCode)
                            .eq(Matnr::getDeleted, 0)
                            .last("LIMIT 1"));
                    // Matnr matnr = matnrMapper.selectOne(new LambdaQueryWrapper<Matnr>()
                    //         .eq(Matnr::getCode, matCode)
                    //         .eq(Matnr::getDeleted, 0)
                    //         .last("LIMIT 1"));
                    Matnr matnr = getMatnrByCodePreferView(matCode);
                    if (matnr != null) {
                        matnrMap.put(matCode, matnr);
                    }
@@ -873,6 +877,77 @@
        return R.ok(list);
    }

    /** 组托扫物料优先查视图，命中后同步本地物料 */
    private Matnr getMatnrByCodePreferView(String matnrCode) {
        String code = StringUtils.trimToNull(matnrCode);
        if (code == null) {
            return null;
        }
        List<Map<String, Object>> viewItems = null;
        try {
            viewItems = cusItemSyncViewQueryService.listByItemNos(Collections.singletonList(code));
        } catch (Exception ignore) {
        }
        Map<String, Object> row = null;
        if (viewItems != null) {
            row = viewItems.stream()
                    .filter(v -> StringUtils.equals(code, StringUtils.trimToNull(Objects.toString(v.get("item_no"), null))))
                    .findFirst()
                    .orElse(null);
        }
        Matnr local = matnrMapper.selectOne(new LambdaQueryWrapper<Matnr>()
                .eq(Matnr::getCode, code)
                .eq(Matnr::getDeleted, 0)
                .last("LIMIT 1"));
        if (row == null) {
            return local;
        }
        String viewSpec = StringUtils.trimToEmpty(Objects.toString(row.get("item_spec"), ""));
        String viewUnit = StringUtils.trimToNull(Objects.toString(row.get("unit_no"), null));
        if (local == null) {
            Matnr matnr = new Matnr();
            matnr.setCode(code)
                    .setBatch("")
                    .setName(code)
                    .setSpec(viewSpec)
                    .setUnit(viewUnit)
                    .setStockUnit(viewUnit)
                    .setStatus(1)
                    .setDeleted(0)
                    .setCreateBy(1L)
                    .setUpdateBy(1L)
                    .setCreateTime(new Date())
                    .setUpdateTime(new Date());
            if (matnrMapper.insert(matnr) <= 0) {
                throw new CoolException("物料信息保存失败");
            }
            return matnr;
        }
        boolean specDiff = !StringUtils.equals(StringUtils.trimToEmpty(local.getSpec()), viewSpec);
        boolean unitDiff = viewUnit != null
                && (!StringUtils.equals(StringUtils.trimToEmpty(local.getUnit()), viewUnit)
                || !StringUtils.equals(StringUtils.trimToEmpty(local.getStockUnit()), viewUnit));
        if (specDiff || unitDiff) {
            Matnr update = new Matnr();
            update.setId(local.getId());
            if (specDiff) {
                update.setSpec(viewSpec);
                local.setSpec(viewSpec);
            }
            if (unitDiff) {
                update.setUnit(viewUnit);
                update.setStockUnit(viewUnit);
                local.setUnit(viewUnit);
                local.setStockUnit(viewUnit);
            }
            update.setUpdateBy(1L).setUpdateTime(new Date());
            if (matnrMapper.updateById(update) <= 0) {
                throw new CoolException("物料信息更新失败");
            }
        }
        return local;
    }

    /**
     * @param
     * @param userId