From 8459f52a6fa45e64555c86930c1e3cacaf8289a7 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Wed, 24 Jul 2024 13:42:22 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=89=8B=E6=8C=81=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=8B=E4=B8=80=E4=B8=AA=E5=A5=97=E5=A5=BD=E7=BA=B8?=
 =?UTF-8?q?=E7=AE=A1=E7=9A=84=E6=B0=94=E8=83=80=E8=BD=B4=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E5=AF=B9=E5=BA=94=E5=AD=90=E5=8D=B7=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../slitter/service/impl/SlitterServiceImpl.java     | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
index ac85063a9..4f564469a 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
@@ -52,6 +52,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -1373,7 +1374,7 @@ public class SlitterServiceImpl implements SlitterService {
         }
         String area = deviceCode.getProduct_area();
         // 获取当前分切机的下一组分切计划(最多四条分切计划)
-        // hint: 获取到的分切可能是不同组的但具有一定时间顺序
+        // hint: 获取到的分切可能是不同组的但具有一定时间顺序, 可能是以前的脏数据
         List<PdmBiSlittingproductionplan> timePlans = slittingproductionplanService.list(
                 new LambdaQueryWrapper<PdmBiSlittingproductionplan>()
                         .eq(PdmBiSlittingproductionplan::getResource_name, deviceCode.getExt_code())
@@ -1389,7 +1390,14 @@ public class SlitterServiceImpl implements SlitterService {
             } else {
                 // 找到该分切计划的点位
                 BstIvtCutpointivt newCutPoint = cutPointList.get(0);
-                String collect = timePlans.stream()
+                List<String> qzzNos = Stream.of(newCutPoint.getQzz_no1(), newCutPoint.getQzz_no2())
+                        .filter(value -> value != null && !value.isEmpty())
+                        .collect(Collectors.toList());
+                List<PdmBiSlittingproductionplan> nextPlans = slittingproductionplanService.list(new LambdaQueryWrapper<PdmBiSlittingproductionplan>()
+                        .in(PdmBiSlittingproductionplan::getQzzno, qzzNos)
+                        .eq(PdmBiSlittingproductionplan::getStatus, "03")
+                        .eq(PdmBiSlittingproductionplan::getIs_delete, "0"));
+                String collect = nextPlans.stream()
                         .map(PdmBiSlittingproductionplan::getContainer_name)
                         .filter(ObjectUtil::isNotEmpty)
                         .collect(Collectors.joining(","));