From 49e07e2b2016aeda41a559bdb9fec553a41999f2 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Wed, 3 Jul 2024 14:28:47 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sch/tasks/slitter/auto/AutoSendAirShaftAgvTask.java | 5 ++--- 1 file changed, 2 insertions(+), 3 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 04fd9fd28..e1015f074 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 @@ -85,9 +85,8 @@ public class AutoSendAirShaftAgvTask { // 获取任意一条 PdmBiSlittingproductionplan demoPlan = plans.get(0); // 区域(B1, B2, B3, B4) - String area = demoPlan.getContainer_name().substring(0, 2); - StIvtCutpointivt deviceCut = cutpointivtService.getOne(new LambdaQueryWrapper() - .eq(StIvtCutpointivt::getExt_code, demoPlan.getResource_name())); + StIvtCutpointivt deviceCut = cutpointivtService.getPintByExtCode(demoPlan.getResource_name(), false); + String area = deviceCut.getProduct_area(); // 校验是否为一组 if (ObjectUtil.isEmpty(cutPoint.getQzz_no1()) || ObjectUtil.isEmpty(cutPoint.getQzz_no2())) { // 单条可能还有一条未套轴 From 9d8c85f192dd52cbf2c5962639b5bccd9b35d478 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Wed, 3 Jul 2024 16:07:05 +0800 Subject: [PATCH 2/4] =?UTF-8?q?opt=EF=BC=9A=E4=BC=98=E5=8C=96=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sch/tasks/slitter/service/impl/SlitterServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java index 42890437d..f741becf2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java @@ -769,6 +769,9 @@ public class SlitterServiceImpl implements SlitterService { StIvtCutpointivt deviceCode = cutpointivtService.getPintByExtCode(device_code, false); List qzzNo = Stream.of(deviceCode.getUp_qzzno(), deviceCode.getDown_qzzno()) .filter(ObjectUtil::isNotEmpty).collect(Collectors.toList()); + if (qzzNo.size() == 0) { + throw new BadRequestException("分切机 " + device_code + " 的分切计划不存在!"); + } List list = slittingproductionplanService.getByQzzNos(qzzNo, "05"); if (list.size() == 0) { throw new BadRequestException("分切机" + device_code + " 的分切计划 " + qzzNo + " 不存在"); From fb8bda8086277b889bab36483b9a95b197915439 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Wed, 3 Jul 2024 16:21:13 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E8=BF=87=E6=BB=A4B6=E5=88=86?= =?UTF-8?q?=E5=88=87=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d20bf207a..acb923494 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 @@ -92,7 +92,7 @@ public class AutoCallAirShaftTask { // 2、获取分切计划数据 校验代数 List planAll = slittingproductionplanService.getAllCutPlan(); List plans = planAll.stream() - .filter(p -> p.getResource_name().startsWith("B")).collect(Collectors.toList()); + .filter(p -> p.getResource_name().startsWith("B6")).collect(Collectors.toList()); if (plans.size() == 0) { // 如果不需要套轴，就只做拔轴 makePullShaft(empty, specification); From 6c606c5f8001b645bb7a755d9bdc49483d62d69e Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Wed, 3 Jul 2024 19:24:13 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E8=BF=87=E6=BB=A4=E7=A9=BA=E7=9B=B4?= =?UTF-8?q?=E5=88=86=E5=88=87=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PdmBiSlittingproductionplanMapper.xml | 4 +-- .../slitter/auto/AutoCallAirShaftTask.java | 27 +++++++++++++++++++ .../slitter/auto/AutoSendAirShaftAgvTask.java | 2 +- .../tasks/slitter/constant/SlitterEnum.java | 2 +- 4 files changed, 31 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 456468995..0fc5643aa 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 @@ -65,8 +65,8 @@ AND p.is_child_tz_ok = '0' AND p.is_paper_ok = '1' AND p.is_delete = '0' - AND p.up_or_down IS NOT NULL - AND p.left_or_right IS NOT NULL + AND IFNULL(p.up_or_down,'') ]]> '' + AND IFNULL(p.left_or_right,'') ]]> '' 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 acb923494..6b3dda714 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 @@ -15,6 +15,8 @@ import org.nl.b_lms.bst.ivt.stockingivt.service.IBstIvtStockingivtService; import org.nl.b_lms.bst.ivt.stockingivt.service.dao.BstIvtStockingivt; import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproductionplanService; import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan; +import org.nl.b_lms.sch.task.dao.SchBaseTask; +import org.nl.b_lms.sch.task.service.IschBaseTaskService; import org.nl.b_lms.sch.tasks.slitter.StockAreaCallTubeTask; import org.nl.b_lms.sch.tasks.slitter.StockAreaSendVehicleTask; import org.nl.b_lms.sch.tasks.slitter.TrussCallAirShaftTask; @@ -32,8 +34,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; +import java.util.stream.Stream; import static org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil.*; @@ -70,6 +74,8 @@ public class AutoCallAirShaftTask { private StockAreaCallTubeTask stockAreaCallTubeTask; @Autowired private IMdPbPapervehicleService mdPbPapervehicleService; + @Autowired + private IschBaseTaskService taskService; /** * hint: 目前只是考虑了上区域 @@ -82,6 +88,7 @@ public class AutoCallAirShaftTask { */ @Transactional(rollbackFor = Exception.class) public void run() { + log.info(this.getClass().getName() + "开始执行..."); // 1、获取空的插拔轴位(无任务) List emptyPoints = bstIvtShafttubeivtService.getAllShaftPointsByConditions("2", "0", "0"); @@ -445,7 +452,27 @@ public class AutoCallAirShaftTask { trussCallAirShaftTask.createTask(param); } + /** + * 检查是否有同设备的任务 + * @param dto + * @return + */ public boolean checkHasTask(SlitterPlanDistinctDto dto) { + // 同设备，同母卷，同组别的任务 + + // 桁架也需要校验 + return false; + } + + /** + * 检查是否有同母卷，不同组的点位数据 + * @param dto + * @return + */ + public boolean checkComputationPoint(SlitterPlanDistinctDto dto) { + // 同设备，同母卷，同组别的点位 + + // 有就返回true return false; } 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 e1015f074..870e55648 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 @@ -123,7 +123,7 @@ public class AutoSendAirShaftAgvTask { param.put("point_code2", endPoint.getPoint_code()); param.put("vehicle_code1", cutPoint.getQzz_no1()); param.put("vehicle_code2", cutPoint.getQzz_no2()); - param.put("task_type", SlitterEnum.TASK_TYPE.code("穿拔轴缓存<>穿拔轴位")); + param.put("task_type", SlitterEnum.TASK_TYPE.code("送气胀轴到分切机任务")); param.put("product_area", SlitterConstant.SLITTER_TASK_AREA); sendAirShaftAgvTask.createTask(param); } else { diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterEnum.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterEnum.java index b19d87520..f7313a42f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterEnum.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/constant/SlitterEnum.java @@ -22,7 +22,7 @@ public enum SlitterEnum { TASK_TYPE(MapOf.of("穿拔轴缓存<>穿拔轴位", "010801", "穿拔轴缓存<>分切对接位", "010802", "穿拔轴位<>气胀轴缓存位", "010803" , "分切机下料AGV任务", "010804", "分切机上气胀轴", "010805", "分切机下气胀轴", "010806", "备货区送载具", "010807" , "备货区送纸管", "010808", "分切机下料桁架任务", "010809", "分切机下料AGV到内包间", "010810", "套轴异常处理AGV任务", "010811" - , "套轴异常处理桁架任务", "010812")); + , "套轴异常处理桁架任务", "010812", "送气胀轴到分切机任务", "010813")); private Map code; public String code(String desc) {