diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java index a8e5960b2..00e027f41 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java @@ -464,11 +464,13 @@ public class AutoCallAirShaftTask { */ private void makePullShaft(BstIvtShafttubeivt empty, String specification) { log.info("不需要套轴,只做拔轴!"); + //查询套轴缓存位哦:point_type=1 List notTaskPoints = bcutpointivtService.getAreaNotTaskPointByLocationAreaAndStatus(empty.getPoint_location()); if (notTaskPoints.size() == 0) { return; } // 筛选一个满足的位置:3寸:看代数4/5;6寸直接 + //判断气胀轴代 BstIvtCutpointivt cutpointivt = notTaskPoints.stream() .filter(cut -> "6".equals(cut.getQzz_size()) || ("3".equals(cut.getQzz_size()) && specification.equals(cut.getQzz_generation())))