From fc231644b0decd2ad6b1ee259c5509f8232d74ff Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期四, 30 四月 2026 12:13:17 +0800
Subject: [PATCH] 日志打印增加
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/CusBarcodeSyncMatnrService.java | 188 +++++++++++++++++++++++-----------------------
1 files changed, 95 insertions(+), 93 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/CusBarcodeSyncMatnrService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/CusBarcodeSyncMatnrService.java
index 6f83af8..c7d512d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/CusBarcodeSyncMatnrService.java
+++ b/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}锛坰ys_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);
- }
- }
}
--
Gitblit v1.9.1