From e06fb82148aefd34c137529213d6fef3ab498c58 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 25 七月 2023 09:14:58 +0800
Subject: [PATCH] 捡料
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 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 5137274..48b974c 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -200,9 +200,9 @@
}
// 杩囨护鐩樼偣/鎷ｆ枡/骞舵澘浠诲姟
-// if (null != wrkMastMapper.selectPickStepByBarcode(barcode)) {
-// continue;
-// }
+ if (null != wrkMastMapper.selectPickStepByBarcode(barcode)) {
+ continue;
+ }
// 鍒ゆ柇閲嶅宸ヤ綔妗�
// WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
@@ -397,7 +397,6 @@
}
if (staProtocol.isAutoing()
&& staProtocol.isLoading()
- && staProtocol.isInEnable()
// 0 - 9990 鎴栬�� 9996
&& (staProtocol.getWorkNo() > 0 && staProtocol.getWorkNo() < 9990)
&& staProtocol.getStaNo().equals(staProtocol.getSiteId().shortValue())
@@ -1346,7 +1345,7 @@
if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10) {
//鍏ュ簱
distLocNo = Utils.levToOutInStaLocNo(lev);
- }else if(wrkMast.getIoType() == 101){
+ }else if(wrkMast.getIoType() == 101 || wrkMast.getIoType() == 103){
//鍑哄簱
distLocNo = locNo;
} else if (wrkMast.getIoType() == 11) {
--
Gitblit v1.9.1