Merge remote-tracking branch 'origin/b_lms' into master_merge

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java

@@ -90,7 +90,9 @@ public class AutoCallAirShaftTask {
             String specification = empty.getQzz_generation();
             String location = empty.getPoint_location();
             // 2、获取分切计划数据 校验代数
-            List<SlitterPlanDistinctDto> plans = slittingproductionplanService.getAllCutPlan();
+            List<SlitterPlanDistinctDto> planAll = slittingproductionplanService.getAllCutPlan();
+            List<SlitterPlanDistinctDto> plans = planAll.stream()
+                    .filter(p -> p.getResource_name().startsWith("B")).collect(Collectors.toList());
             if (plans.size() == 0) {
                 // 如果不需要套轴，就只做拔轴
                 makePullShaft(empty, specification);