root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 分切下料上气胀轴任务位置修改

Browse Source
This commit is contained in:
liyongde
2024-05-30 09:48:42 +08:00
parent 484f52f8f7
commit 3e7a8f2784
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoUpShaftTrussTask.java
View File

@@ -97,9 +97,9 @@ public class AutoUpShaftTrussTask {
if (ObjectUtil.isNotEmpty(nextUpPlan) && ObjectUtil.isNotEmpty(nextDownPlan)) { 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_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("point_code4", device.getDown_point_code());
param.put("vehicle_code1", newCutPoint.getQzz_no1()); param.put("vehicle_code1", newCutPoint.getQzz_no1());
param.put("vehicle_code2", newCutPoint.getQzz_no2()); param.put("vehicle_code2", newCutPoint.getQzz_no2());

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/controller/SlitterController.java
View File

@@ -52,7 +52,7 @@ public class SlitterController {
@PostMapping("/test3") @PostMapping("/test3")
@Log("1111") @Log("1111")
public ResponseEntity<Object> create3(@RequestBody JSONObject entity){ public ResponseEntity<Object> create3(@RequestBody JSONObject entity){
List<String> collect = Stream.of("B2652312312901A1").collect(Collectors.toList()); List<String> collect = Stream.of("B1232401020303A1", "B1232401020303A2").collect(Collectors.toList());
entity.put("container", collect); entity.put("container", collect);
return new ResponseEntity<>(slitterService.mesSlittingMachineSendMaterial(entity), HttpStatus.CREATED); return new ResponseEntity<>(slitterService.mesSlittingMachineSendMaterial(entity), HttpStatus.CREATED);
} }

10
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
View File

@@ -377,7 +377,7 @@ public class SlitterServiceImpl implements SlitterService {
taskParam.put("point_code1", currentUpPlan == null taskParam.put("point_code1", currentUpPlan == null
? device.getDown_point_code() : device.getUp_point_code()); ? device.getDown_point_code() : device.getUp_point_code());
taskParam.put("point_code2", currentUpPlan == null 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("truss_type", "1");
taskParam.put("empty_site", "0"); taskParam.put("empty_site", "0");
} }
@@ -449,18 +449,18 @@ public class SlitterServiceImpl implements SlitterService {
case "10": case "10":
// 下双上单 // 下双上单
taskParam.put("point_code1", device.getUp_point_code()); 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_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("truss_type", "4");
taskParam.put("empty_site", nextUpPlan == null ? "1" : "2"); taskParam.put("empty_site", nextUpPlan == null ? "1" : "2");
break; break;
case "11": case "11":
// 下双上双 // 下双上双
taskParam.put("point_code1", device.getUp_point_code()); 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_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("truss_type", "3");
taskParam.put("empty_site", "3"); taskParam.put("empty_site", "3");
break; break;