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;