dj修改

cl

2026-04-20 48ebc3e1120c4d72ea490167b9705208edc79071

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

@@ -137,7 +137,7 @@
    @Autowired
    private BasContainerService basContainerService;
    @Autowired
    private CusItemSyncViewQueryService cusItemSyncViewQueryService;
    private CusBarcodeSyncViewQueryService cusBarcodeSyncViewQueryService;

    /**
     * @return
@@ -877,7 +877,18 @@
        return R.ok(list);
    }

    /** 组托扫物料优先查视图，命中后同步本地物料 */
    private Matnr findLocalMatnrByCode(String matnrCode) {
        String t = StringUtils.trimToNull(matnrCode);
        if (t == null) {
            return null;
        }
        return matnrMapper.selectOne(new LambdaQueryWrapper<Matnr>()
                .eq(Matnr::getCode, t)
                .eq(Matnr::getDeleted, 0)
                .last("LIMIT 1"));
    }

    /** 组托：先查视图 barcode（物料号），再 man_matnr.code 等值 */
    private Matnr getMatnrByCodePreferView(String matnrCode) {
        String code = StringUtils.trimToNull(matnrCode);
        if (code == null) {
@@ -885,30 +896,29 @@
        }
        List<Map<String, Object>> viewItems = null;
        try {
            viewItems = cusItemSyncViewQueryService.listByItemNos(Collections.singletonList(code));
            viewItems = cusBarcodeSyncViewQueryService.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))))
                    .filter(v -> CusBarcodeSyncViewQueryService.rowMatchesOrderMatnr(code, Objects.toString(v.get("barcode"), 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;
            return findLocalMatnrByCode(code);
        }
        String fullCode = CusBarcodeSyncViewQueryService.matnrCodeFromBarcode(Objects.toString(row.get("barcode"), null));
        Matnr local = findLocalMatnrByCode(fullCode);
        String viewSpec = StringUtils.trimToEmpty(Objects.toString(row.get("item_spec"), ""));
        String viewUnit = StringUtils.trimToNull(Objects.toString(row.get("unit_no"), null));
        String viewName = StringUtils.trimToNull(Objects.toString(row.get("item_name"), null));
        if (local == null) {
            Matnr matnr = new Matnr();
            matnr.setCode(code)
            matnr.setCode(fullCode)
                    .setBatch("")
                    .setName(code)
                    .setName(viewName != null ? viewName : fullCode)
                    .setSpec(viewSpec)
                    .setUnit(viewUnit)
                    .setStockUnit(viewUnit)