From 27b048e77b68752c7c3060b9e31ad46efb4101a5 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 15 四月 2026 08:07:03 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java | 11 +++++------
1 files changed, 5 insertions(+), 6 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 75b50bf..e46767f 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
@@ -1,6 +1,5 @@
package com.zy.acs.conveyor.core.operation.handler;
-import com.alibaba.fastjson.JSON;
import com.zy.acs.common.utils.News;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.conveyor.core.constant.RedisConveyorConstant;
@@ -99,8 +98,8 @@
// }
- if (staProtocol.getWorkNo() == 0 && !staProtocol.isStartUpFlag()) {
- Job job = initJob(getWorkNo(), staProtocol.getSiteId() + "");
+ if (staProtocol.getWorkNo() == 0 && staProtocol.isStartUpFlag()) {
+ Job job = initJob(getWorkNo());
staProtocol.setWorkNo(job.getJobNo());
staProtocol.setStaNo(inSta.getStaNo());
staProtocol.setStartUpFlag(false);
@@ -118,16 +117,16 @@
}
}
- private Job initJob(Integer workNo, String staNo) {
+ private Job initJob(Integer workNo) {
Job job = new Job();
- job.setStaNo(staNo);
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);
+ return wrkLastnoService.nextWorkNo(WorkNoTypeType.WORK_NO_IN_TYPE.type);
}
}
--
Gitblit v1.9.1