From 19c4282ae9bad01293a7d4a4d5fe572fbc742c18 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 26 九月 2024 14:24:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ahyxwcs' into ahyxwcs
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 677d052..58306c8 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -4015,19 +4015,19 @@
} else {
staProtocol = staProtocol.clone();
}
- String barcode = staProtocol.getBarcode();
- if (!Cools.isEmpty(barcode)) {
+ if (emptyInSta.getStaNo()==607 && staProtocol.getStaNo()==0 && staProtocol.getWorkNo()==0
+ && staProtocol.isLoading() && staProtocol.isAutoing() && staProtocol.isInEnable()){
+ String barcode = staProtocol.getBarcode();
+ if (!Cools.isEmpty(barcode)) {
// log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
- if ("NG".endsWith(barcode) || "NoRead".equals(barcode) || !CodeDetectionUtil.barcodeDetection(barcode)) {
+ if ("NG".endsWith(barcode) || "NoRead".equals(barcode) || !CodeDetectionUtil.barcodeDetection(barcode)) {
+ continue;
+ }
+ } else {
continue;
}
- } else {
- continue;
- }
- if (emptyInSta.getStaNo()==607 && staProtocol.getStaNo()==607 && staProtocol.getWorkNo()==0
- && staProtocol.isLoading() && staProtocol.isAutoing() && staProtocol.isInEnable()){
try {
- BasDevp basDevp = basDevpService.selectById(staProtocol.getStaNo());
+ BasDevp basDevp = basDevpService.selectById(emptyInSta.getStaNo());
if (basDevp.getReportSign()==0){
WrkMast wrkMast = wrkMastMapper.selectByBarcodeTwo(barcode);
if (!Cools.isEmpty(wrkMast)){
@@ -4069,8 +4069,7 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
}
return;
- }
-
+ } else
// 绔欑偣鏉′欢鍒ゆ柇
if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
&& staProtocol.isEmptyMk() && ((staProtocol.getWorkNo() > 32222 && staProtocol.getWorkNo() <= 63333) || staProtocol.getWorkNo()==0) && staProtocol.isPakMk()) {
@@ -8568,7 +8567,7 @@
return;
}
if (staProtocol607.getWorkNo()==0 && staProtocol607.isLoading() && staProtocol607.isAutoing()
- && staProtocol607.getStaNo() == 607 && staProtocol607.isInEnable()){
+ && staProtocol607.getStaNo() == 0 && staProtocol607.isInEnable()){
WrkMast wrkMast = wrkMastMapper.selectByBarcodeTwo(barcode);
if (!Cools.isEmpty(wrkMast)){
staProtocol607.setWorkNo(wrkMast.getWrkNo());
--
Gitblit v1.9.1