From faf2c5e81aedcac5ea83b797e89302938b399829 Mon Sep 17 00:00:00 2001
From: Administrator <zc857179121@qq.com>
Date: 星期二, 14 四月 2026 19:19:51 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java | 60 +++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 43 insertions(+), 17 deletions(-)
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java
index 6d175b6..d3a07e3 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java
@@ -12,12 +12,15 @@
import com.zy.acs.conveyor.core.properties.SlaveProperties;
import com.zy.acs.conveyor.core.service.StationService;
import com.zy.acs.conveyor.entity.Job;
+import com.zy.acs.conveyor.enums.WorkNoTypeType;
import com.zy.acs.conveyor.service.JobService;
+import com.zy.acs.conveyor.service.WrkLastnoService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import java.util.Date;
import java.util.Map;
/**
@@ -37,6 +40,10 @@
@Autowired
private StationService stationService;
+
+
+ @Autowired
+ private WrkLastnoService wrkLastnoService;
private final RedisSupport redis = RedisSupport.defaultRedisSupport;
@@ -78,25 +85,31 @@
}
}
- Job jobByJobNo = jobService.getJobByJobNo(staProtocol.getWorkNo());
- if (jobByJobNo == null) {
- News.error("{}锛氱珯鐐癸細{}锛屾壘涓嶅埌浠诲姟", config.getMark(), staProtocol.getSiteId());
- continue;
- }
- if (jobByJobNo.getJobSts() != ConveyorStateType.OUTBOUND.getStatus()) {
- if (jobByJobNo.getJobSts() == ConveyorStateType.STARTUP.getStatus()) {
- continue;
- }
- News.error("{}锛氱珯鐐癸細{}锛屼换鍔＄姸鎬佷笉瀵癸紝{}", config.getMark(), staProtocol.getSiteId(), JSON.toJSON(jobByJobNo));
- continue;
- }
- staProtocol.setStaNo(inSta.getStaNo());
- redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
+// Job jobByJobNo = jobService.getJobByJobNo(staProtocol.getWorkNo());
+// if (jobByJobNo == null) {
+// News.error("{}锛氱珯鐐癸細{}锛屾壘涓嶅埌浠诲姟", config.getMark(), staProtocol.getSiteId());
+// continue;
+// }
+// if (jobByJobNo.getJobSts() != ConveyorStateType.OUTBOUND.getStatus()) {
+// if (jobByJobNo.getJobSts() == ConveyorStateType.STARTUP.getStatus()) {
+// continue;
+// }
+// News.error("{}锛氱珯鐐癸細{}锛屼换鍔＄姸鎬佷笉瀵癸紝{}", config.getMark(), staProtocol.getSiteId(), JSON.toJSON(jobByJobNo));
+// continue;
+// }
- jobByJobNo.setJobSts(ConveyorStateType.STARTUP.getStatus());
- if (!jobService.updateById(jobByJobNo)) {
- News.info("{},鍚姩鍏ュ簱锛歿},{}", config.getMark(), staProtocol.getWorkNo(), staProtocol.getStaNo());
+
+ if (staProtocol.getWorkNo() == 0 && staProtocol.isStartUpFlag()) {
+ Job job = initJob(getWorkNo());
+ staProtocol.setWorkNo(job.getJobNo());
+ staProtocol.setStaNo(inSta.getStaNo());
+ staProtocol.setStartUpFlag(false);
+ redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
+ if (!jobService.insert(job)) {
+ News.info("{},鍚姩鍏ュ簱锛歿},{}", config.getMark(), staProtocol.getWorkNo(), staProtocol.getStaNo());
+ }
}
+
}
}
} catch (Exception e) {
@@ -104,4 +117,17 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
}
}
+
+ private Job initJob(Integer workNo) {
+ Job job = new Job();
+ job.setJobNo(workNo);
+ job.setJobSts(ConveyorStateType.STARTUP.getStatus());
+ job.setStartTime(new Date());
+ job.setCreateTime(new Date());
+ return job;
+ }
+
+ private Integer getWorkNo() {
+ return wrkLastnoService.nextWorkNo(WorkNoTypeType.WORK_NO_TYPE.type);
+ }
}
--
Gitblit v1.9.1