From 7d116115ade208f26ada36806642d2a3a6085c91 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 09 三月 2026 13:07:49 +0800
Subject: [PATCH] 1
---
zy-acs-cv/src/main/java/com/zy/core/operation/handler/AppleLocOperationHandler.java | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 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 ed859b4..7d4c74b 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
@@ -1,6 +1,7 @@
package com.zy.core.operation.handler;
import com.zy.acs.framework.common.Cools;
+import com.zy.acs.framework.exception.CoolException;
import com.zy.asrs.controller.vo.ApplyInDto;
import com.zy.asrs.controller.vo.ApplyInRepsonseDto;
import com.zy.asrs.entity.Job;
@@ -8,10 +9,13 @@
import com.zy.asrs.service.JobService;
import com.zy.asrs.service.WmsMainService;
import com.zy.asrs.service.WrkLastnoService;
+import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.ConveyorStateType;
import com.zy.core.enums.SlaveType;
+import com.zy.core.enums.TaskType;
import com.zy.core.model.DevpSlave;
+import com.zy.core.model.Task;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.operation.OperationHandler;
import com.zy.core.properties.CtuOperationConfig;
@@ -83,19 +87,17 @@
if (staProtocol.getWorkNo() >= 9991 && staProtocol.getWorkNo() <= 9992) {
Job job = jobService.getJobByBarcode(barcode);
// 鐢宠鍏ュ簱
- if (job == null || (job != null && job.getJobSts() == 8)) {
+ if (job == null || (job != null && job.getJobSts() == ConveyorStateType.CLEARSIGNAL.getStatus())) {
ApplyInRepsonseDto locOfWms = wmsMainService.getLocOfWms(applyIn(barcode, inSta.getStaNo() + "", staProtocol));
if (locOfWms != null) {
- job = new Job();
- job.setLoc(locOfWms.getLocNo());
- job.setTaskNo(locOfWms.getTaskNo());
- job.setBatchNo(locOfWms.getBatchNo());
- job.setBarcode(barcode);
- job.setStaNo(inSta.getTargetSta() + "");
- job.setJobNo(wrkLastnoService.nextWorkNo(WorkNoTypeType.WORK_NO_TYPE.type));
- job.setJobSts(ConveyorStateType.APPLYLOC.getStatus());
- job.setWmsTime(new Date());
- jobService.insert(job);
+ staProtocol.setWorkNo(job.getJobNo());
+ staProtocol.setStaNo(inSta.getTargetSta());
+ if (MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(TaskType.WRITE, staProtocol))) {
+ if (!jobService.insert(initJob(locOfWms, barcode, inSta.getTargetSta() + ""))) {
+ throw new CoolException("鏇存柊杈撻�佺嚎浠诲姟澶辫触," + " - " + staProtocol.getWorkNo());
+ }
+ log.info("鍏ュ簱鍓嶈繘锛歿},{}", staProtocol.getWorkNo(), inSta.getTargetSta());
+ }
} else {
log.info("WMS鏈繑鍥炲簱浣嶄俊鎭紝鏉＄爜锛歿},绔欑偣锛歿}", barcode, inSta.getStaNo());
}
@@ -110,6 +112,23 @@
}
}
+ private Job initJob(ApplyInRepsonseDto locOfWms, String barcode, 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.setJobSts(ConveyorStateType.INBOUND.getStatus());
+ job.setWmsTime(new Date());
+ return job;
+ }
+
+ private Integer getWorkNo() {
+ return wrkLastnoService.nextWorkNo(WorkNoTypeType.WORK_NO_TYPE.type);
+ }
+
private ApplyInDto applyIn(String barcode, String staNo, StaProtocol staProtocol) {
ApplyInDto applyInDto = new ApplyInDto();
applyInDto.setStaNo(staNo);
--
Gitblit v1.9.1