From 87d92eb2fd29226c701b2b2dd4c46d30fa56b80c Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 17 二月 2025 14:57:36 +0800
Subject: [PATCH] 撤回流程的补充

---
 src/main/java/com/gs/xky/service/Impl/MesQaItemsDetect01ServiceImpl.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/gs/xky/service/Impl/MesQaItemsDetect01ServiceImpl.java b/src/main/java/com/gs/xky/service/Impl/MesQaItemsDetect01ServiceImpl.java
index 0c2b911..6129ccb 100644
--- a/src/main/java/com/gs/xky/service/Impl/MesQaItemsDetect01ServiceImpl.java
+++ b/src/main/java/com/gs/xky/service/Impl/MesQaItemsDetect01ServiceImpl.java
@@ -1,5 +1,6 @@
 package com.gs.xky.service.Impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -13,6 +14,9 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author 28567
@@ -34,22 +38,25 @@
 
         LambdaQueryWrapper<MesQaItemsDetect01> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(MesQaItemsDetect01::getLotNo, lotNo);
-        MesQaItemsDetect01 one = getOne(wrapper, false);
-        if (one == null) {
+        //MesQaItemsDetect01 one = getOne(wrapper, false);
+        List<MesQaItemsDetect01> list = list(wrapper);
+        if (CollUtil.isEmpty(list)) {
             return false;
         }
 
+        List<String> collect = list.stream().map(MesQaItemsDetect01::getReleaseNo).collect(Collectors.toList());
+
         LambdaUpdateWrapper<MesQaItemsDetect01> updateWrapper = new LambdaUpdateWrapper<>();
-        updateWrapper.eq(MesQaItemsDetect01::getReleaseNo, one.getReleaseNo());
+        updateWrapper.in(MesQaItemsDetect01::getReleaseNo, collect);
         if (remove(wrapper)) {
             LambdaQueryWrapper<MesQaItemsDetectDetail5> wrapper1 = new LambdaQueryWrapper<>();
 
-            wrapper1.eq(MesQaItemsDetectDetail5::getReleaseNo, one.getReleaseNo());
+            wrapper1.in(MesQaItemsDetectDetail5::getReleaseNo, collect);
             detectDetail5Service.remove(wrapper1);
 
             LambdaQueryWrapper<MesQaItemsDetectDetail12> wrapper2 = new LambdaQueryWrapper<>();
 
-            wrapper2.eq(MesQaItemsDetectDetail12::getReleaseNo, one.getReleaseNo());
+            wrapper2.in(MesQaItemsDetectDetail12::getReleaseNo, collect);
             detectDetail12Service.remove(wrapper2);
         }
 

--
Gitblit v1.9.3