From f574055ed80a64cbccd601b200afc437a87b52eb Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期六, 07 二月 2026 16:03:39 +0800
Subject: [PATCH] RCS入库流程优化
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 190 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 145 insertions(+), 45 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 c5c7240..e0ac9b8 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
@@ -582,60 +582,115 @@
throw new CoolException("璇疯嚦灏戣緭鍏ヤ竴涓煡璇㈡潯浠讹細鐗╂枡缂栫爜銆丄SN鍗曞彿銆佽窡韪爜銆佹壒娆℃垨绁ㄥ彿");
}
+ // 濡傛灉鎵弿鐗╂枡缂栫爜涓擜SN鍗曞彿涓虹┖锛岀洿鎺ヤ粠鐗╂枡淇℃伅琛ㄨ幏鍙栵紝涓嶆煡璇㈡敹璐у尯
+ if (!Cools.isEmpty(matnrCode) && Cools.isEmpty(asnCode) && Cools.isEmpty(code)
+ && Cools.isEmpty(batch) && Objects.isNull(fieldIndex)) {
+ logger.info("=== 浠庣墿鏂欎俊鎭〃鏌ヨ鐗╂枡淇℃伅锛堜笉鏌ヨ鏀惰揣鍖猴級 ===");
+ logger.info("鏌ヨ鍙傛暟 - matnrCode: {}", matnrCode);
+
+ Matnr matnr = matnrMapper.selectOne(new LambdaQueryWrapper<Matnr>()
+ .eq(Matnr::getCode, matnrCode)
+ .eq(Matnr::getDeleted, 0)
+ .last("LIMIT 1"));
+
+ if (matnr == null) {
+ logger.warn("鐗╂枡淇℃伅琛ㄤ腑鏈壘鍒扮墿鏂欑紪鐮�: {}", matnrCode);
+ return R.ok(new ArrayList<>());
+ }
+
+ // 鏋勯�犱竴涓櫄鎷熺殑 WarehouseAreasItem 瀵硅薄杩斿洖鐗╂枡淇℃伅
+ WarehouseAreasItem item = new WarehouseAreasItem();
+ item.setMatnrId(matnr.getId());
+ item.setMatnrCode(matnr.getCode());
+ item.setMaktx(matnr.getName());
+ item.setStockUnit(matnr.getStockUnit());
+ item.setUnit(matnr.getUnit());
+ item.setAnfme(0.0); // 鏁伴噺璁句负0锛屽洜涓轰笉鏄粠鏀惰揣鍖烘煡璇㈢殑
+ item.setWorkQty(0.0);
+ item.setQty(0.0);
+
+ // 璁剧疆鎵╁睍瀛楁
+ Map<String, String> fields = FieldsUtils.getFields(matnr.getFieldsIndex());
+ item.setExtendFields(fields);
+
+ List<WarehouseAreasItem> resultList = new ArrayList<>();
+ resultList.add(item);
+
+ logger.info("浠庣墿鏂欎俊鎭〃杩斿洖 1 鏉＄墿鏂欐暟鎹�");
+ return R.ok(resultList);
+ }
+
//TODO 鍚庣画闇�鏍规嵁绛栫暐閰嶇疆锛岃幏鍙栫粍鎷栨暟鎹�傚锛氭贩瑁咃紝鎸夋壒娆℃贩瑁呯瓑
LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new LambdaQueryWrapper<>();
- // 鏋勫缓OR鏌ヨ鏉′欢缁�
- // 缁熻鏈夋晥鏉′欢鏁伴噺
- int conditionCount = 0;
- if (!Cools.isEmpty(code)) conditionCount++;
- if (!Cools.isEmpty(batch)) conditionCount++;
- if (!Objects.isNull(fieldIndex)) conditionCount++;
- if (!Cools.isEmpty(matnrCode)) conditionCount++;
- if (!Cools.isEmpty(asnCode)) conditionCount++;
-
- // 濡傛灉鍙湁涓�涓潯浠讹紝鐩存帴浣跨敤eq锛涘鏋滄湁澶氫釜鏉′欢锛屼娇鐢╝nd鍖呰９or鏉′欢缁�
- if (conditionCount == 1) {
- // 鍗曚釜鏉′欢锛岀洿鎺ユ煡璇�
+ // 濡傛灉鏈堿SN鍗曞彿锛屽垯鍙煡璇㈣鍗曞彿涓嬬殑鐗╂枡锛圓SN鍗曞彿浣滀负蹇呴』鏉′欢锛�
+ if (!Cools.isEmpty(asnCode)) {
+ // ASN鍗曞彿浣滀负蹇呴』鏉′欢
+ queryWrapper.eq(WarehouseAreasItem::getAsnCode, asnCode);
+
+ // 濡傛灉鍚屾椂鏈夌墿鏂欑紪鐮侊紝鍒欐煡璇㈣ASN鍗曞彿涓嬬殑璇ョ墿鏂�
+ if (!Cools.isEmpty(matnrCode)) {
+ queryWrapper.eq(WarehouseAreasItem::getMatnrCode, matnrCode);
+ }
+
+ // 濡傛灉鍚屾椂鏈夋壒娆★紝鍒欐煡璇㈣ASN鍗曞彿涓嬬殑璇ユ壒娆�
+ if (!Cools.isEmpty(batch)) {
+ queryWrapper.eq(WarehouseAreasItem::getSplrBatch, batch);
+ }
+
+ // 濡傛灉鍚屾椂鏈夌エ鍙凤紝鍒欐煡璇㈣ASN鍗曞彿涓嬬殑璇ョエ鍙�
+ if (!Objects.isNull(fieldIndex)) {
+ queryWrapper.eq(WarehouseAreasItem::getFieldsIndex, fieldIndex);
+ }
+
+ // 濡傛灉鍚屾椂鏈夎窡韪爜锛屽垯鏌ヨ璇SN鍗曞彿涓嬬殑璇ヨ窡韪爜
if (!Cools.isEmpty(code)) {
queryWrapper.eq(WarehouseAreasItem::getTrackCode, code);
- } else if (!Cools.isEmpty(batch)) {
- queryWrapper.eq(WarehouseAreasItem::getSplrBatch, batch);
- } else if (!Objects.isNull(fieldIndex)) {
- queryWrapper.eq(WarehouseAreasItem::getFieldsIndex, fieldIndex);
- } else if (!Cools.isEmpty(matnrCode)) {
- queryWrapper.eq(WarehouseAreasItem::getMatnrCode, matnrCode);
- } else if (!Cools.isEmpty(asnCode)) {
- queryWrapper.eq(WarehouseAreasItem::getAsnCode, asnCode);
}
} else {
- // 澶氫釜鏉′欢锛屼娇鐢∣R杩炴帴
- queryWrapper.and(wrapper -> {
- boolean first = true;
+ // 娌℃湁ASN鍗曞彿鏃讹紝鍙互鎵弿浠绘剰鐗╂枡缁勬墭锛屼娇鐢∣R杩炴帴澶氫釜鏉′欢
+ // 缁熻鏈夋晥鏉′欢鏁伴噺
+ int conditionCount = 0;
+ if (!Cools.isEmpty(code)) conditionCount++;
+ if (!Cools.isEmpty(batch)) conditionCount++;
+ if (!Objects.isNull(fieldIndex)) conditionCount++;
+ if (!Cools.isEmpty(matnrCode)) conditionCount++;
+
+ // 濡傛灉鍙湁涓�涓潯浠讹紝鐩存帴浣跨敤eq
+ if (conditionCount == 1) {
if (!Cools.isEmpty(code)) {
- wrapper.eq(WarehouseAreasItem::getTrackCode, code);
- first = false;
+ queryWrapper.eq(WarehouseAreasItem::getTrackCode, code);
+ } else if (!Cools.isEmpty(batch)) {
+ queryWrapper.eq(WarehouseAreasItem::getSplrBatch, batch);
+ } else if (!Objects.isNull(fieldIndex)) {
+ queryWrapper.eq(WarehouseAreasItem::getFieldsIndex, fieldIndex);
+ } else if (!Cools.isEmpty(matnrCode)) {
+ queryWrapper.eq(WarehouseAreasItem::getMatnrCode, matnrCode);
}
- if (!Cools.isEmpty(batch)) {
- if (!first) wrapper.or();
- wrapper.eq(WarehouseAreasItem::getSplrBatch, batch);
- first = false;
- }
- if (!Objects.isNull(fieldIndex)) {
- if (!first) wrapper.or();
- wrapper.eq(WarehouseAreasItem::getFieldsIndex, fieldIndex);
- first = false;
- }
- if (!Cools.isEmpty(matnrCode)) {
- if (!first) wrapper.or();
- wrapper.eq(WarehouseAreasItem::getMatnrCode, matnrCode);
- first = false;
- }
- if (!Cools.isEmpty(asnCode)) {
- if (!first) wrapper.or();
- wrapper.eq(WarehouseAreasItem::getAsnCode, asnCode);
- }
- });
+ } else if (conditionCount > 1) {
+ // 澶氫釜鏉′欢锛屼娇鐢∣R杩炴帴
+ queryWrapper.and(wrapper -> {
+ boolean first = true;
+ if (!Cools.isEmpty(code)) {
+ wrapper.eq(WarehouseAreasItem::getTrackCode, code);
+ first = false;
+ }
+ if (!Cools.isEmpty(batch)) {
+ if (!first) wrapper.or();
+ wrapper.eq(WarehouseAreasItem::getSplrBatch, batch);
+ first = false;
+ }
+ if (!Objects.isNull(fieldIndex)) {
+ if (!first) wrapper.or();
+ wrapper.eq(WarehouseAreasItem::getFieldsIndex, fieldIndex);
+ first = false;
+ }
+ if (!Cools.isEmpty(matnrCode)) {
+ if (!first) wrapper.or();
+ wrapper.eq(WarehouseAreasItem::getMatnrCode, matnrCode);
+ }
+ });
+ }
}
// 鎵撳嵃鏌ヨ鍙傛暟鍒版帶鍒跺彴
@@ -685,6 +740,51 @@
logger.warn("鏁版嵁搴撴煡璇㈢粨鏋滀负绌猴紝鍙兘鍘熷洜锛�1.鐗╂枡缂栫爜涓嶅尮閰� 2.鐗╂枡鏈敹璐ц嚦鏀惰揣鍖� 3.鏁版嵁宸茶鍒犻櫎");
}
+ // 濡傛灉鎵弿鐗╂枡缂栫爜鍔犺浇鐗╂枡骞朵笖ASN鍗曞彿涓虹┖鏃讹紝浠庣墿鏂欎俊鎭〃鑾峰彇鐗╂枡淇℃伅骞舵洿鏂�
+ if (!Cools.isEmpty(matnrCode) && Cools.isEmpty(asnCode) && !list.isEmpty()) {
+ // 鏀堕泦鎵�鏈夊敮涓�鐨勭墿鏂欑紪鐮�
+ Set<String> matnrCodes = list.stream()
+ .map(WarehouseAreasItem::getMatnrCode)
+ .filter(matCode -> !Cools.isEmpty(matCode))
+ .collect(Collectors.toSet());
+
+ // 鎵归噺鏌ヨ鐗╂枡淇℃伅
+ 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"));
+ if (matnr != null) {
+ matnrMap.put(matCode, matnr);
+ }
+ }
+
+ // 鏇存柊鍒楄〃涓殑鐗╂枡淇℃伅
+ list.forEach(item -> {
+ String itemMatnrCode = item.getMatnrCode();
+ if (!Cools.isEmpty(itemMatnrCode) && matnrMap.containsKey(itemMatnrCode)) {
+ Matnr matnr = matnrMap.get(itemMatnrCode);
+ // 浠庣墿鏂欎俊鎭〃鏇存柊鐗╂枡鍚嶇О
+ if (!Cools.isEmpty(matnr.getName())) {
+ item.setMaktx(matnr.getName());
+ }
+ // 浠庣墿鏂欎俊鎭〃鏇存柊搴撳瓨鍗曚綅
+ if (!Cools.isEmpty(matnr.getStockUnit())) {
+ item.setStockUnit(matnr.getStockUnit());
+ }
+ // 浠庣墿鏂欎俊鎭〃鏇存柊鍗曚綅
+ if (!Cools.isEmpty(matnr.getUnit())) {
+ item.setUnit(matnr.getUnit());
+ }
+ logger.debug("宸蹭粠鐗╂枡淇℃伅琛ㄦ洿鏂扮墿鏂欎俊鎭� - matnrCode: {}, name: {}, stockUnit: {}",
+ itemMatnrCode, matnr.getName(), matnr.getStockUnit());
+ }
+ });
+ }
+ }
+
list.forEach(item -> {
Map<String, String> fields = FieldsUtils.getFields(item.getFieldsIndex());
item.setExtendFields(fields);
--
Gitblit v1.9.1