From 13c53cfaa45ae8f78f7081167ea498164b6b2acd Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Thu, 6 Mar 2025 13:14:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=98=B2=E6=AD=A2=E5=88=86=E5=88=87?= =?UTF-8?q?=E4=B8=8B=E5=8D=B7=E6=97=B6=E5=8D=B7=E5=8F=B7=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tasks/slitter/SlitterDownTrussTask.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java index 929d732c8..56ef64e9f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/SlitterDownTrussTask.java @@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -96,6 +97,8 @@ public class SlitterDownTrussTask extends AbstractAcsTask { if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) { task.setTask_status(TaskStatusEnum.FINISHED.getCode()); + JSONObject requestParam = JSONObject.parseObject(task.getRequest_param()); + JSONArray containers = requestParam.getJSONArray("containers"); String pointCode1 = task.getPoint_code1(); String pointCode2 = task.getPoint_code2(); StIvtCutpointivt point1 = cutpointivtService.getPintByUpOrDownCode(pointCode1, false); @@ -105,18 +108,15 @@ public class SlitterDownTrussTask extends AbstractAcsTask { point2 = bcutpointivtService.getPintByTrussCode(pointCode1, false); } // 点位数据更新 - String tmpUpQzzNo = point1.getUp_qzzno(); - String tmpDownQzzNo = point1.getDown_qzzno(); point1.setUp_qzzno(point2.getQzz_no1()); point1.setDown_qzzno(point2.getQzz_no2()); log.info("起点数据：{}", point1); log.info("终点数据：{}", point2); // 更新分切计划 // 下来的分切计划状态：06 -> 09, 设置重量 - List downQzzNos = Stream.of(tmpUpQzzNo, tmpDownQzzNo) - .filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList()); - log.info("即将下卷的上下轴的气胀轴编码数据：{}", downQzzNos); - List downPlans = slittingproductionplanService.getByQzzNos(downQzzNos); + List downCons = containers.toJavaList(String.class); + log.info("即将下卷的上下轴的子卷号数据：{}", downCons); + List downPlans = slittingproductionplanService.getByContainerNames(downCons); SlitterTaskUtil.setPaperWeightStr(point1.getRemark(), downPlans); downPlans.forEach(downPlan -> { downPlan.setStatus("09"); @@ -124,6 +124,12 @@ public class SlitterDownTrussTask extends AbstractAcsTask { TaskUtils.updateOptMessageBySlitterPlan(downPlan); }); slittingproductionplanService.updateBatchById(downPlans); + // 获取气胀轴编码 + // 筛选上下轴各一条 + PdmBiSlittingproductionplan upPlan = downPlans.stream().filter(p -> "1".equals(p.getUp_or_down())).findFirst().orElse(null); + PdmBiSlittingproductionplan downPlan = downPlans.stream().filter(p -> "2".equals(p.getUp_or_down())).findFirst().orElse(null); + String tmpUpQzzNo = upPlan != null ? upPlan.getQzzno() : ""; + String tmpDownQzzNo = downPlan != null ? downPlan.getQzzno() : ""; // 设置完了就清空 point1.setRemark(""); // 上去的分切计划状态：04 -> 05