From b4c74446704f6c190a473e292d555e62c20263a6 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Wed, 10 Jul 2024 18:52:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=86=E5=88=87=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PdmBiSlittingproductionplanMapper.xml | 2 +- .../sch/tasks/slitter/SlitterDownTrussTask.java | 2 ++ .../service/impl/SlitterServiceImpl.java | 4 ++++ .../sch/tasks/slitter/util/SlitterTaskUtil.java | 17 +++++++++++++++++ 4 files changed, 24 insertions(+), 1 deletion(-) 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 b088fdcfd..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 @@ -6,7 +6,7 @@ resultType="org.nl.b_lms.sch.tasks.slitter.mapper.dto.SlitterPlanDistinctDto"> SELECT p.resource_name, - IF(p.order_type = 1,p.parent_container_name,p.container_name) AS parent_container_name, + p.parent_container_name, p.split_group, p.up_or_down, p.qzz_size, 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 447e002af..df44e055b 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 @@ -108,6 +108,7 @@ public class SlitterDownTrussTask extends AbstractAcsTask { // 下来的分切计划状态：06 -> 09 PdmBiSlittingproductionplan p = new PdmBiSlittingproductionplan(); p.setStatus("09"); + p.setEnd_time(DateUtil.now()); TaskUtils.updateOptMessageBySlitterPlan(p); List downQzzNos = Stream.of(tmpUpQzzNo, tmpDownQzzNo) .filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList()); @@ -115,6 +116,7 @@ public class SlitterDownTrussTask extends AbstractAcsTask { .in(PdmBiSlittingproductionplan::getQzzno, downQzzNos)); // 上去的分切计划状态：04 -> 05 p.setStatus("05"); + p.setEnd_time(""); List upQzzNos = Stream.of(point2.getQzz_no1(), point2.getQzz_no2()) .filter(value -> value != null && !value.isEmpty()).collect(Collectors.toList()); if (upQzzNos.size() > 0) { 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 732acd994..f5e146093 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 @@ -62,6 +62,7 @@ import java.util.stream.Stream; import static org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil.getNumberByResourceCode; import static org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil.getPointLocationInCutDevice; +import static org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil.getPaperLength; /** * @author lyd @@ -486,6 +487,9 @@ public class SlitterServiceImpl implements SlitterService { List cutPointList = slitterMapper.getReadyShaftPoint(device.getExt_code()); // 任务参数 JSONObject taskParam = new JSONObject(); + // 设置纸管长度 +// taskParam.put("up_length", getPaperLength(currentUpPlan)); +// taskParam.put("down_lengtht", getPaperLength(currentDownPlan)); if (timePlans.size() == 0 || cutPointList.size() == 0) { // 如果没有下一组的分切计划，就只做下卷任务（判断下单/下双） // 获取分切对接位没任务的空位置 diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java index 101cce57f..359b8d6e3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java @@ -286,4 +286,21 @@ public class SlitterTaskUtil { return "-"; } } + + /** + * 获取纸管长度 + * @param plan 分切计划 + * @return / + */ + public static String getPaperLength(PdmBiSlittingproductionplan plan) { +// String s = "玻璃纤维及其制品|FRP管|6英寸|15|1700"; + String paperStr = ""; + if (plan.getPaper_tube_or_FRP().equals(SlitterConstant.SLITTER_TYPE_PAPER)) { + paperStr = plan.getPaper_tube_model(); + } else { + paperStr = plan.getFRP_model(); + } + String[] split = paperStr.split("\\|"); + return split[split.length - 1]; + } }