From edb307fb75c50c240bfc01c64c09ac5654e5dadc Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期一, 20 四月 2026 14:28:55 +0800
Subject: [PATCH] #视图优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/CusBarcodeSyncMatnrService.java | 85 +++---------------------------------------
1 files changed, 6 insertions(+), 79 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..dd27f88 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
@@ -13,10 +13,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 +22,8 @@
import java.util.stream.Collectors;
/**
- * cus_barcode_sync_view 涓� man_matnr 鍚屾锛堜簯浠撻�氱煡鍗曘�佹棤璁㈠崟缁勬墭绛夊叡鐢級
+ * cus_barcode_sync_view 涓� man_matnr 鍚屾锛堜簯浠撻�氱煡鍗曘�佹棤璁㈠崟缁勬墭绛夊叡鐢級銆�
+ * 鍓簱璇绘棤浜嬪姟锛坽@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) {
@@ -110,7 +111,7 @@
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) {
@@ -122,7 +123,7 @@
}
if (viewItems != null && !viewItems.isEmpty()) {
try {
- applyCusBarcodeSyncViewRowsToMatnr(viewItems, orderItemByCode, loginUserId);
+ cusBarcodeSyncMatnrApplyService.applyFromViewRows(viewItems, orderItemByCode, loginUserId);
} catch (Exception ex) {
log.warn("鎸夋潯鐮佽鍥惧啓鍏ョ墿鏂欎富鏁版嵁澶辫触锛歿}", ex.getMessage());
}
@@ -146,78 +147,4 @@
return matnrService.getOneByCodeAndBatch(t, "");
}
- private static SyncOrdersItem resolveSyncOrderItem(Map<String, SyncOrdersItem> orderItemByCode, String matCode) {
- return matCode == null ? null : orderItemByCode.get(matCode);
- }
-
- 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