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

更新

Browse Source
This commit is contained in:
gengby
2023-02-01 22:20:30 +08:00
parent 0c33d53ea9
commit ccfaa17962
3 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java
View File

@@ -266,13 +266,13 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
break;
case 4:
//申请捆扎
if (move > 0 && !requireApplyLaStrangulationSuccess) {
if (move > 0 && !requireSucess) {
applyLaStrangulation();
}
break;
case 5:
//申请贴标
if (move > 0 && !requireApplyLabelingSuccess) {
if (move > 0 && !requireSucess) {
applyLabeling();
}
@@ -451,17 +451,6 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
if (this.requireSucess) {
requireSucess = "1";
}
String requireApplyLabelingSuccess ="0";
if (this.requireApplyLabelingSuccess) {
requireApplyLabelingSuccess = "1";
}
String requireApplyLaStrangulationSuccess ="0";
if (this.requireApplyLaStrangulationSuccess) {
requireApplyLaStrangulationSuccess = "1";
}
jo.put("requireApplyLabelingSuccess", requireApplyLabelingSuccess);
jo.put("requireApplyLaStrangulationSuccess", requireApplyLaStrangulationSuccess);
jo.put("device_name", this.getDevice().getDevice_name());
jo.put("mode", mode);
jo.put("move", move);
@@ -808,7 +797,7 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
this.writing(list);
this.writing(list);
message = "申请捆扎成功";
requireApplyLaStrangulationSuccess = true;
requireSucess = true;
} else {
message = "未返回尺寸信息";
}

8
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java
View File

@@ -231,13 +231,13 @@ public class SiemensConveyorLabelingDeviceDriver extends AbstractOpcDeviceDriver
break;
case 4:
//申请捆扎
if (move > 0 && !requireApplyLaStrangulationSuccess) {
if (move > 0 && !requireSucess) {
applyLaStrangulation();
}
break;
case 5:
//申请贴标
if (move > 0 && !requireApplyLabelingSuccess) {
if (move > 0 && !requireSucess) {
applyLabeling();
}
@@ -702,7 +702,7 @@ public class SiemensConveyorLabelingDeviceDriver extends AbstractOpcDeviceDriver
this.writing(list);
this.writing(list);
message ="申请贴标下发电气信号成功";
requireApplyLabelingSuccess = true;
requireSucess = true;
} else {
message = "申请贴标失败,"+applyLabelingAndBindingResponse.getMessage();
}
@@ -774,7 +774,7 @@ public class SiemensConveyorLabelingDeviceDriver extends AbstractOpcDeviceDriver
this.writing(list);
this.writing(list);
message ="申请贴标成功";
requireApplyLaStrangulationSuccess = true;
requireSucess = true;
} else {
message = "未返回尺寸信息";
}

2
acs/nladmin-system/src/main/java/org/nl/modules/quartz/utils/ExecutionJob.java
View File

@@ -25,6 +25,7 @@ import org.nl.modules.quartz.domain.QuartzLog;
import org.nl.modules.quartz.repository.QuartzLogRepository;
import org.nl.modules.quartz.service.QuartzJobService;
import org.nl.modules.wql.util.SpringContextHolder;
import org.quartz.DisallowConcurrentExecution;
import org.quartz.JobExecutionContext;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.quartz.QuartzJobBean;
@@ -41,6 +42,7 @@ import java.util.concurrent.ThreadPoolExecutor;
@Async
@SuppressWarnings({"unchecked", "all"})
@Slf4j
@DisallowConcurrentExecution
public class ExecutionJob extends QuartzJobBean {
/**