diff --git a/src/main/java/com/qyft/ms/app/device/spray/SprayTaskExecutor.java b/src/main/java/com/qyft/ms/app/device/spray/SprayTaskExecutor.java index b3e234d..734bc53 100644 --- a/src/main/java/com/qyft/ms/app/device/spray/SprayTaskExecutor.java +++ b/src/main/java/com/qyft/ms/app/device/spray/SprayTaskExecutor.java @@ -77,7 +77,7 @@ public class SprayTaskExecutor { List sprayTaskParams = sprayTask.getSprayTaskParams(); int currentStep = 0; //不管是暂停还是新的线程,记录当前线程喷涂步骤序号 for (SprayTaskParams sprayTaskParam : sprayTaskParams) {//循环玻片 - if (sprayTask.getCurrentIndex() != null && sprayTaskParam.getIndex() > sprayTask.getCurrentIndex()) { + if (sprayTask.getCurrentIndex() != null && sprayTaskParam.getIndex() < sprayTask.getCurrentIndex()) { continue; } sprayTask.setCurrentIndex(sprayTaskParam.getIndex()); @@ -173,6 +173,7 @@ public class SprayTaskExecutor { sprayNum++; delay(sprayTimes.getDelay() * 1000); } + } //喷涂完毕 DeviceCommand highVoltageCloseCommand = DeviceCommandGenerator.highVoltageClose();//关闭高压