From 912d09bc076272770a507517e71703078c8ae9d7 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 15 四月 2026 17:04:43 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 b78bd5b..ef6ff07 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());
+ if (staProtocol.getWorkNo() == 0 && staProtocol.isStartUpFlag()) {
+ Job job = initJob(getWorkNo(), staProtocol.isFullPlt());
staProtocol.setWorkNo(job.getJobNo());
staProtocol.setStaNo(inSta.getStaNo());
staProtocol.setStartUpFlag(false);
@@ -118,15 +117,17 @@
}
}
- private Job initJob(Integer workNo) {
+ private Job initJob(Integer workNo, Boolean fullPlt) {
Job job = new Job();
job.setJobNo(workNo);
job.setJobSts(ConveyorStateType.STARTUP.getStatus());
job.setStartTime(new Date());
+ job.setCreateTime(new Date());
+ job.setFull(fullPlt.toString());
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