From b7e27e0760d7a912de932dc24cb49a5302530355 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 09 二月 2026 09:30:55 +0800
Subject: [PATCH] 1
---
zy-acs-cv/src/main/java/com/zy/core/operation/handler/OutOperationHandler.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/OutOperationHandler.java b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/OutOperationHandler.java
index 1098286..a9e737e 100644
--- a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/OutOperationHandler.java
+++ b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/OutOperationHandler.java
@@ -49,7 +49,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void execute(CtuOperationConfig config) {
+ public synchronized void execute(CtuOperationConfig config) {
try {
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
for (DevpSlave devp : slaveProperties.getDevp()) {
@@ -71,14 +71,14 @@
if (staProtocol.isAutoing() && staProtocol.getWorkNo() == 0) {
String seqNum = ctuMainService.checkStationStatus(releaseSta.getStaNo());
if (seqNum != null) {
- Job jobBySeqNum = jobService.getJobBySeqNum(seqNum);
+ Job jobBySeqNum = jobService.getJobByOutTaskNo(seqNum);
if (jobBySeqNum == null) {
int workNo = wrkLastnoService.nextWorkNo(WorkNoTypeType.WORK_NO_TYPE.type);
// 涓嬪彂绉诲姩 涓� 涓嬪彂plc鍛戒护
staProtocol.setWorkNo(workNo);
staProtocol.setStaNo(releaseSta.getTargetSta());
Job job = new Job();
- job.setSeqNum(seqNum);
+ job.setOutTaskNo(seqNum);
job.setJobNo(workNo);
job.setJobSts(2);
if (!jobService.insert(job)) {
--
Gitblit v1.9.1