From 4c5e705c9ac10827254900305b7b915191005db4 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期二, 21 四月 2026 15:25:16 +0800
Subject: [PATCH] 版改板
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 103 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 94 insertions(+), 9 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index 3c5c591..f1880bd 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/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 CusBarcodeSyncViewQueryService cusBarcodeSyncViewQueryService;
/**
* @return
@@ -597,13 +599,14 @@
// 濡傛灉鎵弿鐗╂枡缂栫爜涓擜SN鍗曞彿涓虹┖锛岀洿鎺ヤ粠鐗╂枡淇℃伅琛ㄨ幏鍙栵紝涓嶆煡璇㈡敹璐у尯
if (!Cools.isEmpty(matnrCode) && Cools.isEmpty(asnCode) && Cools.isEmpty(code)
&& Cools.isEmpty(batch) && Objects.isNull(fieldIndex)) {
- logger.info("=== 浠庣墿鏂欎俊鎭〃鏌ヨ鐗╂枡淇℃伅锛堜笉鏌ヨ鏀惰揣鍖猴級 ===");
+// 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,87 @@
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) {
+ return null;
+ }
+ List<Map<String, Object>> viewItems = null;
+ try {
+ viewItems = cusBarcodeSyncViewQueryService.listByItemNos(Collections.singletonList(code));
+ } catch (Exception ignore) {
+ }
+ Map<String, Object> row = null;
+ if (viewItems != null) {
+ row = viewItems.stream()
+ .filter(v -> CusBarcodeSyncViewQueryService.rowMatchesOrderMatnr(code, Objects.toString(v.get("barcode"), null)))
+ .findFirst()
+ .orElse(null);
+ }
+ if (row == null) {
+ 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(fullCode)
+ .setBatch("")
+ .setName(viewName != null ? viewName : fullCode)
+ .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
--
Gitblit v1.9.1