From b1a5ca5ab1d6c0589b5cd1f48a3675a03af42f96 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Sat, 10 May 2025 09:59:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A5=97=E8=BD=B4=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=99=9A=E6=8B=9F=EF=BC=88=E5=AE=9E=E9=99=85=EF=BC=89=E7=9B=B8?= =?UTF-8?q?=E4=BA=92=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/PdmBiSlittingproductionplanMapper.xml | 2 -- .../tasks/slitter/auto/AutoCallAirShaftTask.java | 14 ++++++++++---- 2 files changed, 10 insertions(+), 6 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 9d29be4f4..e5c02f1b8 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 @@ -71,8 +71,6 @@ AND IFNULL(p.up_or_down,'') ]]> '' 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 p.container_name LIKE '%虚拟-B%' AND '1' = (SELECT c.is_used FROM st_ivt_cutpointivt c WHERE c.ext_code = p.resource_name) GROUP BY p.resource_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 56967fb2a..161cfac67 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 @@ -97,6 +97,7 @@ public class AutoCallAirShaftTask { public final static String PARAM_CODE_PLAN_AREA = "PARAM_CODE_PLAN_AREA"; public final static String IS_ONLY_PULLING = "IS_ONLY_PULLING"; public final static String TZ_DAY = "TZ_DAY"; + public final static String USE_XN = "USE_XN"; public String stepStr = ""; /** @@ -114,19 +115,20 @@ public class AutoCallAirShaftTask { Param isOnlyPulling = paramService.findByCode(IS_ONLY_PULLING); Param tzDay = paramService.findByCode(TZ_DAY); Param paramObj = paramService.findByCode(PARAM_CODE_PLAN_AREA); + Param useXn = paramService.findByCode(USE_XN); // 1、获取空的插拔轴位(无任务) List emptyPoints = bstIvtShafttubeivtService.getAllShaftPointsByConditions("2", "0", "0"); // emptyPoints.forEach(empty -> doCallShaft(empty, isOnlyPulling, tzDay, paramObj)); for (BstIvtShafttubeivt empty : emptyPoints) { stepStr = ""; - doCallShaft(empty, isOnlyPulling, tzDay, paramObj); + doCallShaft(empty, isOnlyPulling, tzDay, paramObj, useXn); redisUtils.set("INFO" + empty.getPoint_code(), stepStr); } } @Transactional(rollbackFor = Exception.class) - public void doCallShaft(BstIvtShafttubeivt empty, Param isOnlyPulling, Param tzDay, Param paramObj) { + public void doCallShaft(BstIvtShafttubeivt empty, Param isOnlyPulling, Param tzDay, Param paramObj, Param useXn) { // 标箔：1，锂电：2 改：大小：4代5代 String specification = empty.getQzz_generation(); String location = empty.getPoint_location(); @@ -139,8 +141,12 @@ public class AutoCallAirShaftTask { stepStr += ",2"; Integer integer = Integer.valueOf(ObjectUtil.isEmpty(tzDay.getValue()) ? "0" : tzDay.getValue()); // 2、获取分切计划数据 校验代数 todo： 顺序可能需要考虑 -// List planAll = slittingproductionplanService.getAllCutPlan(integer); - List planAll = slittingproductionplanService.getAllCutPlan2(integer); + List planAll; + if (ObjectUtil.isNotEmpty(useXn) && "1".equals(useXn.getValue())) { + planAll = slittingproductionplanService.getAllCutPlan2(integer); + } else { + planAll = slittingproductionplanService.getAllCutPlan(integer); + } // 排序 /* List planAll = planAllNoSort.stream() .sorted(Comparator.comparing(