From 3e7a8f2784971d156b308e22e0b1c49622085851 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Thu, 30 May 2024 09:48:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=86=E5=88=87=E4=B8=8B=E6=96=99?= =?UTF-8?q?=E4=B8=8A=E6=B0=94=E8=83=80=E8=BD=B4=E4=BB=BB=E5=8A=A1=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sch/tasks/slitter/auto/AutoUpShaftTrussTask.java | 4 ++-- .../tasks/slitter/controller/SlitterController.java | 2 +- .../tasks/slitter/service/impl/SlitterServiceImpl.java | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoUpShaftTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoUpShaftTrussTask.java index 6d3c220ea..95e346bbd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoUpShaftTrussTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoUpShaftTrussTask.java @@ -97,9 +97,9 @@ public class AutoUpShaftTrussTask { if (ObjectUtil.isNotEmpty(nextUpPlan) && ObjectUtil.isNotEmpty(nextDownPlan)) { // 双轴任务参数构建 - param.put("point_code1", newCutPoint.getTruss_point_code1()); + param.put("point_code1", newCutPoint.getTruss_point_code2()); param.put("point_code2", device.getUp_point_code()); - param.put("point_code3", newCutPoint.getTruss_point_code2()); + param.put("point_code3", newCutPoint.getTruss_point_code1()); param.put("point_code4", device.getDown_point_code()); param.put("vehicle_code1", newCutPoint.getQzz_no1()); param.put("vehicle_code2", newCutPoint.getQzz_no2()); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/controller/SlitterController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/controller/SlitterController.java index b0538106c..ee47ccdc8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/controller/SlitterController.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/controller/SlitterController.java @@ -52,7 +52,7 @@ public class SlitterController { @PostMapping("/test3") @Log("1111") public ResponseEntity create3(@RequestBody JSONObject entity){ - List collect = Stream.of("B2652312312901A1").collect(Collectors.toList()); + List collect = Stream.of("B1232401020303A1", "B1232401020303A2").collect(Collectors.toList()); entity.put("container", collect); return new ResponseEntity<>(slitterService.mesSlittingMachineSendMaterial(entity), HttpStatus.CREATED); } 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 450d0cc90..ca5d2ab57 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 @@ -377,7 +377,7 @@ public class SlitterServiceImpl implements SlitterService { taskParam.put("point_code1", currentUpPlan == null ? device.getDown_point_code() : device.getUp_point_code()); taskParam.put("point_code2", currentUpPlan == null - ? emptyPoint.getTruss_point_code1() : emptyPoint.getTruss_point_code2()); + ? emptyPoint.getTruss_point_code2() : emptyPoint.getTruss_point_code1()); taskParam.put("truss_type", "1"); taskParam.put("empty_site", "0"); } @@ -449,18 +449,18 @@ public class SlitterServiceImpl implements SlitterService { case "10": // 下双上单 taskParam.put("point_code1", device.getUp_point_code()); - taskParam.put("point_code2", newCutPoint.getTruss_point_code2()); + taskParam.put("point_code2", newCutPoint.getTruss_point_code1()); taskParam.put("point_code3", device.getDown_point_code()); - taskParam.put("point_code4", newCutPoint.getTruss_point_code1()); + taskParam.put("point_code4", newCutPoint.getTruss_point_code2()); taskParam.put("truss_type", "4"); taskParam.put("empty_site", nextUpPlan == null ? "1" : "2"); break; case "11": // 下双上双 taskParam.put("point_code1", device.getUp_point_code()); - taskParam.put("point_code2", newCutPoint.getTruss_point_code2()); + taskParam.put("point_code2", newCutPoint.getTruss_point_code1()); taskParam.put("point_code3", device.getDown_point_code()); - taskParam.put("point_code4", newCutPoint.getTruss_point_code1()); + taskParam.put("point_code4", newCutPoint.getTruss_point_code2()); taskParam.put("truss_type", "3"); taskParam.put("empty_site", "3"); break;