feat：手持提示下一个套好纸管的气胀轴位置以及对应子卷信息

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(","));