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");