From da54d3fe5b3bd4ae92c43ac93e9619d2e15c8a7b Mon Sep 17 00:00:00 2001 From: 李林 <z1292839451@163.com> Date: 星期四, 27 六月 2024 16:55:52 +0800 Subject: [PATCH] 报告序号处理 --- inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java index c2720da..ac90cde 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java @@ -514,8 +514,9 @@ } templateSet.add(JSON.toJSONString(b.getTemplate())); } + AtomicInteger index = new AtomicInteger(); + Set<String> itemSet = new HashSet<>(); templateSet.forEach(tem -> { - AtomicInteger index = new AtomicInteger(); Set<Integer> set2 = new HashSet<>(); List<RowRenderData> rows = new ArrayList<>(); List<TextRenderData> text = new ArrayList<>(); @@ -638,7 +639,9 @@ break; } } else if (value.equals("搴忓彿")) { - index.getAndIncrement(); + if(itemSet.add(p.getInspectionItem())){ + index.getAndIncrement(); + } textRenderData.setText(index + ""); } else if (value.equals("璁$畻鍊�")) { JSONArray jsonArray = JSON.parseArray(p.getInsProductResult().getComValue()); -- Gitblit v1.9.3