From 25650bd51704793cf78408d28853c89fda837c4c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 14 四月 2026 12:56:30 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java | 74 ++++++++++++++++++++++++------------
1 files changed, 49 insertions(+), 25 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 3f3eb9c..b4d7e20 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
@@ -1,5 +1,7 @@
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.controller.vo.ApplyInDto;
import com.zy.acs.conveyor.controller.vo.ApplyInRepsonseDto;
@@ -76,34 +78,55 @@
staProtocol = staProtocol.clone();
}
// 鍒ゆ柇鏄惁婊¤冻鏉′欢
- if (!staProtocol.isLoading()) {
+ if (staProtocol.getWorkNo() == 0) {
continue;
}
- if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing()) {
- String barcode = staProtocol.getBarcode();
- if (Cools.isEmpty(barcode)) {
- log.error("绔欑偣锛歿}锛屾湭鎵埌鐮佸�硷細{}", staProtocol.getSiteId(), barcode);
- return;
+ if (!staProtocol.isAutoing()) {
+ //News.error("{}锛氱珯鐐癸細{}锛岄潪鑷姩", config.getMark(), staProtocol.getSiteId());
+ continue;
+ }
+ if (!staProtocol.isLoading()) {
+ News.error("{}锛氱珯鐐癸細{}锛屾棤鐗�", config.getMark(), staProtocol.getSiteId());
+ continue;
+ }
+ String barcode = staProtocol.getBarcode();
+ if (Cools.isEmpty(barcode)) {
+ News.error("绔欑偣锛歿}锛屾湭鎵埌鐮佸�硷細{}", staProtocol.getSiteId(), barcode);
+ continue;
+ }
+ Job job = jobService.getJobByJobNo(staProtocol.getWorkNo());
+ //Job job = jobService.getJobByBarcode(barcode);
+ if (job == null) {
+ News.error("{}锛氱珯鐐癸細{}锛屾壘涓嶅埌浠诲姟", config.getMark(), staProtocol.getSiteId());
+ continue;
+ }
+ if (job.getJobSts() != ConveyorStateType.STARTUP.getStatus()) {
+ if (job.getJobSts() == ConveyorStateType.INBOUND.getStatus()) {
+ continue;
}
- // 9991鏄┖鏉匡紝9992鏄弧鏉�
- if (staProtocol.getWorkNo() >= 9991 && staProtocol.getWorkNo() <= 9992) {
- 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) {
- Integer workNo = getWorkNo();
- staProtocol.setWorkNo(workNo);
- staProtocol.setStaNo(inSta.getTargetSta());
- redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
- if (jobService.insert(initJob(locOfWms, barcode, workNo, inSta.getTargetSta() + ""))) {
- log.info("鐢宠鍏ュ簱鎴愬姛锛屾潯鐮侊細{},绔欑偣锛歿}", barcode, inSta.getStaNo());
- }
- } else {
- log.info("WMS鏈繑鍥炲簱浣嶄俊鎭紝鏉＄爜锛歿},绔欑偣锛歿}", barcode, inSta.getStaNo());
- }
- }
+ News.error("{}锛氱珯鐐癸細{}锛屼换鍔＄姸鎬佷笉瀵癸紝{}", config.getMark(), staProtocol.getSiteId(), JSON.toJSON(job));
+ continue;
+ }
+
+ ApplyInRepsonseDto locOfWms = wmsMainService.getLocOfWms(applyIn(barcode, inSta.getStaNo() + "", staProtocol));
+ if (locOfWms != null) {
+ Integer workNo = getWorkNo();
+ staProtocol.setWorkNo(workNo);
+ staProtocol.setStaNo(inSta.getTargetSta());
+ redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
+ job.setLoc(locOfWms.getLocNo());
+ job.setTaskNo(locOfWms.getTaskNo());
+ job.setBatchNo(locOfWms.getBatchNo());
+ job.setBarcode(barcode);
+ job.setWmsTime(new Date());
+ job.setJobSts(ConveyorStateType.INBOUND.getStatus());
+ //if (jobService.insert(initJob(locOfWms, barcode, workNo, inSta.getTargetSta() + ""))) {
+ if (jobService.updateById(job)) {
+ News.info("鐢宠鍏ュ簱鎴愬姛锛屾潯鐮侊細{},绔欑偣锛歿}", barcode, inSta.getStaNo());
+
}
+ } else {
+ News.error("WMS鏈繑鍥炲簱浣嶄俊鎭紝鏉＄爜锛歿},绔欑偣锛歿}", barcode, inSta.getStaNo());
}
}
}
@@ -135,7 +158,8 @@
ApplyInDto applyInDto = new ApplyInDto();
applyInDto.setStaNo(staNo);
applyInDto.setBarcode(barcode);
- applyInDto.setFull(staProtocol.getWorkNo() == 9992);
+ applyInDto.setFull(staProtocol.isFullPlt());
+ applyInDto.setWeight(staProtocol.getWeight());
return applyInDto;
}
}
--
Gitblit v1.9.1