From da3edc1ca108a64bdbee46c8b1604ca22a9eb4bb Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Fri, 3 Jan 2025 18:43:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A5=97=E8=BD=B4=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=98=AF=E5=90=A6=E5=90=AF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/mapper/PdmBiSlittingproductionplanMapper.xml | 1 + .../sch/tasks/slitter/auto/AutoCallAirShaftTask.java | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml index c5a688493..30d17038a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml @@ -72,6 +72,7 @@ AND IFNULL(p.left_or_right,'') ]]> '' AND DATE(p.start_time) >= DATE_SUB(CURDATE(), INTERVAL #{day} DAY) AND p.FRP_description NOT LIKE '%1800%' + AND '1' = (SELECT c.is_used FROM st_ivt_cutpointivt c WHERE c.ext_code = p.resource_name) GROUP BY p.resource_name, p.parent_container_name, 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 2670286fb..a8e5960b2 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 @@ -199,21 +199,21 @@ public class AutoCallAirShaftTask { // todo: 需要校验区域0/1 List qzzPoint = bcutpointivtService.getPointByTypeAndShaftSize("1", qzzSize, specification); if (qzzPoint.size() == 0) { - // 调用ACS滚条气涨轴下来 - toAcsOutShaft(qzzSize, location, empty); // 保存所需要的分切计划数据到点位上（套轴对接位）更新分切计划 saveCutPlanMessage(empty, needPlans, qzzSize); + // 调用ACS滚条气涨轴下来 + toAcsOutShaft(qzzSize, location, empty); toCallAgvMovePaperTube(needPlans, location, empty); return; } // 查找一条没任务的点位 BstIvtCutpointivt startPoint = qzzPoint.get(0); if (ObjectUtil.isEmpty(startPoint)) { + // 保存所需要的分切计划数据到点位上（套轴对接位）更新分切计划 + saveCutPlanMessage(empty, needPlans, qzzSize); // 如果不存在，则发起信号滚气涨轴 // 调用ACS滚条气涨轴下来 toAcsOutShaft(qzzSize, location, empty); - // 保存所需要的分切计划数据到点位上（套轴对接位）更新分切计划 - saveCutPlanMessage(empty, needPlans, qzzSize); toCallAgvMovePaperTube(needPlans, location, empty); return; }