From cf451f52c9478a99d769225af8c49a0174ba9975 Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Fri, 31 May 2024 16:14:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=88=86=E5=88=87=E8=A1=8C=E6=9E=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=82=B9=E4=BD=8D=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tasks/slitter/service/impl/SlitterServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 d945b3b5a..6740aa5c4 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 @@ -427,13 +427,13 @@ public class SlitterServiceImpl implements SlitterService { switch (binaryExpress) { case "00": // 下单上单 - taskParam.put("point_code1", currentUpPlan != null + taskParam.put("point_code1", nextUpPlan != null + ? newCutPoint.getTruss_point_code1() : newCutPoint.getTruss_point_code2()); + taskParam.put("point_code2", nextUpPlan != null ? device.getUp_point_code() : device.getDown_point_code()); - taskParam.put("point_code2", currentUpPlan != null - ? newCutPoint.getTruss_point_code2() : newCutPoint.getTruss_point_code1()); - taskParam.put("point_code3", nextUpPlan != null + taskParam.put("point_code3", currentUpPlan != null ? device.getUp_point_code() : device.getDown_point_code()); - taskParam.put("point_code4", nextUpPlan != null + taskParam.put("point_code4", currentUpPlan != null ? newCutPoint.getTruss_point_code1() : newCutPoint.getTruss_point_code2()); taskParam.put("truss_type", "1"); taskParam.put("empty_site", "0");