From 8be4276360152358eaac7a35ac59e46e0d706b1b Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Thu, 3 Jul 2025 14:03:30 +0800 Subject: [PATCH] opt: 1 --- .../sch/tasks/slitter/SlitterDownTrussTask.java | 6 +++--- .../tasks/slitter/auto/AutoSendAirShaftAgvTask.java | 12 +++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) 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 00c34606c..bf13e4b26 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 @@ -7,7 +7,6 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import lombok.extern.slf4j.Slf4j; import org.nl.b_lms.bst.ivt.cutpointivt.service.IBstIvtCutpointivtService; import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt; @@ -115,13 +114,14 @@ public class SlitterDownTrussTask extends AbstractAcsTask { log.info("起点数据：{}", point1); log.info("终点数据：{}", point2); // 更新分切计划 - // 下来的分切计划状态：06 -> 09, 设置重量 + // 下来的分切计划状态：06 -> 09, 不在需要设置重量 List downCons = containers.toJavaList(String.class); log.info("即将下卷的上下轴的子卷号数据1：{}", downCons); List downPlans = slittingproductionplanService.getByContainerNames(downCons); log.info("即将下卷的上下轴的子卷号数据2：{}", downPlans); // SlitterTaskUtil.setPaperWeightStr(point1.getRemark(), downPlans); - log.info("即将下卷的上下轴的子卷号数据3：{}", downPlans); +// log.info("即将下卷的上下轴的子卷号数据3：{}", downPlans); + // 下来的卷的集合 List needUpdates = new ArrayList<>(); // 绑定气胀轴编码（可能没有气胀轴编码） List deviceUpPlans = downPlans.stream().filter(p -> SlitterConstant.SLITTER_SHAFT_UP.equals(p.getUp_or_down())).collect(Collectors.toList()); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java index 748ee407c..9320b3b5f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java @@ -73,11 +73,12 @@ public class AutoSendAirShaftAgvTask { continue; } // 最多4条分切计划 - List plans = slittingproductionplanService.list(new LambdaQueryWrapper() - .in(PdmBiSlittingproductionplan::getQzzno, collect) - .eq(PdmBiSlittingproductionplan::getIs_delete, SlitterConstant.SLITTER_NO)); + List plans = slittingproductionplanService.list(new LambdaQueryWrapper() + .in(PdmBiSlittingproductionplan::getQzzno, collect) + .eq(PdmBiSlittingproductionplan::getStatus, "01") + .eq(PdmBiSlittingproductionplan::getIs_delete, SlitterConstant.SLITTER_NO)); if (plans.size() == 0) { - log.info("找不到分切计划，送到异常处理位置！"); + log.info("找不到状态01的分切计划，送到异常处理位置！"); // 不能抛异常，需要通过通知的形式，并且创建agv搬到异常处理位（4）。 // 判断套轴暂存位异常点位是否含有任务 List exceptionPoints = bcutpointivtService.getAreaNotTaskPointByStatus("4", "1", "0", "0"); @@ -95,7 +96,8 @@ public class AutoSendAirShaftAgvTask { } else { log.info("异常处理位无空位！"); // 点位禁用 - cutPoint.setRemark("找不到分切计划！"); + cutPoint.setRemark("计划状态已被改变！"); + cutPoint.setIs_used("0"); cutPoint.setUpdate_time(DateUtil.now()); bcutpointivtService.updateById(cutPoint); }