From e5e76412f1a20e8aed95614cbd7bf2b638cda2cc Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 11 三月 2026 13:30:31 +0800
Subject: [PATCH] 1
---
zy-acs-cv/src/main/java/com/zy/core/operation/handler/AppleLocOperationHandler.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/AppleLocOperationHandler.java b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/AppleLocOperationHandler.java
index 7d4c74b..50f8376 100644
--- a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/AppleLocOperationHandler.java
+++ b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/AppleLocOperationHandler.java
@@ -85,18 +85,21 @@
}
// 9991鏄┖鏉匡紝9992鏄弧鏉�
if (staProtocol.getWorkNo() >= 9991 && staProtocol.getWorkNo() <= 9992) {
- Job job = jobService.getJobByBarcode(barcode);
+ Job job = jobService.getJobByBarcode(barcode ,ConveyorStateType.INBOUND.getStatus());
// 鐢宠鍏ュ簱
if (job == null || (job != null && job.getJobSts() == ConveyorStateType.CLEARSIGNAL.getStatus())) {
ApplyInRepsonseDto locOfWms = wmsMainService.getLocOfWms(applyIn(barcode, inSta.getStaNo() + "", staProtocol));
if (locOfWms != null) {
- staProtocol.setWorkNo(job.getJobNo());
+ Integer workNo = getWorkNo();
+ staProtocol.setWorkNo(workNo);
staProtocol.setStaNo(inSta.getTargetSta());
if (MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(TaskType.WRITE, staProtocol))) {
- if (!jobService.insert(initJob(locOfWms, barcode, inSta.getTargetSta() + ""))) {
+ if (!jobService.insert(initJob(locOfWms, barcode, workNo,inSta.getTargetSta() + ""))) {
throw new CoolException("鏇存柊杈撻�佺嚎浠诲姟澶辫触," + " - " + staProtocol.getWorkNo());
}
log.info("鍏ュ簱鍓嶈繘锛歿},{}", staProtocol.getWorkNo(), inSta.getTargetSta());
+ }else {
+ log.info("涓嬪彂澶辫触锛歿},{}", staProtocol.getWorkNo(), inSta.getTargetSta());
}
} else {
log.info("WMS鏈繑鍥炲簱浣嶄俊鎭紝鏉＄爜锛歿},绔欑偣锛歿}", barcode, inSta.getStaNo());
@@ -112,14 +115,15 @@
}
}
- private Job initJob(ApplyInRepsonseDto locOfWms, String barcode, String staNo) {
+
+ private Job initJob(ApplyInRepsonseDto locOfWms, String barcode,Integer workNo, String staNo) {
Job job = new Job();
job.setLoc(locOfWms.getLocNo());
job.setTaskNo(locOfWms.getTaskNo());
job.setBatchNo(locOfWms.getBatchNo());
job.setBarcode(barcode);
job.setStaNo(staNo);
- job.setJobNo(getWorkNo());
+ job.setJobNo(workNo);
job.setJobSts(ConveyorStateType.INBOUND.getStatus());
job.setWmsTime(new Date());
return job;
--
Gitblit v1.9.1