From 27b048e77b68752c7c3060b9e31ad46efb4101a5 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 15 四月 2026 08:07:03 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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 8685168..add267f 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
@@ -89,6 +89,18 @@
News.error("{}锛氱珯鐐癸細{}锛屾棤鐗�", config.getMark(), staProtocol.getSiteId());
continue;
}
+ if (staProtocol.isWeightErr()){
+ News.error("{}锛氱珯鐐癸細{}锛岄噸閲忓紓甯革細{}", config.getMark(), staProtocol.getSiteId(), staProtocol.getWeight());
+ continue;
+ }
+ if (staProtocol.isBarcodeErr()){
+ News.error("{}锛氱珯鐐癸細{}锛屾潯鐮佸紓甯革細{}", config.getMark(),staProtocol.getSiteId(), staProtocol.getBarcode());
+ continue;
+ }
+ if (staProtocol.isLoadErr()){
+ News.error("{}锛氱珯鐐癸細{}锛屽叆搴撴椂妫�娴嬫墭鐩樹笂鏈夋棤璐х墿", config.getMark(),staProtocol.getSiteId());
+ continue;
+ }
String barcode = staProtocol.getBarcode();
if (Cools.isEmpty(barcode)) {
News.error("绔欑偣锛歿}锛屾湭鎵埌鐮佸�硷細{}", staProtocol.getSiteId(), barcode);
@@ -114,7 +126,7 @@
staProtocol.setStaNo(inSta.getTargetSta());
redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
job.setLoc(locOfWms.getLocNo());
- job.setStaNo(String.valueOf(inSta.getTargetSta()+1));
+ job.setStaNo(String.valueOf(inSta.getTargetSta() + 1));
job.setTaskNo(locOfWms.getTaskNo());
job.setBatchNo(locOfWms.getBatchNo());
job.setBarcode(barcode);
@@ -150,9 +162,7 @@
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();
--
Gitblit v1.9.1