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 | 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 8a750bd..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())
@@ -938,13 +937,13 @@
middlePath = nodes.get(nodes.size() - 3);
//閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
- middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, 3);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
+ middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, middlePath);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
} else if (nodes.size() > 5) {//涓鐮佷紶鍊掓暟绗簩涓�
//涓棿璺緞
middlePath = nodes.get(nodes.size() - 2);
//閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
- middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, 2);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
+ middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, middlePath);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
}
//鐩爣璺緞
@@ -1008,13 +1007,13 @@
middlePath = nodes.get(nodes.size() - 3);
//閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
- middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, 3);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
+ middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, middlePath);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
} else if (nodes.size() > 5) {//涓鐮佷紶鍊掓暟绗簩涓�
//涓棿璺緞
middlePath = nodes.get(nodes.size() - 2);
//閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
- middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, 2);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
+ middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, middlePath);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
}
//鐩爣璺緞
@@ -1060,13 +1059,13 @@
middlePath = nodes.get(nodes.size() - 3);
//閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
- middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, 3);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
+ middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, middlePath);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
} else if (nodes.size() > 5) {//涓鐮佷紶鍊掓暟绗簩涓�
//涓棿璺緞
middlePath = nodes.get(nodes.size() - 2);
//閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
- middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, 2);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
+ middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes, middlePath);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
}
//鐩爣璺緞
@@ -1343,10 +1342,10 @@
//鍒ゆ柇鍏朵粬绌洪棽绌挎杞︽槸鍚︾浠诲姟鏈�杩�
String distLocNo = null;//鐩爣鍦扮偣锛屽叆搴�=銆嬫彁鍗囨満鍙ｏ紝鍑哄簱=銆嬭揣鐗╁簱浣嶅彿
- if (wrkMast.getIoType() == 1) {
+ 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