From 72863a797be48d1b46647f1606ba8567df040dcf Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Fri, 31 May 2024 10:16:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=A1=81=E6=9E=B6=E4=B8=8B=E5=8D=B7?= 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, 7 insertions(+), 3 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 ca5d2ab57..593be5423 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 @@ -340,7 +340,7 @@ public class SlitterServiceImpl implements SlitterService { // 获得设备 StIvtCutpointivt device = cutpointivtService.getOne(new LambdaQueryWrapper() .eq(StIvtCutpointivt::getExt_code, demoPlan.getResource_name())); - String area = demoPlan.getResource_name().substring(0, 2); + String area = demoPlan.getContainer_name().substring(0, 2); // 获取当前分切机的下一组分切计划(最多四条分切计划) // hint: 获取到的分切可能是不同组的但具有一定时间顺序 List timePlans = slittingproductionplanService.list(new LambdaQueryWrapper() @@ -443,6 +443,10 @@ public class SlitterServiceImpl implements SlitterService { ? device.getUp_point_code() : device.getDown_point_code()); taskParam.put("point_code2", currentUpPlan != null ? newCutPoint.getTruss_point_code1() : newCutPoint.getTruss_point_code2()); + taskParam.put("point_code3", currentUpPlan == null + ? device.getUp_point_code() : device.getDown_point_code()); + taskParam.put("point_code4", currentUpPlan == null + ? newCutPoint.getTruss_point_code1() : newCutPoint.getTruss_point_code2()); taskParam.put("truss_type", "3"); taskParam.put("empty_site", "3"); break; @@ -453,7 +457,7 @@ public class SlitterServiceImpl implements SlitterService { taskParam.put("point_code3", device.getDown_point_code()); taskParam.put("point_code4", newCutPoint.getTruss_point_code2()); taskParam.put("truss_type", "4"); - taskParam.put("empty_site", nextUpPlan == null ? "1" : "2"); + taskParam.put("empty_site", nextUpPlan == null ? "2" : "1"); break; case "11": // 下双上双 @@ -461,7 +465,7 @@ public class SlitterServiceImpl implements SlitterService { taskParam.put("point_code2", newCutPoint.getTruss_point_code1()); taskParam.put("point_code3", device.getDown_point_code()); taskParam.put("point_code4", newCutPoint.getTruss_point_code2()); - taskParam.put("truss_type", "3"); + taskParam.put("truss_type", "2"); taskParam.put("empty_site", "3"); break; default: