From 88fdf1ab75fd6cddfbc032a7e05ae9fe4639a361 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 07 四月 2026 15:57:23 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 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 2cb91a4..973dc7a 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
@@ -2,6 +2,19 @@
import com.zy.acs.conveyor.controller.vo.ApplyInDto;
import com.zy.acs.conveyor.controller.vo.ApplyInRepsonseDto;
+import com.zy.acs.conveyor.core.cache.MessageQueue;
+import com.zy.acs.conveyor.core.cache.SlaveConnection;
+import com.zy.acs.conveyor.core.enums.ConveyorStateType;
+import com.zy.acs.conveyor.core.enums.SlaveType;
+import com.zy.acs.conveyor.core.enums.TaskType;
+import com.zy.acs.conveyor.core.model.Task;
+import com.zy.acs.conveyor.core.model.protocol.StaProtocol;
+import com.zy.acs.conveyor.core.operation.OperationHandler;
+import com.zy.acs.conveyor.core.properties.CtuOperationConfig;
+import com.zy.acs.conveyor.core.properties.DevpSlave;
+import com.zy.acs.conveyor.core.properties.SlaveProperties;
+import com.zy.acs.conveyor.core.thread.BarcodeThread;
+import com.zy.acs.conveyor.core.thread.SiemensDevpThread;
import com.zy.acs.conveyor.entity.Job;
import com.zy.acs.conveyor.enums.WorkNoTypeType;
import com.zy.acs.conveyor.service.JobService;
@@ -9,19 +22,6 @@
import com.zy.acs.conveyor.service.WrkLastnoService;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.exception.CoolException;
-import com.zy.acs.conveyor.core.cache.MessageQueue;
-import com.zy.acs.conveyor.core.cache.SlaveConnection;
-import com.zy.acs.conveyor.core.enums.ConveyorStateType;
-import com.zy.acs.conveyor.core.enums.SlaveType;
-import com.zy.acs.conveyor.core.enums.TaskType;
-import com.zy.acs.conveyor.core.properties.DevpSlave;
-import com.zy.acs.conveyor.core.model.Task;
-import com.zy.acs.conveyor.core.model.protocol.StaProtocol;
-import com.zy.acs.conveyor.core.operation.OperationHandler;
-import com.zy.acs.conveyor.core.properties.CtuOperationConfig;
-import com.zy.acs.conveyor.core.properties.SlaveProperties;
-import com.zy.acs.conveyor.core.thread.BarcodeThread;
-import com.zy.acs.conveyor.core.thread.SiemensDevpThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -85,7 +85,7 @@
}
// 9991鏄┖鏉匡紝9992鏄弧鏉�
if (staProtocol.getWorkNo() >= 9991 && staProtocol.getWorkNo() <= 9992) {
- Job job = jobService.getJobByBarcode(barcode ,ConveyorStateType.INBOUND.getStatus());
+ 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));
@@ -94,11 +94,11 @@
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, workNo,inSta.getTargetSta() + ""))) {
+ if (!jobService.insert(initJob(locOfWms, barcode, workNo, inSta.getTargetSta() + ""))) {
throw new CoolException("鏇存柊杈撻�佺嚎浠诲姟澶辫触," + " - " + staProtocol.getWorkNo());
}
log.info("鍏ュ簱鍓嶈繘锛歿},{}", staProtocol.getWorkNo(), inSta.getTargetSta());
- }else {
+ } else {
log.info("涓嬪彂澶辫触锛歿},{}", staProtocol.getWorkNo(), inSta.getTargetSta());
}
} else {
@@ -117,7 +117,7 @@
private Job initJob(ApplyInRepsonseDto locOfWms, String barcode, Integer workNo, String staNo) {
- Job job = new Job();
+ Job job = new Job();
job.setLoc(locOfWms.getLocNo());
job.setTaskNo(locOfWms.getTaskNo());
job.setBatchNo(locOfWms.getBatchNo());
--
Gitblit v1.9.1