From 39676349726fd0aacb90d66dc18b33813961ed3a Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Wed, 3 Jul 2024 23:28:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=87=E6=BB=A4=E5=88=86=E5=88=87?= =?UTF-8?q?=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IBstIvtCutpointivtService.java | 15 ++++++++++++ .../dao/mapper/BstIvtCutpointivtMapper.java | 5 ++++ .../dao/mapper/BstIvtCutpointivtMapper.xml | 17 +++++++++++++ .../impl/BstIvtCutpointivtServiceImpl.java | 11 +++++++++ .../task/dao/mapper/SchBaseTaskMapper.java | 7 ++++++ .../sch/task/dao/mapper/SchBaseTaskMapper.xml | 6 +++++ .../sch/task/service/IschBaseTaskService.java | 7 ++++++ .../service/impl/SchBaseTaskServiceImpl.java | 7 +++--- .../slitter/auto/AutoCallAirShaftTask.java | 24 +++++++++++++++---- .../tasks/slitter/mapper/SlitterMapper.xml | 2 +- 10 files changed, 92 insertions(+), 9 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/IBstIvtCutpointivtService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/IBstIvtCutpointivtService.java index fb0c5f9e2..054195431 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/IBstIvtCutpointivtService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/IBstIvtCutpointivtService.java @@ -2,6 +2,7 @@ package org.nl.b_lms.bst.ivt.cutpointivt.service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.b_lms.bst.ivt.cutpointivt.service.dto.BstIvtCutpointivtQuery; +import org.nl.b_lms.sch.tasks.slitter.mapper.dto.SlitterPlanDistinctDto; import org.nl.common.domain.query.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt; @@ -99,4 +100,18 @@ public interface IBstIvtCutpointivtService extends IService { * @return / */ List getPintByAgvCodesByPointType(String pointType); + + /** + * 校验相同母卷、相同设备、相同组的数据 + * @param dto / + * @return / + */ + List getCachePointSame(SlitterPlanDistinctDto dto); + + /** + * 获取准备好的气胀轴，套好纸管 + * @param resourceName 设备号 + * @return / + */ + List getReallyQzzSameDevice(String resourceName); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.java index 934c1b105..ae17ffec9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.java @@ -2,6 +2,7 @@ package org.nl.b_lms.bst.ivt.cutpointivt.service.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt; +import org.nl.b_lms.sch.tasks.slitter.mapper.dto.SlitterPlanDistinctDto; import java.util.List; @@ -18,4 +19,8 @@ public interface BstIvtCutpointivtMapper extends BaseMapper { List getAreaNotTaskPointByLocationAreaAndStatus(String location); List getAllHalfPlacePoints(String type, String pointStatus, String location); + + List getCachePointSame(SlitterPlanDistinctDto dto); + + List getReallyQzzSameDevice(String resourceName); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml index cfcc15e46..c93860e13 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml @@ -91,4 +91,21 @@ ) ) + + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/impl/BstIvtCutpointivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/impl/BstIvtCutpointivtServiceImpl.java index cce547d48..92823cf27 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/impl/BstIvtCutpointivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/impl/BstIvtCutpointivtServiceImpl.java @@ -14,6 +14,7 @@ import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt; import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.mapper.BstIvtCutpointivtMapper; import org.nl.b_lms.bst.ivt.cutpointivt.service.dto.BstIvtCutpointivtQuery; import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant; +import org.nl.b_lms.sch.tasks.slitter.mapper.dto.SlitterPlanDistinctDto; import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; @@ -130,4 +131,14 @@ public class BstIvtCutpointivtServiceImpl extends ServiceImpl() .eq(BstIvtCutpointivt::getPoint_type, pointType)); } + + @Override + public List getCachePointSame(SlitterPlanDistinctDto dto) { + return bstIvtCutpointivtMapper.getCachePointSame(dto); + } + + @Override + public List getReallyQzzSameDevice(String resourceName) { + return bstIvtCutpointivtMapper.getReallyQzzSameDevice(resourceName); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.java index 9e1747236..2a9dbc3d5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.java @@ -20,4 +20,11 @@ public interface SchBaseTaskMapper extends BaseMapper { * @return 任务 */ List checkHaveTask(String code); + + /** + * 查找当前设备有没有送轴的任务 + * @param resourceName / + * @return / + */ + List getTaskByPlanQzzNoAndDevice(String resourceName); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.xml index 968ce2474..0cfebb4cd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.xml @@ -13,4 +13,10 @@ OR point_code4 = #{code} ) + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/IschBaseTaskService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/IschBaseTaskService.java index e62b28add..0f374651a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/IschBaseTaskService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/IschBaseTaskService.java @@ -66,6 +66,13 @@ public interface IschBaseTaskService extends IService { * @return 任务 */ List checkHaveTask(String code); + + /** + * 查找当前设备有没有送轴的任务 + * @param resourceName / + * @return / + */ + List getTaskByPlanQzzNoAndDevice(String resourceName); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/impl/SchBaseTaskServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/impl/SchBaseTaskServiceImpl.java index 4c33fefe3..1ef1e9fbe 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/impl/SchBaseTaskServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/impl/SchBaseTaskServiceImpl.java @@ -108,9 +108,10 @@ public class SchBaseTaskServiceImpl extends ServiceImpl getTaskByPlanQzzNoAndDevice(String resourceName) { + return schBaseTaskMapper.getTaskByPlanQzzNoAndDevice(resourceName); + } /** 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 6b3dda714..dbadf3960 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 @@ -99,7 +99,8 @@ public class AutoCallAirShaftTask { // 2、获取分切计划数据 校验代数 List planAll = slittingproductionplanService.getAllCutPlan(); List plans = planAll.stream() - .filter(p -> p.getResource_name().startsWith("B6")).collect(Collectors.toList()); + .filter(p -> p.getResource_name().startsWith("B6") && + (checkComputationPoint(p) && checkHasTask(p))).collect(Collectors.toList()); if (plans.size() == 0) { // 如果不需要套轴，就只做拔轴 makePullShaft(empty, specification); @@ -458,9 +459,11 @@ public class AutoCallAirShaftTask { * @return */ public boolean checkHasTask(SlitterPlanDistinctDto dto) { - // 同设备，同母卷，同组别的任务 - - // 桁架也需要校验 + // 同设备，同母卷，同组别的AGV任务 010813。 + List tasks = taskService.getTaskByPlanQzzNoAndDevice(dto.getResource_name()); + if (tasks.size() == 0) { + return true; + } return false; } @@ -471,7 +474,18 @@ public class AutoCallAirShaftTask { */ public boolean checkComputationPoint(SlitterPlanDistinctDto dto) { // 同设备，同母卷，同组别的点位 - + if (ObjectUtil.isNotEmpty(dto)) { + List cuts = bcutpointivtService.getCachePointSame(dto); + if (cuts.size() > 0) { + return true; + } + // 校验是否在拔轴暂存位、分切对接位有相同设备的分切计划信息。 + // 有就返回false, 没有就返回true + List cuts2 = bcutpointivtService.getReallyQzzSameDevice(dto.getResource_name()); + if (cuts2.size() == 0) { + return true; + } + } // 有就返回true return false; } 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 c8cedd173..9c790d1d2 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 @@ -16,7 +16,7 @@ LIMIT 1