diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java index df44e055b..a00322bca 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java @@ -102,6 +102,8 @@ public class SlitterDownTrussTask extends AbstractAcsTask { point1 = cutpointivtService.getPintByUpOrDownCode(pointCode2, false); point2 = bcutpointivtService.getPintByTrussCode(pointCode1, false); } + log.info("起点数据:{}", point1); + log.info("终点数据:{}", point2); String tmpUpQzzNo = point1.getUp_qzzno(); String tmpDownQzzNo = point1.getDown_qzzno(); // 更新分切计划 @@ -112,6 +114,7 @@ public class SlitterDownTrussTask extends AbstractAcsTask { TaskUtils.updateOptMessageBySlitterPlan(p); List downQzzNos = Stream.of(tmpUpQzzNo, tmpDownQzzNo) .filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList()); + log.info("即将下卷的上下轴的气胀轴编码数据:{}", downQzzNos); slittingproductionplanService.update(p, new LambdaQueryWrapper() .in(PdmBiSlittingproductionplan::getQzzno, downQzzNos)); // 上去的分切计划状态:04 -> 05 @@ -119,6 +122,7 @@ public class SlitterDownTrussTask extends AbstractAcsTask { p.setEnd_time(""); List upQzzNos = Stream.of(point2.getQzz_no1(), point2.getQzz_no2()) .filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList()); + log.info("即将上卷的气胀轴编码数据:{}", upQzzNos); if (upQzzNos.size() > 0) { slittingproductionplanService.update(p, new LambdaQueryWrapper() .in(PdmBiSlittingproductionplan::getQzzno, upQzzNos)); 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 75c2671cb..a8c216785 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 @@ -453,6 +453,7 @@ public class AutoCallAirShaftTask { * @param specification 代数(4、5) */ private void makePullShaft(BstIvtShafttubeivt empty, String specification) { + log.info("不需要套轴,只做拔轴!"); List notTaskPoints = bcutpointivtService.getAreaNotTaskPointByLocationAreaAndStatus(empty.getPoint_location()); if (notTaskPoints.size() == 0) { return; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoUpShaftTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoUpShaftTrussTask.java index b949c1520..4d6bdfb4f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoUpShaftTrussTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoUpShaftTrussTask.java @@ -81,6 +81,10 @@ public class AutoUpShaftTrussTask { // 获取下一组分切计划 List qzzNos = Stream.of(newCutPoint.getQzz_no1(), newCutPoint.getQzz_no2()) .filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList()); + if (qzzNos.size() == 0) { + log.warn("{} - 气胀轴编码未找到,跳到下一个点位!", newCutPoint); + return; + } List nextPlans = slittingproductionplanService.list(new LambdaQueryWrapper() .in(PdmBiSlittingproductionplan::getQzzno, qzzNos) .eq(PdmBiSlittingproductionplan::getStatus, "03")