From 48ebc3e1120c4d72ea490167b9705208edc79071 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期一, 20 四月 2026 12:03:58 +0800
Subject: [PATCH] dj修改
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 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 92b0464..ff8144a 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
@@ -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)
--
Gitblit v1.9.1