From 42c0a8f901dd3641ef7db01207141a3cd80a52b7 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 11 十一月 2025 09:31:49 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 14 +++++++++-----
1 files changed, 9 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 3790740..7896969 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -969,16 +969,17 @@
* @return
*/
private Integer getCrnStation(String locNo) {
- String bay = locNo.substring(2, 5);
+ String bay = locNo.substring(2, 5);//0100203
if (Integer.parseInt(bay) == 1) {
return 1;
} else if (Integer.parseInt(bay) == 29) {
return 2;
}
- if (Integer.parseInt(locNo.substring(0, 2)) >= 14) {
- return 1;
- } else {
+// if (Integer.parseInt(locNo.substring(0, 2)) >= 14) {
+ if (Integer.parseInt(bay) >= 14) {
return 2;
+ } else {
+ return 1;
}
}
@@ -3861,7 +3862,10 @@
// 鑾峰彇宸ヤ綔鐘舵�佷负11锛堢敓鎴愬嚭搴揑D锛夌殑鍑哄簱宸ヤ綔妗�
List<WrkMast> wrkMasts = wrkMastMapper.selectPakOutStep107(slave.getId(), crnStn.getStaNo());
for (WrkMast wrkMast : wrkMasts) {
- if (wrkMast == null || wrkMast.getPltType() == 2) {
+// if (wrkMast == null || wrkMast.getPltType() == 2) {
+// continue;
+// }
+ if (wrkMast == null){
continue;
}
// 宸ヤ綔妗ｇ姸鎬佸垽鏂�
--
Gitblit v1.9.1