Browse Source

fix:缓存工艺id

master
白凤吉 3 weeks ago
parent
commit
4e72c03392
  1. 4
      src/main/java/com/qyft/ms/app/device/spray/SprayTaskExecutor.java
  2. 5
      src/main/java/com/qyft/ms/app/model/bo/SprayTaskParams.java

4
src/main/java/com/qyft/ms/app/device/spray/SprayTaskExecutor.java

@ -89,7 +89,7 @@ public class SprayTaskExecutor {
sprayTask.setSprayTimes(sprayTimes); sprayTask.setSprayTimes(sprayTimes);
Double[] slide = slideArr[sprayTaskParam.getIndex()];//获取玻片的坐标 Double[] slide = slideArr[sprayTaskParam.getIndex()];//获取玻片的坐标
List<SprayTaskStep> sprayTaskStepList = getSprayPath(sprayTaskParam.getIndex(), sprayTimes);//计算本次喷涂的路线
List<SprayTaskStep> sprayTaskStepList = getSprayPath(sprayTimes);//计算本次喷涂的路线
//先移动到玻片左上角位置 //先移动到玻片左上角位置
DeviceCommand motorXPositionSetCommand = DeviceCommandGenerator.motorXPositionSet(slideArr[sprayTaskParam.getIndex()][0], 20.0); DeviceCommand motorXPositionSetCommand = DeviceCommandGenerator.motorXPositionSet(slideArr[sprayTaskParam.getIndex()][0], 20.0);
DeviceCommand motorYPositionSetCommand = DeviceCommandGenerator.motorYPositionSet(slideArr[sprayTaskParam.getIndex()][1], 20.0); DeviceCommand motorYPositionSetCommand = DeviceCommandGenerator.motorYPositionSet(slideArr[sprayTaskParam.getIndex()][1], 20.0);
@ -254,7 +254,7 @@ public class SprayTaskExecutor {
.get(); .get();
} }
private List<SprayTaskStep> getSprayPath(Integer index, SprayTimes sprayTimes) {
private List<SprayTaskStep> getSprayPath(SprayTimes sprayTimes) {
String matrixPathType = sprayTimes.getMatrixPathType(); String matrixPathType = sprayTimes.getMatrixPathType();
double left = sprayTimes.getX1(); double left = sprayTimes.getX1();
double right = sprayTimes.getX2(); double right = sprayTimes.getX2();

5
src/main/java/com/qyft/ms/app/model/bo/SprayTaskParams.java

@ -9,8 +9,13 @@ import java.util.List;
@Schema(description = "多次喷涂每次喷涂的参数") @Schema(description = "多次喷涂每次喷涂的参数")
public class SprayTaskParams { public class SprayTaskParams {
@Schema(description = "玻片序号")
private Integer index; private Integer index;
@Schema(description = "工艺id")
private Long id;
@Schema(description = "基质id")
private Long matrixId; private Long matrixId;
private List<SprayTimes> times; private List<SprayTimes> times;

Loading…
Cancel
Save