日志打印增加

cl

昨天 bb36bbb0968f6f599e18a651f5e385b98c4e1532

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

@@ -1,6 +1,5 @@
package com.vincent.rsf.server.manager.service;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.controller.erp.params.SyncOrdersItem;
import com.vincent.rsf.server.manager.entity.Matnr;
@@ -13,10 +12,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -24,7 +21,9 @@
import java.util.stream.Collectors;

/**
 * cus_barcode_sync_view 与 man_matnr 同步（云仓通知单、无订单组托等共用）
 * cus_barcode_sync_view 与 man_matnr 同步（云仓通知单、无订单组托等共用）。
 * 分支仅由 {@link GlobalConfigCode#CUS_ITEM_SYNC_MODE}（sys_config.val）解析为 {@link CusItemSyncMode} 决定。
 * 副库读无事务（{@link CusBarcodeSyncViewQueryService} {@code NOT_SUPPORTED}），主库写 {@link CusBarcodeSyncMatnrApplyService} {@code REQUIRES_NEW}。
 */
@Service
@Slf4j
@@ -36,6 +35,8 @@
    private MatnrService matnrService;
    @Autowired
    private ConfigService configService;
    @Autowired
    private CusBarcodeSyncMatnrApplyService cusBarcodeSyncMatnrApplyService;

    /** 与云仓通知单同步：按明细 matnr 查视图并写入/更新物料 */
    public void syncFromOrderItems(List<SyncOrdersItem> orderItems, Long loginUserId) {
@@ -88,54 +89,118 @@
        return map;
    }

    private CusItemSyncMode resolveCusItemSyncMode() {
        Config c = configService.getOne(new LambdaQueryWrapper<Config>()
                .eq(Config::getFlag, GlobalConfigCode.CUS_ITEM_SYNC_MODE)
                .eq(Config::getDeleted, 0), false);
    /** 与分支解析共用同一份 Config（来自 ConfigService 全局缓存，避免每次同步打库） */
    private CusItemSyncConfigSnapshot resolveCusItemSyncConfig() {
        Config c = configService.getCachedOrLoad(GlobalConfigCode.CUS_ITEM_SYNC_MODE);
        if (c == null) {
            return CusItemSyncMode.NONE;
            return new CusItemSyncConfigSnapshot(CusItemSyncMode.NONE, null);
        }
        return CusItemSyncMode.fromConfig(c.getVal());
        return new CusItemSyncConfigSnapshot(CusItemSyncMode.fromConfig(c.getVal()), c.getVal());
    }

    private static String formatCfgVal(String rawVal) {
        if (rawVal == null) {
            return "(无配置)";
        }
        String t = rawVal.trim();
        return t.isEmpty() ? "(空)" : t;
    }

    private void syncAlignedWithBarcodeView(List<String> matnrCodes, Map<String, SyncOrdersItem> orderItemByCode, Long loginUserId) {
        CusItemSyncMode mode = resolveCusItemSyncMode();
        if (mode == CusItemSyncMode.NONE) {
            syncMatnrNonForceFromView(matnrCodes, orderItemByCode, loginUserId);
        CusItemSyncConfigSnapshot cfg = resolveCusItemSyncConfig();
        log.info("[cus_barcode_sync] 同步入口 CUS_ITEM_SYNC_MODE.val={} resolved={} ds={} matnrCount={} matnrs=[{}]",
                formatCfgVal(cfg.rawVal),
                cfg.mode,
                cusBarcodeSyncViewQueryService.effectiveDataSourceLabel(),
                matnrCodes.size(),
                joinCodesForLog(matnrCodes));
        if (cfg.mode == CusItemSyncMode.NONE) {
            syncMatnrNonForceFromView(cfg, matnrCodes, orderItemByCode, loginUserId);
            return;
        }
        List<Map<String, Object>> viewItems = cusBarcodeSyncViewQueryService.listByItemNos(matnrCodes);
        log.info("[cus_barcode_sync] FORCE_VIEW 分支 CUS_ITEM_SYNC_MODE.val={} viewRows={} viewBarcodes=[{}]",
                formatCfgVal(cfg.rawVal),
                viewItems == null ? 0 : viewItems.size(),
                summarizeViewBarcodes(viewItems));
        for (String code : matnrCodes) {
            if (!CusBarcodeSyncViewQueryService.orderMatnrHitsBarcodeView(code, viewItems)) {
            boolean hit = CusBarcodeSyncViewQueryService.orderMatnrHitsBarcodeView(code, viewItems);
            log.info("[cus_barcode_sync] 强制校验 code={} viewHit={}", code, hit);
            if (!hit) {
                throw new CoolException("物料未在视图 cus_barcode_sync_view 中：" + code);
            }
        }
        applyCusBarcodeSyncViewRowsToMatnr(viewItems, orderItemByCode, loginUserId);
        cusBarcodeSyncMatnrApplyService.applyFromViewRows(viewItems, orderItemByCode, loginUserId);
    }

    private void syncMatnrNonForceFromView(List<String> matnrCodes, Map<String, SyncOrdersItem> orderItemByCode, Long loginUserId) {
    private void syncMatnrNonForceFromView(CusItemSyncConfigSnapshot cfg, List<String> matnrCodes, Map<String, SyncOrdersItem> orderItemByCode, Long loginUserId) {
        List<Map<String, Object>> viewItems = null;
        try {
            viewItems = cusBarcodeSyncViewQueryService.listByItemNos(matnrCodes);
        } catch (Exception ex) {
            log.warn("查询 cus_barcode_sync_view 失败，将仅按物料表校验：{}", ex.getMessage());
            log.warn("[cus_barcode_sync] 查询 cus_barcode_sync_view 异常，将仅按物料表校验", ex);
        }
        log.info("[cus_barcode_sync] NONE 分支 CUS_ITEM_SYNC_MODE.val={} 副库视图 rows={} barcodesInView=[{}]",
                formatCfgVal(cfg.rawVal),
                viewItems == null ? 0 : viewItems.size(),
                summarizeViewBarcodes(viewItems));
        if (viewItems != null && !viewItems.isEmpty()) {
            try {
                applyCusBarcodeSyncViewRowsToMatnr(viewItems, orderItemByCode, loginUserId);
                cusBarcodeSyncMatnrApplyService.applyFromViewRows(viewItems, orderItemByCode, loginUserId);
            } catch (Exception ex) {
                log.warn("按条码视图写入物料主数据失败：{}", ex.getMessage());
                log.warn("[cus_barcode_sync] 批量 applyFromViewRows 失败", ex);
            }
        }
        // 视图有条码但本地仍无：按行补建档
        for (String code : matnrCodes) {
            if (CusBarcodeSyncViewQueryService.orderMatnrHitsBarcodeView(code, viewItems)) {
            Matnr m = findLocalMatnrForOrderCode(code);
            if (m != null) {
                log.info("[cus_barcode_sync] 校验通过 code={} localMatnrId={}", code, m.getId());
                continue;
            }
            Matnr m = findLocalMatnrForOrderCode(code);
            boolean viewHit = viewItems != null && CusBarcodeSyncViewQueryService.orderMatnrHitsBarcodeView(code, viewItems);
            log.info("[cus_barcode_sync] 本地无记录 code={} viewHit={} viewRowCount={}", code, viewHit,
                    viewItems == null ? 0 : viewItems.size());
            if (viewHit && viewItems != null) {
                List<Map<String, Object>> rowsForCode = viewItems.stream()
                        .filter(r -> CusBarcodeSyncViewQueryService.rowMatchesOrderMatnr(code, Objects.toString(r.get("barcode"), null)))
                        .collect(Collectors.toList());
                if (!rowsForCode.isEmpty()) {
                    try {
                        log.info("[cus_barcode_sync] 按条码补档 apply rows={} code={}", rowsForCode.size(), code);
                        cusBarcodeSyncMatnrApplyService.applyFromViewRows(rowsForCode, orderItemByCode, loginUserId);
                    } catch (Exception ex) {
                        log.warn("[cus_barcode_sync] 按视图补全物料失败 code={}", code, ex);
                    }
                    m = findLocalMatnrForOrderCode(code);
                }
            }
            if (m == null) {
                log.warn("[cus_barcode_sync] 仍无法落地 man_matnr code={} viewHit={} viewSample=[{}]",
                        code, viewHit, summarizeViewBarcodes(viewItems));
                throw new CoolException("物料不存在：" + code);
            }
        }
    }

    private static String joinCodesForLog(List<String> matnrCodes) {
        if (matnrCodes == null || matnrCodes.isEmpty()) {
            return "";
        }
        String s = String.join(",", matnrCodes);
        return s.length() > 1200 ? s.substring(0, 1200) + "..." : s;
    }

    private static String summarizeViewBarcodes(List<Map<String, Object>> viewItems) {
        if (viewItems == null || viewItems.isEmpty()) {
            return "";
        }
        String s = viewItems.stream()
                .map(r -> Objects.toString(r.get("barcode"), ""))
                .filter(StringUtils::isNotBlank)
                .distinct()
                .collect(Collectors.joining(","));
        return s.length() > 1200 ? s.substring(0, 1200) + "..." : s;
    }

    private Matnr findLocalMatnrForOrderCode(String orderMatnr) {
@@ -146,78 +211,15 @@
        return matnrService.getOneByCodeAndBatch(t, "");
    }

    private static SyncOrdersItem resolveSyncOrderItem(Map<String, SyncOrdersItem> orderItemByCode, String matCode) {
        return matCode == null ? null : orderItemByCode.get(matCode);
    private static final class CusItemSyncConfigSnapshot {
        final CusItemSyncMode mode;
        /** sys_config.CUS_ITEM_SYNC_MODE 的 val，无配置行为 null */
        final String rawVal;

        CusItemSyncConfigSnapshot(CusItemSyncMode mode, String rawVal) {
            this.mode = mode;
            this.rawVal = rawVal;
        }
    }

    private static List<Map<String, Object>> dedupeCusBarcodeViewRows(List<Map<String, Object>> viewItems) {
        Map<String, Map<String, Object>> firstByCode = new LinkedHashMap<>();
        if (viewItems == null) {
            return Collections.emptyList();
        }
        for (Map<String, Object> row : viewItems) {
            String matCode = CusBarcodeSyncViewQueryService.matnrCodeFromBarcode(Objects.toString(row.get("barcode"), null));
            if (matCode == null) {
                continue;
            }
            firstByCode.putIfAbsent(matCode, row);
        }
        return new ArrayList<>(firstByCode.values());
    }

    private void applyCusBarcodeSyncViewRowsToMatnr(List<Map<String, Object>> viewItems, Map<String, SyncOrdersItem> orderItemByCode, Long loginUserId) {
        if (viewItems == null || viewItems.isEmpty()) {
            return;
        }
        for (Map<String, Object> row : dedupeCusBarcodeViewRows(viewItems)) {
            String matCode = CusBarcodeSyncViewQueryService.matnrCodeFromBarcode(Objects.toString(row.get("barcode"), null));
            if (matCode == null) {
                continue;
            }
            SyncOrdersItem syncItem = resolveSyncOrderItem(orderItemByCode, matCode);
            String viewSpec = StringUtils.trimToEmpty(Objects.toString(row.get("item_spec"), ""));
            String viewUnit = StringUtils.trimToNull(Objects.toString(row.get("unit_no"), null));
            String viewItemName = StringUtils.trimToNull(Objects.toString(row.get("item_name"), null));
            String incomingName = syncItem == null ? null : StringUtils.trimToNull(syncItem.getMaktx());
            Matnr local = matnrService.getOneByCodeAndBatch(matCode, "");
            if (local == null) {
                Matnr matnr = new Matnr();
                matnr.setCode(matCode)
                        .setBatch("")
                        .setName(incomingName != null ? incomingName : (viewItemName != null ? viewItemName : matCode))
                        .setSpec(viewSpec)
                        .setUnit(viewUnit)
                        .setStockUnit(viewUnit)
                        .setStatus(1)
                        .setCreateBy(loginUserId)
                        .setUpdateBy(loginUserId)
                        .setCreateTime(new Date())
                        .setUpdateTime(new Date());
                matnrService.save(matnr);
                continue;
            }
            boolean nameDiff = incomingName != null
                    && !StringUtils.equals(StringUtils.trimToEmpty(local.getName()), incomingName);
            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 (!nameDiff && !specDiff && !unitDiff) {
                continue;
            }
            Matnr update = new Matnr();
            update.setId(local.getId());
            if (nameDiff) {
                update.setName(incomingName);
            }
            if (specDiff) {
                update.setSpec(viewSpec);
            }
            if (unitDiff) {
                update.setUnit(viewUnit).setStockUnit(viewUnit);
            }
            update.setUpdateBy(loginUserId).setUpdateTime(new Date());
            matnrService.updateById(update);
        }
    }
}