From 61a792a8ba5532132bef32721f055c619057ab28 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 01 四月 2026 15:16:56 +0800
Subject: [PATCH] #入库任务优化
---
src/main/java/com/zy/core/plugin/store/StoreInTaskGenerationService.java | 268 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 161 insertions(+), 107 deletions(-)
diff --git a/src/main/java/com/zy/core/plugin/store/StoreInTaskGenerationService.java b/src/main/java/com/zy/core/plugin/store/StoreInTaskGenerationService.java
index 4405611..babec54 100644
--- a/src/main/java/com/zy/core/plugin/store/StoreInTaskGenerationService.java
+++ b/src/main/java/com/zy/core/plugin/store/StoreInTaskGenerationService.java
@@ -30,6 +30,7 @@
@Service
public class StoreInTaskGenerationService {
+ private static final int APPLY_IN_TASK_TIMEOUT_SECONDS = 5;
@Autowired
private BasDevpService basDevpService;
@@ -44,77 +45,30 @@
@Autowired
private CommonService commonService;
+ /**
+ * 淇濈暀褰撳墠鎸夌珯鐐� lane 骞跺彂鐨勮兘鍔涳紝鍚屾椂鐢ㄤ竴涓畝鍗曡鏁伴伩鍏嶅苟鍙戠敓鎴愭妸绔欑偣浠诲姟鏁伴《绌夸笂闄愩��
+ */
+ private int inFlightGenerateCount = 0;
+
public void generate(StoreInTaskPolicy policy) {
try {
if (!policy.isEnabled()) {
return;
}
- Object systemConfigMapObj = redisUtil.get(RedisKeyType.SYSTEM_CONFIG_MAP.key);
- if (systemConfigMapObj == null) {
+ HashMap<String, String> systemConfigMap = getSystemConfigMap();
+ if (systemConfigMap == null) {
return;
}
- HashMap<String, String> systemConfigMap = (HashMap<String, String>) systemConfigMapObj;
-
- int conveyorStationTaskLimit = 30;
- String conveyorStationTaskLimitStr = systemConfigMap.get("conveyorStationTaskLimit");
- if (conveyorStationTaskLimitStr != null) {
- conveyorStationTaskLimit = Integer.parseInt(conveyorStationTaskLimitStr);
- }
- int currentStationTaskCount = stationOperateProcessUtils.getCurrentStationTaskCount();
- if (currentStationTaskCount > conveyorStationTaskLimit) {
- News.error("杈撻�佺珯鐐逛换鍔″凡杈惧埌涓婇檺锛屼笂闄愬�硷細{}锛岀珯鐐逛换鍔℃暟锛歿}", conveyorStationTaskLimit, currentStationTaskCount);
+ if (!hasAvailableStationTaskCapacity(systemConfigMap)) {
return;
}
List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
for (BasDevp basDevp : basDevps) {
- StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
- if (stationThread == null) {
- continue;
- }
-
- Map<Integer, StationProtocol> stationMap = stationThread.getStatusMap();
List<StationObjModel> barcodeStations = policy.getBarcodeStations(basDevp);
for (StationObjModel stationObjModel : barcodeStations) {
- Integer stationId = stationObjModel.getStationId();
- if (!stationMap.containsKey(stationId)) {
- continue;
- }
-
- StationProtocol stationProtocol = stationMap.get(stationId);
- if (stationProtocol == null) {
- continue;
- }
-
- StoreInTaskContext context = new StoreInTaskContext(basDevp, stationThread, stationObjModel,
- stationProtocol);
- if (!policy.matchCandidate(context)) {
- continue;
- }
- if (!policy.beforeApply(context)) {
- continue;
- }
-
- List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
- .eq("barcode", stationProtocol.getBarcode()));
- if (!wrkMasts.isEmpty()) {
- continue;
- }
-
- String generateLockKey = policy.getGenerateLockKey(context);
- Object lock = redisUtil.get(generateLockKey);
- if (lock != null) {
- continue;
- }
-
- policy.onRequestPermitGranted(context);
-
- InTaskApplyRequest request = policy.buildApplyRequest(context);
- News.info("鍙戣捣鍚屾WMS鍏ュ簱璇锋眰锛宐arcode={}锛宻tationId={}", request.getBarcode(),
- request.getSourceStaNo());
- InTaskApplyResult result = applySyncInTask(request);
- handleApplyResult(policy, context, request, result);
+ generateByStation(policy, basDevp, stationObjModel, systemConfigMap);
}
}
} catch (Exception e) {
@@ -122,81 +76,181 @@
}
}
- private void handleApplyResult(StoreInTaskPolicy policy, StoreInTaskContext context, InTaskApplyRequest request,
- InTaskApplyResult result) {
- if (result.isSuccess()) {
- handleApplySuccess(policy, context, request, result);
- return;
- }
+ public void generate(StoreInTaskPolicy policy, BasDevp basDevp, StationObjModel stationObjModel) {
+ try {
+ if (!policy.isEnabled()) {
+ return;
+ }
- if (result.isRetryableFailure()) {
- News.error("WMS鍏ュ簱璇锋眰澶辫触锛宐arcode={}锛宻tationId={}锛宺esponse={}",
- request.getBarcode(), request.getSourceStaNo(), policy.buildFailureMessage(result));
- redisUtil.set(policy.getGenerateLockKey(context), "lock", policy.getRetryLockSeconds(context));
- policy.onApplyFailed(context, result);
- return;
- }
+ HashMap<String, String> systemConfigMap = getSystemConfigMap();
+ if (systemConfigMap == null) {
+ return;
+ }
+ if (!hasAvailableStationTaskCapacity(systemConfigMap)) {
+ return;
+ }
- policy.onApplyFailed(context, result);
+ generateByStation(policy, basDevp, stationObjModel, systemConfigMap);
+ } catch (Exception e) {
+ Integer stationId = stationObjModel == null ? null : stationObjModel.getStationId();
+ News.error("鐢熸垚鍏ュ簱浠诲姟寮傚父锛宲olicy={}锛宻tationId={}", policy.getPolicyName(), stationId, e);
+ }
}
- private void handleApplySuccess(StoreInTaskPolicy policy, StoreInTaskContext context, InTaskApplyRequest request,
- InTaskApplyResult result) {
+ private void generateByStation(StoreInTaskPolicy policy, BasDevp basDevp, StationObjModel stationObjModel,
+ HashMap<String, String> systemConfigMap) {
+ StoreInTaskContext context = buildContext(basDevp, stationObjModel);
+ if (context == null) {
+ return;
+ }
+ if (!policy.matchCandidate(context)) {
+ return;
+ }
+ if (!policy.beforeApply(context)) {
+ return;
+ }
+
+ if (hasCreatedTask(context.getStationProtocol().getBarcode())) {
+ return;
+ }
+
+ if (redisUtil.get(policy.getGenerateLockKey(context)) != null) {
+ return;
+ }
+
+ if (!tryReserveGenerateCapacity(systemConfigMap)) {
+ return;
+ }
+
+ InTaskApplyRequest request = policy.buildApplyRequest(context);
try {
- JSONObject jsonObject = JSON.parseObject(result.getResponse());
+ policy.onRequestPermitGranted(context);
+ policy.setSystemWarning(context, "璇锋眰WMS涓�");
+ News.info("鍙戣捣鍚屾WMS鍏ュ簱璇锋眰锛宐arcode={}锛宻tationId={}锛宼imeout={}s",
+ request.getBarcode(), request.getSourceStaNo(), APPLY_IN_TASK_TIMEOUT_SECONDS);
+ String response = wmsOperateUtils.applyInTask(request);
+ handleSyncApplyResponse(policy, context, request, response);
+ } finally {
+ releaseGenerateCapacity();
+ }
+ }
+
+ private StoreInTaskContext buildContext(BasDevp basDevp, StationObjModel stationObjModel) {
+ if (basDevp == null || stationObjModel == null || stationObjModel.getStationId() == null) {
+ return null;
+ }
+
+ StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
+ if (stationThread == null) {
+ return null;
+ }
+
+ Integer stationId = stationObjModel.getStationId();
+ Map<Integer, StationProtocol> stationMap = stationThread.getStatusMap();
+ if (stationMap == null || !stationMap.containsKey(stationId)) {
+ return null;
+ }
+
+ StationProtocol stationProtocol = stationMap.get(stationId);
+ if (stationProtocol == null) {
+ return null;
+ }
+
+ return new StoreInTaskContext(basDevp, stationThread, stationObjModel, stationProtocol);
+ }
+
+ private boolean hasCreatedTask(String barcode) {
+ List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>().eq("barcode", barcode));
+ return !wrkMasts.isEmpty();
+ }
+
+ private void handleSyncApplyResponse(StoreInTaskPolicy policy, StoreInTaskContext context, InTaskApplyRequest request,
+ String response) {
+ if (Cools.isEmpty(response)) {
+ markApplyFailed(policy, context, request, null, "FAILED");
+ return;
+ }
+
+ try {
+ JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject == null || !Integer.valueOf(200).equals(jsonObject.getInteger("code"))) {
- InTaskApplyResult failResult = new InTaskApplyResult();
- failResult.setStatus(InTaskApplyStatus.RETRYABLE_FAIL);
- failResult.setResponse(result.getResponse());
- failResult.setMessage("WMS杩斿洖闈�200");
- handleApplyResult(policy, context, request, failResult);
+ markApplyFailed(policy, context, request, response, "WMS杩斿洖闈�200");
return;
}
StartupDto dto = jsonObject.getObject("data", StartupDto.class);
if (dto == null) {
- InTaskApplyResult failResult = new InTaskApplyResult();
- failResult.setStatus(InTaskApplyStatus.RETRYABLE_FAIL);
- failResult.setResponse(result.getResponse());
- failResult.setMessage("WMS杩斿洖data涓虹┖");
- handleApplyResult(policy, context, request, failResult);
+ markApplyFailed(policy, context, request, response, "WMS杩斿洖data涓虹┖");
return;
}
CreateInTaskParam taskParam = policy.buildCreateInTaskParam(context, dto);
WrkMast wrkMast = commonService.createInTask(taskParam);
policy.afterTaskCreated(context, wrkMast);
- context.getStationProtocol().setSystemWarning("");
+ policy.clearSystemWarning(context);
} catch (Exception e) {
- News.error("澶勭悊WMS鍏ュ簱鎴愬姛鍝嶅簲澶辫触锛宐arcode={}锛宻tationId={}", request.getBarcode(),
+ News.error("澶勭悊WMS鍏ュ簱鍝嶅簲寮傚父锛宐arcode={}锛宻tationId={}", request.getBarcode(),
request.getSourceStaNo(), e);
+ markApplyFailed(policy, context, request, response, e.getMessage());
}
}
- private InTaskApplyResult applySyncInTask(InTaskApplyRequest request) {
+ private void markApplyFailed(StoreInTaskPolicy policy, StoreInTaskContext context, InTaskApplyRequest request,
+ String response, String message) {
InTaskApplyResult result = new InTaskApplyResult();
- result.setBizKey(request.getBizKey());
-
- String response = wmsOperateUtils.applyInTask(request);
- result.setResponse(response);
- if (Cools.isEmpty(response)) {
- result.setStatus(InTaskApplyStatus.RETRYABLE_FAIL);
- result.setMessage("FAILED");
- return result;
- }
-
- try {
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject != null && Integer.valueOf(200).equals(jsonObject.getInteger("code"))) {
- result.setStatus(InTaskApplyStatus.SUCCESS);
- return result;
- }
- } catch (Exception ignored) {
- }
-
result.setStatus(InTaskApplyStatus.RETRYABLE_FAIL);
- result.setMessage(response);
- return result;
+ result.setResponse(response);
+ result.setMessage(message);
+
+ News.error("WMS鍏ュ簱璇锋眰澶辫触锛宐arcode={}锛宻tationId={}锛宺esponse={}",
+ request.getBarcode(), request.getSourceStaNo(), policy.buildFailureMessage(result));
+ redisUtil.set(policy.getGenerateLockKey(context), "lock", policy.getRetryLockSeconds(context));
+ policy.onApplyFailed(context, result);
+ }
+
+ private HashMap<String, String> getSystemConfigMap() {
+ Object systemConfigMapObj = redisUtil.get(RedisKeyType.SYSTEM_CONFIG_MAP.key);
+ if (systemConfigMapObj == null) {
+ return null;
+ }
+ return (HashMap<String, String>) systemConfigMapObj;
+ }
+
+ private boolean hasAvailableStationTaskCapacity(HashMap<String, String> systemConfigMap) {
+ int conveyorStationTaskLimit = getConveyorStationTaskLimit(systemConfigMap);
+ int currentStationTaskCount = stationOperateProcessUtils.getCurrentStationTaskCount();
+ if (currentStationTaskCount > conveyorStationTaskLimit) {
+ News.error("杈撻�佺珯鐐逛换鍔″凡杈惧埌涓婇檺锛屼笂闄愬�硷細{}锛岀珯鐐逛换鍔℃暟锛歿}", conveyorStationTaskLimit, currentStationTaskCount);
+ return false;
+ }
+ return true;
+ }
+
+ private synchronized boolean tryReserveGenerateCapacity(HashMap<String, String> systemConfigMap) {
+ int conveyorStationTaskLimit = getConveyorStationTaskLimit(systemConfigMap);
+ int currentStationTaskCount = stationOperateProcessUtils.getCurrentStationTaskCount();
+ if (currentStationTaskCount + inFlightGenerateCount >= conveyorStationTaskLimit) {
+ News.error("杈撻�佺珯鐐逛换鍔″凡杈惧埌涓婇檺锛屼笂闄愬�硷細{}锛岀珯鐐逛换鍔℃暟锛歿}锛岀敓鎴愪腑浠诲姟鏁帮細{}",
+ conveyorStationTaskLimit, currentStationTaskCount, inFlightGenerateCount);
+ return false;
+ }
+ inFlightGenerateCount++;
+ return true;
+ }
+
+ private synchronized void releaseGenerateCapacity() {
+ if (inFlightGenerateCount > 0) {
+ inFlightGenerateCount--;
+ }
+ }
+
+ private int getConveyorStationTaskLimit(HashMap<String, String> systemConfigMap) {
+ int conveyorStationTaskLimit = 30;
+ String conveyorStationTaskLimitStr = systemConfigMap.get("conveyorStationTaskLimit");
+ if (conveyorStationTaskLimitStr != null) {
+ conveyorStationTaskLimit = Integer.parseInt(conveyorStationTaskLimitStr);
+ }
+ return conveyorStationTaskLimit;
}
}
--
Gitblit v1.9.1