From 64b70c1dd69fb43adf69c722d74a3a9446c2b680 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Mon, 22 Jul 2024 18:45:04 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E8=87=AA=E5=8A=A8=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../b_lms/sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java | 4 ++++ .../sch/tasks/slitter/auto/AutoSlitterCacheDownAgvTask.java | 1 + .../nl/b_lms/sch/tasks/slitter/auto/AutoUpShaftTrussTask.java | 3 ++- .../org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) 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 d48dd2a9c..00000b4d6 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 @@ -53,6 +53,7 @@ public class AutoSendAirShaftAgvTask { @SneakyThrows public void run() { + log.info("自动送气胀轴开始执行..."); // 获取套轴对接位有气涨轴没任务的点位 // 目前满足B1,B2 // todo: 可以把区域校验去掉，就能够包括B1,B2,B3,B4 @@ -67,6 +68,7 @@ public class AutoSendAirShaftAgvTask { .eq(PdmBiSlittingproductionplan::getStatus, "01") .eq(PdmBiSlittingproductionplan::getIs_delete, SlitterConstant.SLITTER_NO)); if (plans.size() == 0) { + log.info("找不到状态01的分切计划，送到异常处理位置！"); // 不能抛异常，需要通过通知的形式，并且创建agv搬到异常处理位（4）。 // 判断套轴暂存位异常点位是否含有任务 List exceptionPoints = bcutpointivtService.getAreaNotTaskPointByStatus("4", "1", "0", "0"); @@ -81,6 +83,8 @@ public class AutoSendAirShaftAgvTask { exParam.put("task_type", SlitterEnum.TASK_TYPE.code("套轴异常处理AGV任务")); exParam.put("product_area", SlitterConstant.SLITTER_TASK_AREA); sendNBJExceptionPointTask.createTask(exParam); + } else { + log.info("异常处理位无空位！"); } continue; } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSlitterCacheDownAgvTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSlitterCacheDownAgvTask.java index 8bc5d7978..94965c4e6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSlitterCacheDownAgvTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoSlitterCacheDownAgvTask.java @@ -45,6 +45,7 @@ public class AutoSlitterCacheDownAgvTask { * 先往套轴对接位送，不够再送分切缓存位（针对B2,B4车间） */ public void run() { + log.info("自动分切下料创建AGV任务开始执行..."); // 获取分切对接位满轴数据 todo: 先不考虑区域，后期添加 // todo: 后面换 slitterService.getAreaFullVolumeByArea("B2", "B4"); 的数据 // bct.point_type IN ('2', '3') -> bct.point_type = '3' 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 1b227b675..b949c1520 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 @@ -47,6 +47,7 @@ public class AutoUpShaftTrussTask { * 并根据计划创建相应的搬运任务。 */ public void run() { + log.info("自动上气胀轴的桁架任务开始执行..."); // 获取符合条件的分切机点位信息 hint: (目前暂定B1,B2区域) List devicePoint = cutpointivtService.list(new LambdaQueryWrapper() .in(StIvtCutpointivt::getProduct_area, "B2", "B1") @@ -76,7 +77,7 @@ public class AutoUpShaftTrussTask { return; } BstIvtCutpointivt newCutPoint = cutPointList.get(0); - + log.info("找到套好的点位：{}", newCutPoint); // 获取下一组分切计划 List qzzNos = Stream.of(newCutPoint.getQzz_no1(), newCutPoint.getQzz_no2()) .filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList()); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml index 9f1c16b15..3dc5536ba 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml @@ -72,7 +72,7 @@ `bst_ivt_cutpointivt` bsp LEFT JOIN pdm_bi_slittingproductionplan p ON p.is_delete = '0' AND p.`status` = '03' AND (p.qzzno = bsp.qzz_no1 OR p.qzzno = bsp.qzz_no2) WHERE bsp.point_type = '3' AND bsp.point_status = '2' AND p.workorder_id IS NOT NULL - AND p.resource_name = #{extCode} + AND p.resource_name = #{extCode} AND bsp.is_used = '1' ORDER BY bsp.update_time