From 770dd97604ded80f9cefe1e7880f7e02e9601beb Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Thu, 12 Nov 2026 15:15:45 +0800 Subject: [PATCH] =?UTF-8?q?2026-11-12=20=E6=A0=87=E7=AD=BE=E5=8F=98?= =?UTF-8?q?=E5=8A=A8=E8=AE=B0=E5=BD=95=E9=A1=B5=E9=9D=A2=E4=B8=8B=E6=96=B9?= =?UTF-8?q?=E9=A1=B5=E7=AD=BE=E5=A2=9E=E5=8A=A0=E4=B8=8A=E7=BA=A7=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/LabelTransactionLogMapper.java | 5 ++ .../impl/LabelTransactionLogServiceImpl.java | 61 ++++++++++++++++++- .../warehouse/LabelTransactionLogMapper.xml | 17 ++++++ 3 files changed, 82 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gaotao/modules/warehouse/dao/LabelTransactionLogMapper.java b/src/main/java/com/gaotao/modules/warehouse/dao/LabelTransactionLogMapper.java index 85a3a52..5daad64 100644 --- a/src/main/java/com/gaotao/modules/warehouse/dao/LabelTransactionLogMapper.java +++ b/src/main/java/com/gaotao/modules/warehouse/dao/LabelTransactionLogMapper.java @@ -28,6 +28,11 @@ public interface LabelTransactionLogMapper { */ BigDecimal queryTotalRollQty(@Param("query") Map params); + /** + * 按标签批量查询实时库存上级标签号 + */ + List> listParentRollNo(Map params); + /** * 调用单据回冲存储过程 */ diff --git a/src/main/java/com/gaotao/modules/warehouse/service/impl/LabelTransactionLogServiceImpl.java b/src/main/java/com/gaotao/modules/warehouse/service/impl/LabelTransactionLogServiceImpl.java index 83a1f29..440422d 100644 --- a/src/main/java/com/gaotao/modules/warehouse/service/impl/LabelTransactionLogServiceImpl.java +++ b/src/main/java/com/gaotao/modules/warehouse/service/impl/LabelTransactionLogServiceImpl.java @@ -14,8 +14,11 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Set; /** * 标签变动记录Service实现类 @@ -39,7 +42,63 @@ public class LabelTransactionLogServiceImpl implements LabelTransactionLogServic @Override public List> queryList(Map params) { - return labelTransactionLogMapper.queryList(params); + List> list = labelTransactionLogMapper.queryList(params); + if (isNeedParentRollNo(params)) { + fillParentRollNo(list); + } + return list; + } + + private boolean isNeedParentRollNo(Map params) { + Object flag = params == null ? null : params.get("needParentRollNo"); + return Boolean.TRUE.equals(flag) || "true".equalsIgnoreCase(String.valueOf(flag)); + } + + private void fillParentRollNo(List> list) { + if (list == null || list.isEmpty()) { + return; + } + Map> rollNoGroup = new LinkedHashMap<>(); + for (Map row : list) { + String site = stringValue(row.get("site")); + String buNo = stringValue(row.get("buNo")); + String rollNo = stringValue(row.get("rollNo")); + if (site.isEmpty() || buNo.isEmpty() || rollNo.isEmpty()) { + continue; + } + rollNoGroup.computeIfAbsent(site + "\u0001" + buNo, key -> new HashSet<>()).add(rollNo); + } + Map parentRollMap = new HashMap<>(); + for (Map.Entry> entry : rollNoGroup.entrySet()) { + String[] key = entry.getKey().split("\u0001", 2); + List rollNoList = new ArrayList<>(entry.getValue()); + int batchSize = 500; + for (int start = 0; start < rollNoList.size(); start += batchSize) { + List batch = rollNoList.subList(start, Math.min(start + batchSize, rollNoList.size())); + Map query = new HashMap<>(); + query.put("site", key[0]); + query.put("buNo", key[1]); + query.put("rollNoList", batch); + List> parentList = labelTransactionLogMapper.listParentRollNo(query); + if (parentList == null) { + continue; + } + for (Map parentRow : parentList) { + parentRollMap.put( + stringValue(parentRow.get("site")) + "\u0001" + stringValue(parentRow.get("buNo")) + "\u0001" + stringValue(parentRow.get("rollNo")), + stringValue(parentRow.get("parentRollNo")) + ); + } + } + } + for (Map row : list) { + String mapKey = stringValue(row.get("site")) + "\u0001" + stringValue(row.get("buNo")) + "\u0001" + stringValue(row.get("rollNo")); + row.put("parentRollNo", parentRollMap.getOrDefault(mapKey, "")); + } + } + + private String stringValue(Object value) { + return value == null ? "" : String.valueOf(value).trim(); } @Override diff --git a/src/main/resources/mapper/warehouse/LabelTransactionLogMapper.xml b/src/main/resources/mapper/warehouse/LabelTransactionLogMapper.xml index 10bf850..7eeced2 100644 --- a/src/main/resources/mapper/warehouse/LabelTransactionLogMapper.xml +++ b/src/main/resources/mapper/warehouse/LabelTransactionLogMapper.xml @@ -236,6 +236,23 @@ + + +