From 8c732c389861505af8f3561bcc5fd11a5a69b030 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Mon, 23 Mar 2026 16:07:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A5=97=E8=BD=B4=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=B8=8D=E5=8E=BB=E6=99=AE=E9=80=9A=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E7=94=B3=E8=AF=B7=E6=B0=94=E8=83=80=E8=BD=B4?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E4=BB=BB=E5=8A=A1=E5=8F=AA=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slitter/auto/AutoCallAirShaftTask.java | 3 +- .../service/impl/SlitterServiceImpl.java | 44 +++++++++---------- 2 files changed, 24 insertions(+), 23 deletions(-) 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 bed42e791..a0e632f91 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 @@ -692,6 +692,7 @@ public class AutoCallAirShaftTask extends Prun { if (ObjectUtil.isEmpty(one)) { canMovePointList = canMovePointListAll; } else { + log.info("正在过滤另一台机构的管芯数据..."); // 把另一台机构所需要的管芯对应的位置过滤掉 List otherTubes = Stream.of(one.getTube_code1(), one.getTube_code2()).filter(ObjectUtil::isNotEmpty).collect(Collectors.toList()); canMovePointList = canMovePointListAll.stream().filter(bh -> { @@ -729,7 +730,7 @@ public class AutoCallAirShaftTask extends Prun { stepErrorInfo.add("备货区正在搬运管芯过来，托盘号：[" + needPoint.getVehicle_code() + "]。"); return 1; } - // 3.2 判断是否有单独拉出去的任务，有的话直接拉过来。 + // 3.2 判断是否有单独拉出去的任务，有的话直接拉过来。（010816的任务） List stockingivts = stockingivtService.getMoveTaskPoints(); if (CollectionUtil.isNotEmpty(stockingivts)) { // 判断当前这个拉出去的点位有没有拉进来的任务 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 87d0a90ee..5e1c45cdd 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 @@ -436,27 +436,27 @@ public class SlitterServiceImpl implements SlitterService { return res; } // 找套轴对接位（任取一个空点） - exceptionPointCodes = bcutpointivtService.getCanUseMinPointByShelfSpecial("1", "0"); - if (exceptionPointCodes.size() > 0) { - String exceptionPoint = exceptionPointCodes.get(0); - JSONObject exParam = new JSONObject(); - exParam.put("point_code1", startPoint.getPoint_code()); - exParam.put("point_code2", exceptionPoint); - if (exceptionPoint.endsWith("A")) { - exParam.put("vehicle_code1", collect); - } else { - exParam.put("vehicle_code2", collect); - } - exParam.put("task_type", SlitterEnum.TASK_TYPE.code("套轴异常处理桁架任务")); - exParam.put("product_area", SlitterConstant.SLITTER_TASK_AREA); - exParam.put("acs_task_type", "6"); - exParam.put("qzz_size", startPoint.getQzz_size()); - exParam.put("containers", collect); - sendNBJExceptionPointTask.createTask(exParam); - res.put("status", HttpStatus.HTTP_OK); - res.put("message", "创建送至对接位等待异常处理位!"); - return res; - } +// exceptionPointCodes = bcutpointivtService.getCanUseMinPointByShelfSpecial("1", "0"); +// if (exceptionPointCodes.size() > 0) { +// String exceptionPoint = exceptionPointCodes.get(0); +// JSONObject exParam = new JSONObject(); +// exParam.put("point_code1", startPoint.getPoint_code()); +// exParam.put("point_code2", exceptionPoint); +// if (exceptionPoint.endsWith("A")) { +// exParam.put("vehicle_code1", collect); +// } else { +// exParam.put("vehicle_code2", collect); +// } +// exParam.put("task_type", SlitterEnum.TASK_TYPE.code("套轴异常处理桁架任务")); +// exParam.put("product_area", SlitterConstant.SLITTER_TASK_AREA); +// exParam.put("acs_task_type", "6"); +// exParam.put("qzz_size", startPoint.getQzz_size()); +// exParam.put("containers", collect); +// sendNBJExceptionPointTask.createTask(exParam); +// res.put("status", HttpStatus.HTTP_OK); +// res.put("message", "创建送至对接位等待异常处理位!"); +// return res; +// } // 半条任务等待补齐 stepTipLogs.add("套轴完成->[" + collect + "]对应的分切计划状态已更改，无暂存位置，创建任务失败!"); @@ -647,7 +647,7 @@ public class SlitterServiceImpl implements SlitterService { String qzzSize = param.getString("size"); // 判断是否有未完成的任务 List list = taskService.list(new LambdaQueryWrapper() - .eq(SchBaseTask::getPoint_code1, deviceCode) + .eq(SchBaseTask::getPoint_code2, deviceCode) .lt(SchBaseTask::getTask_status, "07")); if (list.size() > 0) { stepTipLogs.add(">>>气胀轴出库请求异常：点位[" + deviceCode + "]存在未完成的任务，无法创建从气涨轴暂存位取轴的任务！");