From 9cb724d1a49d7c52b98c53cb86ebe93920caf80e Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Tue, 18 Feb 2025 13:54:14 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E5=88=86=E5=88=87=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E4=B8=BA=E6=94=B9=E5=88=87=E9=80=A0=E6=88=90=E5=A5=97=E8=BD=B4?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IPdmBiSlittingproductionplanService.java | 2 + .../PdmBiSlittingproductionplanMapper.java | 2 + .../PdmBiSlittingproductionplanMapper.xml | 45 +++++++++++++++++++ ...dmBiSlittingproductionplanServiceImpl.java | 5 +++ .../slitter/auto/AutoCallAirShaftTask.java | 13 +++++- .../slitter/auto/AutoSendAirShaftAgvTask.java | 2 + 6 files changed, 68 insertions(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java index 31675575f..32af82318 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java @@ -136,4 +136,6 @@ public interface IPdmBiSlittingproductionplanService extends IService getAllHalfPlanRestruct(List qzzs); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.java index 2accf528c..b02a0d5b4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.java @@ -17,4 +17,6 @@ public interface PdmBiSlittingproductionplanMapper extends BaseMapper getAllHalfPlan(List qzzs); List getCurrentPlanInfos(SlitterPlanDistinctDto dto); + + List getAllHalfPlanRestruct(List qzzs); } 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 30d17038a..1545dfc22 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 @@ -151,4 +151,49 @@ AND (p.parent_container_name = #{parent_container_name} OR restruct_container_name = #{parent_container_name}) AND p.split_group ]]> #{split_group} + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java index 762b25f92..518f58080 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java @@ -191,4 +191,9 @@ public class PdmBiSlittingproductionplanServiceImpl extends ServiceImpl getAllHalfPlanRestruct(List qzzs) { + return pdmBiSlittingproductionplanMapper.getAllHalfPlanRestruct(qzzs); + } } 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 edf45d50b..4a2f1d37a 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 @@ -154,7 +154,18 @@ public class AutoCallAirShaftTask { return; } // 从寻查找分切计划，并放在plans, 没有考虑区域问题， 里面会考虑代数 - plans = slittingproductionplanService.getAllHalfPlan(qzzs); + List tzOKPlans = slittingproductionplanService.getByQzzNos(qzzs, "01"); + if (ObjectUtil.isEmpty(tzOKPlans)) { + log.info("计划找不到"); + return; + } + PdmBiSlittingproductionplan oneTzOkPlan = tzOKPlans.get(0); + if (oneTzOkPlan.getOrder_type().equals("1")) { + plans = slittingproductionplanService.getAllHalfPlan(qzzs); + } else { + // 改切 + plans = slittingproductionplanService.getAllHalfPlanRestruct(qzzs); + } if (plans.size() == 0) { log.info("没有找到对应的另一半分切计划没有找到"); // 如果不需要套轴，就只做拔轴 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 93ba2e16a..9bc015e9b 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 @@ -102,11 +102,13 @@ public class AutoSendAirShaftAgvTask { // 单条可能还有一条未套轴 List list = slittingproductionplanService.list(new LambdaQueryWrapper() .eq(PdmBiSlittingproductionplan::getParent_container_name, demoPlan.getParent_container_name()) + .eq(PdmBiSlittingproductionplan::getRestruct_container_name, demoPlan.getRestruct_container_name()) .eq(PdmBiSlittingproductionplan::getResource_name, demoPlan.getResource_name()) .eq(PdmBiSlittingproductionplan::getSplit_group, demoPlan.getSplit_group()) .ne(PdmBiSlittingproductionplan::getUp_or_down, demoPlan.getUp_or_down()) .eq(PdmBiSlittingproductionplan::getIs_delete, SlitterConstant.SLITTER_NO)); if (list.size() > 0) { + log.info("还有不同轴，所以不继续"); // 还有不同轴，所以不继续 continue; }