From 318b01bda7bd75d1979e6a8c8ab303327582dabb Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 12 三月 2025 19:24:02 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 9f48cc8..ffb5484 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -3085,23 +3085,23 @@
command.setWeight2(weight2);
if (workNo1 == 0 && workNo2 !=0){
- if("0".equals(matnr2) && "".equals(batch2) ){
+ if("0".equals(matnr2) || "".equals(batch2) ){
log.error("婧愮珯"+souSta2+"宸ヤ綅涓�浠诲姟缂哄皯淇℃伅锛岀墿鏂欎唬鐮�:"+matnr+",batch:"+batch);
continue;
}
command.setTaskMode(RgvTaskModeType.FETCH_PUT2); // 浠诲姟妯″紡: 2鍙栨斁璐�
} else if (workNo1 != 0 && workNo2 ==0) {
- if("0".equals(matnr) && "".equals(batch) ){
+ if("0".equals(matnr) || "".equals(batch) ){
log.error("婧愮珯"+souSta1+"宸ヤ綅浜屼换鍔＄己灏戜俊鎭紝鐗╂枡浠ｇ爜:"+matnr+",batch:"+batch);
continue;
}
command.setTaskMode(RgvTaskModeType.FETCH_PUT1); // 浠诲姟妯″紡: 1鍙栨斁璐�
}else {
- if("0".equals(matnr) && "".equals(batch) ){
+ if("0".equals(matnr) || "".equals(batch) ){
log.error("婧愮珯"+souSta1+"宸ヤ綅涓�浠诲姟缂哄皯淇℃伅锛岀墿鏂欎唬鐮�:"+matnr+",batch:"+batch);
continue;
}
- if("0".equals(matnr2) && "".equals(batch2) ){
+ if("0".equals(matnr2) || "".equals(batch2) ){
log.error("婧愮珯"+souSta2+"宸ヤ綅浜屼换鍔＄己灏戜俊鎭紝鐗╂枡浠ｇ爜:"+matnr+",batch:"+batch);
continue;
}
--
Gitblit v1.9.1