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/entity/Job.java | 7 +++++--
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java | 18 ++++++++----------
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java | 5 +++--
3 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java
index add267f..6021109 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java
@@ -14,7 +14,6 @@
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.WmsMainService;
import com.zy.acs.conveyor.service.WrkLastnoService;
@@ -89,16 +88,16 @@
News.error("{}锛氱珯鐐癸細{}锛屾棤鐗�", config.getMark(), staProtocol.getSiteId());
continue;
}
- if (staProtocol.isWeightErr()){
+ if (staProtocol.isWeightErr()) {
News.error("{}锛氱珯鐐癸細{}锛岄噸閲忓紓甯革細{}", config.getMark(), staProtocol.getSiteId(), staProtocol.getWeight());
continue;
}
- if (staProtocol.isBarcodeErr()){
- News.error("{}锛氱珯鐐癸細{}锛屾潯鐮佸紓甯革細{}", config.getMark(),staProtocol.getSiteId(), staProtocol.getBarcode());
+ if (staProtocol.isBarcodeErr()) {
+ News.error("{}锛氱珯鐐癸細{}锛屾潯鐮佸紓甯革細{}", config.getMark(), staProtocol.getSiteId(), staProtocol.getBarcode());
continue;
}
- if (staProtocol.isLoadErr()){
- News.error("{}锛氱珯鐐癸細{}锛屽叆搴撴椂妫�娴嬫墭鐩樹笂鏈夋棤璐х墿", config.getMark(),staProtocol.getSiteId());
+ if (staProtocol.isLoadErr()) {
+ News.error("{}锛氱珯鐐癸細{}锛屽叆搴撴椂妫�娴嬫墭鐩樹笂鏈夋棤璐х墿", config.getMark(), staProtocol.getSiteId());
continue;
}
String barcode = staProtocol.getBarcode();
@@ -120,7 +119,7 @@
continue;
}
- ApplyInRepsonseDto locOfWms = wmsMainService.getLocOfWms(applyIn(barcode, inSta.getStaNo() + "", staProtocol));
+ ApplyInRepsonseDto locOfWms = wmsMainService.getLocOfWms(applyIn(job, barcode, inSta.getStaNo() + "", staProtocol));
if (locOfWms != null) {
staProtocol.setWorkNo(staProtocol.getWorkNo());
staProtocol.setStaNo(inSta.getTargetSta());
@@ -163,12 +162,11 @@
}
-
- private ApplyInDto applyIn(String barcode, String staNo, StaProtocol staProtocol) {
+ private ApplyInDto applyIn(Job job, String barcode, String staNo, StaProtocol staProtocol) {
ApplyInDto applyInDto = new ApplyInDto();
applyInDto.setStaNo(staNo);
applyInDto.setBarcode(barcode);
- applyInDto.setFull(staProtocol.isFullPlt());
+ applyInDto.setFull(Boolean.valueOf(job.getFull()));
applyInDto.setWeight(staProtocol.getWeight());
return applyInDto;
}
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 e46767f..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
@@ -99,7 +99,7 @@
if (staProtocol.getWorkNo() == 0 && staProtocol.isStartUpFlag()) {
- Job job = initJob(getWorkNo());
+ Job job = initJob(getWorkNo(), staProtocol.isFullPlt());
staProtocol.setWorkNo(job.getJobNo());
staProtocol.setStaNo(inSta.getStaNo());
staProtocol.setStartUpFlag(false);
@@ -117,12 +117,13 @@
}
}
- 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;
}
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/entity/Job.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/entity/Job.java
index 669dff8..32c1208 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/entity/Job.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/entity/Job.java
@@ -57,8 +57,11 @@
*/
@TableField("job_no")
private Integer jobNo;
-
-
+ /**
+ * 鏄惁婊＄増
+ */
+ @TableField("full")
+ private String full;
/**
* 宸ヤ綔鐘舵��
*/
--
Gitblit v1.9.1