From da77cc0503552bb7644353c98f280e4f6bf533f2 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 07 三月 2026 09:48:16 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/utils/StationOperateProcessUtils.java | 18 +-----------------
1 files changed, 1 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
index c486e32..de8a651 100644
--- a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
@@ -424,7 +424,7 @@
//绔欑偣澶勪簬閲嶆柊鍒嗛厤搴撲綅鍖哄煙
//杩愯鍫靛锛岄噸鏂扮敵璇蜂换鍔�
String response = wmsOperateUtils.applyReassignTaskLocNo(wrkMast.getWrkNo(), stationProtocol.getStationId());
- if (response == null) {
+ if (Cools.isEmpty(response)) {
News.taskError(wrkMast.getWrkNo(), "璇锋眰WMS閲嶆柊鍒嗛厤搴撲綅鎺ュ彛澶辫触锛屾帴鍙ｆ湭鍝嶅簲锛侊紒锛乺esponse锛歿}", response);
continue;
}
@@ -808,11 +808,6 @@
}
}
}
-
- if (config.stationMaxTaskCount > 0 && currentStationTaskCount >= config.stationMaxTaskCount) {
- News.warn("杈撻�佺珯鐐逛换鍔℃暟閲忚揪鍒颁笂闄愶紝宸插仠姝㈢珯鐐逛换鍔′笅鍙戙�傚綋鍓嶄换鍔℃暟={}锛屼笂闄�={}", currentStationTaskCount, config.stationMaxTaskCount);
- return true;
- }
return false;
}
@@ -939,15 +934,6 @@
}
config.loopModeEnable = parseBoolean(loopModeValue, config.loopModeEnable);
- String stationMaxTaskCountValue = getConfigValue(systemConfigMap, "stationMaxTaskCountLimit");
- if (isBlank(stationMaxTaskCountValue)) {
- stationMaxTaskCountValue = getConfigValue(systemConfigMap, "stationMaxTaskCount");
- }
- if (isBlank(stationMaxTaskCountValue)) {
- stationMaxTaskCountValue = getConfigValue(systemConfigMap, "conveyorStationTaskLimit");
- }
- config.stationMaxTaskCount = parseInt(stationMaxTaskCountValue, config.stationMaxTaskCount);
-
return config;
}
@@ -1022,8 +1008,6 @@
private double circleMaxLoadLimit = 0.8d;
// 鏄惁鍚敤缁曞湀妯″紡锛堜粎鍚敤鏃舵墠鐢熸晥鎵胯浇闄愬埗锛�
private boolean loopModeEnable = false;
- // 绔欑偣鏈�澶т换鍔℃暟閲忎笂闄愶紝0琛ㄧず涓嶉檺鍒�
- private int stationMaxTaskCount = 30;
}
private static class LoadGuardState {
--
Gitblit v1.9.1