From 00310b8b5bf002f0135ba0b60715b17e5a3da31f Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 13 六月 2024 18:02:39 +0800
Subject: [PATCH] 小功能调整
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
index 757e268..f2bb260 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
@@ -24,10 +24,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
@@ -147,6 +144,22 @@
if (ObjectUtil.isNotEmpty(a.getInsProduct())) {
addInsProductMethod(a.getId(), a.getInsProduct(), null, 0);
}
+ if(ObjectUtil.isNotEmpty(a.getInsulating())){
+ List<InsProduct> ip2 = new ArrayList<>();
+ for (Integer i = 0; i < a.getInsulating().getNum(); i++) {
+ ip2.addAll(a.getInsulating().getInsProduct());
+ }
+ for (InsProduct product : ip2) {
+ product.setStandardMethodListId(a.getInsulating().getStandardMethodListId());
+ }
+ addInsProductMethod(a.getId(), ip2, null, 0);
+ }
+ if(ObjectUtil.isNotEmpty(a.getSheath())){
+ for (InsProduct product : a.getSheath().getInsProduct()) {
+ product.setStandardMethodListId(a.getSheath().getStandardMethodListId());
+ }
+ addInsProductMethod(a.getId(), a.getSheath().getInsProduct(), null, 0);
+ }
if(ObjectUtil.isNotEmpty(a.getChildSampleList())){
for (SampleProductDto b : a.getChildSampleList()) {
for (int i = 0; i < b.getNum(); i++) {
@@ -188,7 +201,7 @@
}
}
}
- });
+ }) ;
for (List<Integer> i : pairing) {
SampleProductDto sample = JSON.parseObject(JSON.toJSONString(list.get(i.get(0) - 1)), SampleProductDto.class);
sample.setSampleCode(list.get(i.get(0)-1).getSampleCode() + "/" +list.get(i.get(1)-1).getSampleCode());
--
Gitblit v1.9.3